148 files changed, 213 insertions, 1294 deletions

diff --git a/doc/gnunet-c-tutorial.tex b/doc/gnunet-c-tutorial.tex
index debfa8477..83a740c99 100644
--- a/doc/gnunet-c-tutorial.tex
+++ b/doc/gnunet-c-tutorial.tex
@@ -402,7 +402,7 @@ by you.
 If you want to use the \texttt{peerinfo} tool to connect your peers, you should:
 \begin{itemize}
 \itemsep0em
- \item{Remove {\tt hostlist} from {\tt DEFAULTSERVICES} (to not connect to the global GNUnet)}
+ \item{Set {\tt FORCESTART = NO} in section {\tt hostlist} (to not connect to the global GNUnet)}
  \item{Start both peers running {\tt gnunet-arm -c peer1.conf -s} and {\tt gnunet-arm -c peer2.conf -s}}
  \item{Get \texttt{HELLO} message of the first peer running {\tt gnunet-peerinfo -c peer1.conf -g}}
  \item{Give the output to the second peer by running {\tt gnunet-peerinfo -c peer2.conf -p '<output>'}}
@@ -1120,7 +1120,7 @@ Each data record stored with PEERSTORE contains the following fields:
 
 \begin{itemize}
 \itemsep0em
-  \item subsystem: Name of the subsystem responsible for the record. 
+  \item subsystem: Name of the subsystem responsible for the record.
   \item peerid: Identity of the peer this record is related to.
   \item key: a key string identifying the record.
   \item value: binary record value.
diff --git a/doc/man/gnunet-auto-share.1 b/doc/man/gnunet-auto-share.1
index 24adf905a..dd3d93611 100644
--- a/doc/man/gnunet-auto-share.1
+++ b/doc/man/gnunet-auto-share.1
@@ -69,12 +69,9 @@ Share a directory "$HOME/gnunet\-share/":
 
 Share a directory "$HOME/gnunet\-share/":
 
- [ARM]
- DEFAULTSERVICES = gnunet-auto-share # other default services here
-
  [gnunet-auto-share]
  OPTIONS = $HOME/gnunet\-share
-
+ FORCESTART = YES # start this service when the peer starts
 
 .SH FILES
 .TP
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1
index 403813ae0..3160910d4 100644
--- a/doc/man/gnunet-namestore-fcfsd.1
+++ b/doc/man/gnunet-namestore-fcfsd.1
@@ -11,7 +11,7 @@ gnunet\-namestore-fcfsd \- HTTP server for GNU Name System First-Come-First-Serv
 .SH DESCRIPTION
 Most users will not want to run an FCFS\-zone and thus will not need this program.
 
-\fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be mapped to their GNS zone.  Names are made available on a First Come First Served basis (hence fcfs).  Registered names do not expire.  The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT".  The key of the zone in which the names are registered must be specified under the name "ZONEKEY" in the same section.  It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i fcfsd" or by adding "fcfds" to the "DEFAULTSERVICES" option.
+\fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be mapped to their GNS zone.  Names are made available on a First Come First Served basis (hence fcfs).  Registered names do not expire.  The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT".  The key of the zone in which the names are registered must be specified under the name "ZONEKEY" in the same section.  It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your configuration.
 
 An FCFS\-zone is run at http://gnunet.org/fcfs/.  The respective zone key can be imported into an individual user's zone using "gnunet-gns-import.sh".  GNS users are encouraged to register their zone with the gnunet.org FCFS authority.
 
diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 1e759c6b1..d668c81fa 100644
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -24,8 +24,10 @@ The following options are generic and shared by all services:
     The hostname specifies the machine on which the service is running.  This is usually "localhost".
 .IP BINARY
     The filename that implements the service. For example "gnunet-service-ats".
+.IP FORCESTART
+    Start the service always when the peer starts.  Set to YES for services that should always be launched, even if no other service explicitly needs them.
 .IP AUTOSTART
-    This defines the section it is defined in, which should be a service, will be started by the ARM service if the value is set to YES.
+    Set to YES to automatically start the service when it is requested by another service. YES for most GNUnet services.
 .IP ACCEPT_FROM
     A semi-column separated list of IPv4 addresses that are allowed to use the service; usually 127.0.0.1.
 .IP ACCEPT_FROM6
@@ -41,12 +43,6 @@ The following options are generic and shared by all services:
 
 
 
-.SH ARM Options
-
-This section is configuration for the automatic restart manager which is responsible for launching services.
-
-.IP DEFAULTSERVICES
-    list of services that ARM should always start by default.  AUTOSTART services are only started when the service is needed by some other service.  The services listed here will always be started, not just on-demand.  "topology" and "hostlist" should virtually always be listed here, and most users will want to specify high-level applications like "fs", "gns" or "pt" here as well.
 .B
 .SH ATS Options
 
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 83582659a..53731586b 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -1,11 +1,13 @@
-
 [arm]
 @UNIXONLY@ PORT = 2087
 HOSTNAME = localhost
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
+
+
 DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
+
 # Special case, uses user runtime dir even for per-system service.
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 1249fe003..c6259c273 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -163,7 +163,7 @@ struct ServiceList
    * to start it)?  #GNUNET_NO if the service is started only upon 'accept' on a
    * listen socket or possibly explicitly by a client changing the value.
    */
-  int is_default;
+  int force_start;
 
   /**
    * Should we use pipes to signal this process? (YES for Java binaries and if we
@@ -669,7 +669,7 @@ create_listen_socket (struct sockaddr *sa, socklen_t addr_len,
 #ifdef LINUX
       /* Permission settings are not required when abstract sockets are used */
       && ('\0' != ((const struct sockaddr_un *)sa)->sun_path[0])
-#endif      
+#endif
       )
   {
     match_uid =
@@ -735,7 +735,8 @@ free_service (struct ServiceList *sl)
  *         #GNUNET_SYSERR to close it (signal serious error)
  */
 static void
-handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+handle_start (void *cls,
+              struct GNUNET_SERVER_Client *client,
               const struct GNUNET_MessageHeader *message)
 {
   const char *servicename;
@@ -770,7 +771,7 @@ handle_start (void *cls, struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_receive_done (client, GNUNET_OK);
     return;
   }
-  sl->is_default = GNUNET_YES;
+  sl->force_start = GNUNET_YES;
   if (NULL != sl->proc)
   {
     signal_result (client, servicename, request_id,
@@ -790,9 +791,11 @@ handle_start (void *cls, struct GNUNET_SERVER_Client *client,
  * @param tc task context
  */
 static void
-trigger_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+trigger_shutdown (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Triggering shutdown\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Triggering shutdown\n");
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -807,7 +810,8 @@ trigger_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *         #GNUNET_SYSERR to close it (signal serious error)
  */
 static void
-handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
+handle_stop (void *cls,
+             struct GNUNET_SERVER_Client *client,
              const struct GNUNET_MessageHeader *message)
 {
   struct ServiceList *sl;
@@ -846,7 +850,7 @@ handle_stop (void *cls, struct GNUNET_SERVER_Client *client,
       GNUNET_SERVER_receive_done (client, GNUNET_OK);
       return;
     }
-  sl->is_default = GNUNET_NO;
+  sl->force_start = GNUNET_NO;
   if (GNUNET_YES == in_shutdown)
     {
       /* shutdown in progress */
@@ -1002,7 +1006,8 @@ list_count (struct ServiceList *running_head)
  * @param tc context
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct ServiceList *pos;
   struct ServiceList *nxt;
@@ -1093,11 +1098,12 @@ delayed_restart_task (void *cls,
     if (0 == GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value_us)
     {
       /* restart is now allowed */
-      if (sl->is_default)
+      if (sl->force_start)
       {
         /* process should run by default, start immediately */
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    _("Restarting service `%s'.\n"), sl->name);
+                    _("Restarting service `%s'.\n"),
+                    sl->name);
         start_process (sl, NULL, 0);
       }
       else
@@ -1377,9 +1383,18 @@ setup_service (void *cls, const char *section)
 #endif
   GNUNET_CONTAINER_DLL_insert (running_head, running_tail, sl);
 
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "FORCESTART"))
+  {
+    sl->force_start = GNUNET_YES;
     return;
+  }
+  else
+  {
+    if (GNUNET_YES !=
+        GNUNET_CONFIGURATION_get_value_yesno (cfg, section, "AUTOSTART"))
+      return;
+  }
   if (0 >= (ret = GNUNET_SERVICE_get_server_addresses (section, cfg,
                                                        &addrs, &addr_lens)))
     return;
@@ -1451,8 +1466,6 @@ run (void *cls, struct GNUNET_SERVER_Handle *serv,
      sizeof (struct GNUNET_ARM_Message)},
     {NULL, NULL, 0, 0}
   };
-  char *defaultservices;
-  const char *pos;
   struct ServiceList *sl;
 
   cfg = c;
@@ -1490,45 +1503,17 @@ run (void *cls, struct GNUNET_SERVER_Handle *serv,
   GNUNET_CONFIGURATION_iterate_sections (cfg, &setup_service, NULL);
 
   /* start default services... */
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "ARM",
-                                             "DEFAULTSERVICES",
-                                             &defaultservices))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Starting default services `%s'\n"),
-                defaultservices);
-    if (0 < strlen (defaultservices))
-    {
-      for (pos = strtok (defaultservices, " "); NULL != pos;
-           pos = strtok (NULL, " "))
-      {
-        sl = find_service (pos);
-        if (NULL == sl)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                      _("Default service `%s' not configured correctly!\n"),
-                      pos);
-          continue;
-        }
-        sl->is_default = GNUNET_YES;
-        start_process (sl, NULL, 0);
-      }
-    }
-    GNUNET_free (defaultservices);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("No default services configured, GNUnet will not really start right now.\n"));
-  }
-
-  notifier =
-      GNUNET_SERVER_notification_context_create (server, MAX_NOTIFY_QUEUE);
-  GNUNET_SERVER_connect_notify (server, handle_client_connecting, NULL);
+  for (sl = running_head; NULL != sl; sl = sl->next)
+    if (GNUNET_YES == sl->force_start)
+      start_process (sl, NULL, 0);
+  notifier
+    = GNUNET_SERVER_notification_context_create (server,
+                                                 MAX_NOTIFY_QUEUE);
+  GNUNET_SERVER_connect_notify (server,
+                                &handle_client_connecting, NULL);
   /* process client requests */
-  GNUNET_SERVER_add_handlers (server, handlers);
+  GNUNET_SERVER_add_handlers (server,
+                              handlers);
 }
 
 
diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index d8354477e..3ae5271a1 100644
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -3,7 +3,6 @@ GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/
 
 [arm]
 PORT = 23354
-DEFAULTSERVICES =
 BINARY = gnunet-service-arm
 OPTIONS = -L ERROR
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
@@ -22,6 +21,7 @@ ACCEPT_FROM6 = ::1;
 
 [fs]
 AUTOSTART = NO
+FORCESTART = NO
 
 [datastore]
 AUTOSTART = NO
@@ -46,5 +46,20 @@ AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
+FORCESTART = NO
 
+[hostlist]
+AUTOSTART = NO
+FORCESTART = NO
+
+[dht]
+AUTOSTART = NO
+FORCESTART = NO
 
+[cadet]
+AUTOSTART = NO
+FORCESTART = NO
+
+[revocation]
+AUTOSTART = NO
+FORCESTART = NO
diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c
index 5c08293a4..77b6f36dd 100644
--- a/src/arm/test_gnunet_service_arm.c
+++ b/src/arm/test_gnunet_service_arm.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -40,14 +40,16 @@
 
 static int ret = 1;
 
-static int resolved_ok = 0;
+static int resolved_ok;
 
-static int asked_for_a_list = 0;
+static int asked_for_a_list;
 
 static struct GNUNET_ARM_Handle *arm;
 
+
 static void
-trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+trigger_disconnect (void *cls,
+                    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_ARM_disconnect_and_free (arm);
   arm = NULL;
@@ -71,40 +73,52 @@ arm_stop_cb (void *cls,
 static void
 service_list (void *cls,
               enum GNUNET_ARM_RequestStatus rs,
-              unsigned int count, const char *const*list)
+              unsigned int count,
+              const char *const*list)
 {
+  unsigned int i;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "%u services are are currently running\n",
               count);
   if (GNUNET_ARM_REQUEST_SENT_OK != rs)
     goto stop_arm;
-  if (1 == count)
+  for (i=0;i<count;i++)
   {
-    GNUNET_break (0 == strcasecmp (list[0], "resolver (gnunet-service-resolver)"));
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got service list, now stopping arm\n");
-    ret = 0;
+    if (0 == strcasecmp (list[i],
+                         "resolver (gnunet-service-resolver)"));
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Got service list, now stopping arm\n");
+      ret = 0;
+    }
   }
 
  stop_arm:
-  GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+  GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT,
+                                   &arm_stop_cb, NULL);
 }
 
 
 static void
-hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
+hostNameResolveCB (void *cls,
+                   const struct sockaddr *addr,
+                   socklen_t addrlen)
 {
   if ((ret == 0) || (ret == 4) || (resolved_ok == 1))
     return;
   if (NULL == addr)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Name not resolved!\n");
     ret = 3;
-    GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+    GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT,
+                                     &arm_stop_cb, NULL);
   }
   else if (asked_for_a_list == 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-        "Resolved hostname, now checking the service list\n");
+                "Resolved hostname, now checking the service list\n");
     GNUNET_ARM_request_service_list (arm, TIMEOUT, service_list, NULL);
     asked_for_a_list = 1;
     resolved_ok = 1;
@@ -121,21 +135,26 @@ arm_start_cb (void *cls,
   GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
   GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      "Trying to resolve our own hostname!\n");
+              "Trying to resolve our own hostname!\n");
   /* connect to the resolver service */
-  if (NULL == GNUNET_RESOLVER_hostname_resolve (
-      AF_UNSPEC, TIMEOUT, &hostNameResolveCB, NULL))
+  if (NULL ==
+      GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, TIMEOUT,
+                                        &hostNameResolveCB, NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
         "Unable initiate connection to resolver service\n");
     ret = 2;
-    GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
+    GNUNET_ARM_request_service_stop (arm,
+                                     "arm", TIMEOUT,
+                                     &arm_stop_cb, NULL);
   }
 }
 
 
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   char *armconfig;
@@ -144,10 +163,10 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_filename (c, "arm", "CONFIG",
-                                               &armconfig))
+                                                 &armconfig))
     {
-      GNUNET_CONFIGURATION_set_value_string ((struct GNUNET_CONFIGURATION_Handle
-                                              *) c, "arm", "CONFIG",
+      GNUNET_CONFIGURATION_set_value_string ((struct GNUNET_CONFIGURATION_Handle *) c,
+                                             "arm", "CONFIG",
                                              cfgfile);
     }
     else
@@ -155,7 +174,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   arm = GNUNET_ARM_connect (c, NULL, NULL);
   GNUNET_ARM_request_service_start (arm, "arm",
-      GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, arm_start_cb, NULL);
+                                    GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                    START_TIMEOUT,
+                                    &arm_start_cb, NULL);
 }
 
 
@@ -173,27 +194,29 @@ main (int argc, char *av[])
   char hostname[GNUNET_OS_get_hostname_max_length () + 1];
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                           "gethostname");
-      FPRINTF (stderr,
-               "%s", "Failed to determine my own hostname, testcase not run.\n");
-      return 0;
-    }
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                         "gethostname");
+    FPRINTF (stderr,
+             "%s",
+             "Failed to determine my own hostname, testcase not run.\n");
+    return 0;
+  }
   if (NULL == gethostbyname (hostname))
-    {
-      FPRINTF (stderr,
-               "Failed to resolve my hostname `%s', testcase not run.\n",
-               hostname);
-      return 0;
-    }
+  {
+    FPRINTF (stderr,
+             "Failed to resolve my hostname `%s', testcase not run.\n",
+             hostname);
+    return 0;
+  }
   GNUNET_log_setup ("test-gnunet-service-arm",
                     "WARNING",
                     NULL);
   GNUNET_break (GNUNET_OK ==
                 GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                                     argv, "test-gnunet-service-arm",
-                                    "nohelp", options, &run, NULL));
+                                    "nohelp", options,
+                                    &run, NULL));
   return ret;
 }
 
diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf
index fa5ce5423..eb1c303be 100644
--- a/src/ats/test_ats_api.conf
+++ b/src/ats/test_ats_api.conf
@@ -3,7 +3,6 @@ GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
 [arm]
 PORT = 12001
-DEFAULTSERVICES =
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
 
 [ats]
@@ -41,7 +40,7 @@ WLAN_QUOTA_OUT = 512
 # ATS extended options
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO 
+DUMP_OVERWRITE = NO
 DUMP_MIN_PEERS = 0
 DUMP_MIN_ADDRS = 0
 DUMP_OVERWRITE = NO
diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf
index 79efd7903..e8862d95d 100644
--- a/src/ats/test_ats_mlp.conf
+++ b/src/ats/test_ats_mlp.conf
@@ -3,7 +3,6 @@ GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/
 
 [arm]
 PORT = 12001
-DEFAULTSERVICES = ats
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
 
 [ats]
@@ -43,7 +42,7 @@ ATS_EXEC_INTERVAL = 30000
 
 # MLP defaults
 # MLP_MAX_DURATION = 3 s
-# MLP_MAX_ITERATIONS = 1024 
+# MLP_MAX_ITERATIONS = 1024
 # MLP_COEFFICIENT_D = 1.0
 # MLP_COEFFICIENT_U = 1.0
 # MLP_COEFFICIENT_R = 1.0
@@ -53,7 +52,7 @@ ATS_EXEC_INTERVAL = 30000
 # MLP Debugging settings
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO 
+DUMP_OVERWRITE = NO
 DUMP_MIN_PEERS = 0
 DUMP_MIN_ADDRS = 0
 DUMP_OVERWRITE = NO
diff --git a/src/ats/test_ats_solver_default.conf b/src/ats/test_ats_solver_default.conf
index fb3a7889f..6b73d048e 100644
--- a/src/ats/test_ats_solver_default.conf
+++ b/src/ats/test_ats_solver_default.conf
@@ -1,6 +1,5 @@
 [arm]
 PORT = 12001
-DEFAULTSERVICES = ats
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock
 
 [transport]
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index 458f11908..be5ad8bcc 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,4 +1,5 @@
 [cadet]
+FORCESTART = YES
 AUTOSTART = @AUTOSTART@
 @JAVAPORT@PORT = 2096
 HOSTNAME = localhost
@@ -17,4 +18,4 @@ MAX_TUNNELS = 1000
 MAX_CONNECTIONS = 1000
 MAX_MSGS_QUEUE = 10000
 MAX_PEERS = 1000
-REKEY_PERIOD = 12 h
\ No newline at end of file
+REKEY_PERIOD = 12 h
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 5489888d1..ff9fb4c5b 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -58,7 +58,6 @@ AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
 [arm]
-DEFAULTSERVICES = core transport dht cadet statistics
 PORT = 12366
 
 [transport-udp]
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 714422879..67935e69a 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -1,37 +1,21 @@
 [consensus]
-AUTOSTART = YES
-PORT = 2110
-HOSTNAME = localhost
-BINARY = gnunet-service-consensus
 #PREFIX = gdbserver :12345
 #PREFIX = valgrind
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-consensus.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
 OPTIONS = -L INFO
 
-
 [transport]
 OPTIONS = -LERROR
 
-
-[arm]
-DEFAULTSERVICES = core consensus set
-
 [set]
 OPTIONS = -L INFO
 #PREFIX = valgrind --leak-check=full
 #PREFIX = valgrind
 
-
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
 
 [hostlist]
-SERVERS = 
-
+SERVERS =
 
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)
@@ -43,6 +27,3 @@ DISABLEV6 = NO
 # Do we use addresses from localhost address ranges? (::1, 127.0.0.0/8)
 RETURN_LOCAL_ADDRESSES = YES
 
-[nse]
-AUTOSTART = NO
-
diff --git a/src/conversation/test_conversation.conf b/src/conversation/test_conversation.conf
index 5501a8300..91be729ed 100644
--- a/src/conversation/test_conversation.conf
+++ b/src/conversation/test_conversation.conf
@@ -1,5 +1,3 @@
 [conversation]
 LINE=1
 
-[arm]
-DEFAULTSERVICES = topology
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 4ece5b096..a13cc8706 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -1,9 +1,6 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
 
-[arm]
-DEFAULTSERVICES = topology hostlist
-
 [ats]
 WAN_QUOTA_IN = 64 kiB
 WAN_QUOTA_OUT = 64 kiB
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index ebf77997c..83928d04a 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -2,23 +2,13 @@
 [PATHS]
 GNUNET_TEST_HOME = ~/.gnunet/
 
-[arm]
-PORT = 2425 
-DEFAULTSERVICES = core test-sts
-
-[core]
-PORT = 24512
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
-
 [ats]
 WAN_QUOTA_IN = 104857600
 WAN_QUOTA_OUT = 104757600
-PORT = 24571
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [test-sts]
-AUTOSTART = YES
-PORT = 9252 
+FORCESTART = YES
+PORT = 9252
 HOSTNAME = localhost
 BINARY = test_core_api_send_to_self
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index b0acb8395..2184e103a 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -1,9 +1,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-core/
 
-[arm]
-DEFAULTSERVICES =
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -17,81 +14,12 @@ USE_LOCALADDR = NO
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 12470
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
-
 [transport-tcp]
 BINDTO = 127.0.0.1
 
 [transport-udp]
 BROADCAST = NO
 
-[testing]
-WEAKRANDOM = YES
-
 [peerinfo]
 NO_IO = YES
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[multicast]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
diff --git a/src/datastore/test_datastore_api_data_heap.conf b/src/datastore/test_datastore_api_data_heap.conf
index db571c12a..847f41907 100644
--- a/src/datastore/test_datastore_api_data_heap.conf
+++ b/src/datastore/test_datastore_api_data_heap.conf
@@ -7,7 +7,6 @@ WEAKRANDOM = YES
 
 [arm]
 PORT = 42466
-DEFAULTSERVICES = 
 
 [statistics]
 PORT = 22667
diff --git a/src/datastore/test_datastore_api_data_mysql.conf b/src/datastore/test_datastore_api_data_mysql.conf
index 38b9058f6..f79c62d17 100644
--- a/src/datastore/test_datastore_api_data_mysql.conf
+++ b/src/datastore/test_datastore_api_data_mysql.conf
@@ -2,12 +2,8 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-mysql/
 
-[TESTING]
-WEAKRANDOM = YES
-
 [arm]
 PORT = 42466
-DEFAULTSERVICES = 
 
 [statistics]
 PORT = 22667
@@ -22,6 +18,3 @@ DATABASE = mysql
 [datastore-mysql]
 DATABASE = gnunetcheck
 
-[fs]
-AUTOSTART = NO
-
diff --git a/src/datastore/test_datastore_api_data_postgres.conf b/src/datastore/test_datastore_api_data_postgres.conf
index dbce6e4d0..c30f1f10e 100644
--- a/src/datastore/test_datastore_api_data_postgres.conf
+++ b/src/datastore/test_datastore_api_data_postgres.conf
@@ -2,12 +2,8 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-postgres/
 
-[TESTING]
-WEAKRANDOM = YES
-
 [arm]
 PORT = 42466
-DEFAULTSERVICES = 
 
 [statistics]
 PORT = 22667
@@ -22,6 +18,4 @@ DATABASE = postgres
 [datastore-postgres]
 CONFIG = dbname=gnunetcheck
 
-[fs]
-AUTOSTART = NO
 
diff --git a/src/datastore/test_datastore_api_data_sqlite.conf b/src/datastore/test_datastore_api_data_sqlite.conf
index 3104ed7df..6a6e00787 100644
--- a/src/datastore/test_datastore_api_data_sqlite.conf
+++ b/src/datastore/test_datastore_api_data_sqlite.conf
@@ -2,12 +2,8 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-datastore-sqlite/
 
-[TESTING]
-WEAKRANDOM = YES
-
 [arm]
 PORT = 42466
-DEFAULTSERVICES = 
 
 [statistics]
 PORT = 22667
diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index f7c965e6d..8671353b5 100644
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -2,38 +2,3 @@
 PORT = 22654
 QUOTA = 1 MB
 
-[dht]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index c8cf84386..af9ab24bd 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,4 +1,5 @@
 [dht]
+FORCESTART = YES
 AUTOSTART = @AUTOSTART@
 @JAVAPORT@PORT = 2095
 HOSTNAME = localhost
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 9b725b09e..2a7f75b9f 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -1,16 +1,10 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/
 
-[arm]
-DEFAULTSERVICES = core dht
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
 
-[dns]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 RETURN_LOCAL_ADDRESSES = YES
@@ -32,8 +26,3 @@ WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
 
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 30bf3534b..51cf99b0f 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -1,15 +1,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-dht-api/
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -24,33 +15,13 @@ MINIMUM-FRIENDS = 0
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 2092
-
-[dht]
-PORT = 12370
-
 [transport]
 plugins = tcp
 NEIGHBOUR_LIMIT = 50
 PORT = 2091
 
-[peerinfo]
-PORT = 2090
-
-[resolver]
-PORT = 2089
-
-[statistics]
-PORT = 2088
-
-[arm]
-DEFAULTSERVICES = 
-PORT = 2087
-
 [transport-tcp]
 TIMEOUT = 300 s
-PORT = 2094
 
 [nat]
 DISABLEV6 = YES
@@ -61,14 +32,3 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 8c88c7380..13c59d070 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -1,17 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
-BINARY = gnunet-service-dht
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -27,16 +13,8 @@ PORT = 12365
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 12092
-
-[arm]
-DEFAULTSERVICES = core
-PORT = 12366
-
 [transport-tcp]
 TIMEOUT = 300 s
-PORT = 12368
 BINDTO = 127.0.0.1
 
 [PATHS]
@@ -51,14 +29,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
-[namestore]
-AUTOSTART = NO
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index f8646ca2b..024ff2770 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -4,14 +4,8 @@ GNUNET_TEST_HOME = /tmp/test_dht_line/
 QUOTA = 1 MB
 DATABASE = heap
 
-[arm]
-DEFAULTSERVICES = core dht
-
-[dns]
-AUTOSTART = NO
-
 [nat]
-DISABLEV6 = YES 
+DISABLEV6 = YES
 RETURN_LOCAL_ADDRESSES = YES
 USE_LOCALADDR = YES
 ENABLE_UPNP = NO
@@ -24,15 +18,9 @@ EXTERNAL_ADDRESS = 127.0.0.1
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[testing]
-WEAKRANDOM = YES
-
 [testbed]
 OVERLAY_TOPOLOGY = LINE
 
-[namestore]
-AUTOSTART = NO
-
 [transport]
 plugins = tcp
 
@@ -41,7 +29,3 @@ WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0
 
-[vpn]
-AUTOSTART = NO
-
-
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index 7ba9f8381..415a2e5fd 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -1,9 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -15,9 +9,6 @@ PLUGINS = tcp
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[arm]
-DEFAULTSERVICES = dht core
-
 [testbed]
 OVERLAY_TOPOLOGY = LINE
 
@@ -34,15 +25,3 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index f8abaec23..b6e1646d3 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -1,9 +1,3 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -15,19 +9,10 @@ PLUGINS = tcp
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[arm]
-DEFAULTSERVICES = dht core
-
-[TESTING]
-WEAKRANDOM = YES
-
 [testbed]
 OVERLAY_TOPOLOGY = FROM_FILE
 OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat
 
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-dht-multipeer/
 
@@ -41,16 +26,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-
-
diff --git a/src/dv/template_dv.conf b/src/dv/template_dv.conf
index 7859b12bb..0a3d81bcf 100644
--- a/src/dv/template_dv.conf
+++ b/src/dv/template_dv.conf
@@ -28,38 +28,6 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-dv-testing/
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
 
-[arm]
-DEFAULTSERVICES = core
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
+
diff --git a/src/experimentation/test_experimentation_clique.conf b/src/experimentation/test_experimentation_clique.conf
index e7a0cd1a0..1ab9aa2dd 100644
--- a/src/experimentation/test_experimentation_clique.conf
+++ b/src/experimentation/test_experimentation_clique.conf
@@ -7,19 +7,6 @@ NEIGHBOUR_LIMIT = 100
 TOPOLOGY = RANDOM
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = YES
-DISABLE_TRY_CONNECT = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -41,44 +28,16 @@ WAN_QUOTA_OUT = 3932160
 WAN_QUOTA_IN = 3932160
 
 [core]
-PORT = 12092
-AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
-[arm]
-DEFAULTSERVICES = core transport experimentation dht
-PORT = 12366
-
 [transport-udp]
 TIMEOUT = 300 s
-PORT = 12368
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-experimentation/
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = YES
-
 [peerinfo]
 NO_IO = YES
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index dcd121587..ca0191e36 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,6 @@
 [fs]
 AUTOSTART = @AUTOSTART@
+FORCESTART = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/
 STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -60,6 +61,7 @@ MAX_CADET_CLIENTS = 128
 
 [gnunet-auto-share]
 BINARY = gnunet-auto-share
+FORCESTART = NO
 
 # Note: MUST specify path to auto-share directory and CAN specify other options
 # to gnunet-auto-share here!
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index b57e51ed0..97d8e6f87 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -22,7 +22,6 @@ RETURN_LOCAL_ADDRESSES = YES
 [arm]
 PORT = 4366
 HOSTNAME = localhost
-DEFAULTSERVICES = fs
 
 [datastore]
 QUOTA = 100 MB
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf
index 5355fbc85..fcf6f42d4 100644
--- a/src/fs/test_fs_uri_data.conf
+++ b/src/fs/test_fs_uri_data.conf
@@ -2,6 +2,4 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/
 
-[arm]
-DEFAULTSERVICES = topology hostlist
 
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index a19a97cf3..bd909f938 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -200,10 +200,16 @@ do_shutdown (void *cls,
     GNUNET_IDENTITY_disconnect (identity);
     identity = NULL;
   }
-  GNUNET_GNS_disconnect (gns);
-  gns = NULL;
-  GNUNET_DNSSTUB_stop (dns_stub);
-  dns_stub = NULL;
+  if (NULL != gns)
+  {
+    GNUNET_GNS_disconnect (gns);
+    gns = NULL;
+  }
+  if (NULL != dns_stub)
+  {
+    GNUNET_DNSSTUB_stop (dns_stub);
+    dns_stub = NULL;
+  }
 }
 
 
@@ -448,9 +454,10 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
     strcpy (&name[name_len - strlen (fcfs_suffix)],
             ".gnu");
     use_gns = GNUNET_YES;
-  } else if ( (name_len > strlen (dns_suffix)) &&
-       (0 == strcasecmp (dns_suffix,
-                         &name[name_len - strlen (dns_suffix)])) )
+  }
+  else if ( (name_len > strlen (dns_suffix)) &&
+            (0 == strcasecmp (dns_suffix,
+                              &name[name_len - strlen (dns_suffix)])) )
   {
     /* replace ".zkey.eu" with ".zkey" */
     strcpy (&name[name_len - strlen (dns_suffix)],
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 219d82f8a..ea8c7c3fc 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -9,9 +9,6 @@ AUTOSTART = YES
 [transport]
 PLUGINS =
 
-[arm]
-DEFAULTSERVICES =
-
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 73a713413..eac9fee43 100644
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -9,9 +9,6 @@ AUTOSTART = YES
 [transport]
 PLUGINS =
 
-[arm]
-DEFAULTSERVICES =
-
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index da6a1823a..973c0257e 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -5,7 +5,6 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-gns-proxy/
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics dns namestore gns
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index d1aef4ca7..77ee8fc18 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -33,7 +33,6 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
 PORT = 12366
 
 [transport-tcp]
@@ -59,7 +58,7 @@ AUTOSTART = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
+#PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 5d5a94b5d..3a68ed051 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -4,8 +4,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-dist_pkgcfg_DATA = \
-  hostlist.conf
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
@@ -22,12 +20,16 @@ libexec_PROGRAMS = \
  gnunet-daemon-hostlist
 LIB_GNURL=@LIBGNURL@
 CPP_GNURL=@LIBGNURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
 else
 if HAVE_LIBCURL
 libexec_PROGRAMS = \
  gnunet-daemon-hostlist
 LIB_GNURL=@LIBCURL@
 CPP_GNURL=@LIBCURL_CPPFLAGS@
+dist_pkgcfg_DATA = \
+  hostlist.conf
 endif
 endif
 
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 79acb3900..5c4a86b43 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,4 +1,5 @@
 [hostlist]
+FORCESTART = YES
 BINARY = gnunet-daemon-hostlist
 
 # port for hostlist http server
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 74d16be89..9f853c244 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -4,7 +4,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = hostlist topology
 
 [statistics]
 PORT = 12967
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 0d59325aa..4fc4e8dd1 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -7,7 +7,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = hostlist topology
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index f3fca70a2..538a91602 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -7,7 +7,6 @@ PORT = 22968
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = hostlist topology
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index b3eb87a2d..d5084692f 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,89 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
 
-[resolver]
-PORT = 12464
-
 [transport]
-PORT = 12465
 PLUGINS = tcp
 
-[arm]
-PORT = 12466
-DEFAULTSERVICES = hostlist
-
-[statistics]
-PORT = 12467
-
-[tcp]
-PORT = 12468
-
 [peerinfo]
-PORT = 12469
 NO_IO = YES
 
 [core]
 PORT = 12470
 
-[testing]
-WEAKRANDOM = YES
-
-[hostlist]
-HTTP-PROXY =
-
-[cadet]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[revocation]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[namecache]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
-[consensus]
-AUTOSTART = NO
-
-[regex]
-AUTOSTART = NO
-
-[identity]
-AUTOSTART = NO
-
-[conversation]
-AUTOSTART = NO
-
-[psycstore]
-AUTOSTART = NO
-
-[set]
-AUTOSTART = NO
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 1bdcd8101..12087a7b7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -7,7 +7,6 @@ PORT = 22968
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index afe3ef69a..44415aa49 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -7,7 +7,6 @@ PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-arm.sock
 
 [statistics]
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index dc27bfb9a..f72790a45 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -7,7 +7,6 @@ PORT = 32968
 
 [arm]
 PORT = 32966
-DEFAULTSERVICES = topology hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-arm.sock
 
 [statistics]
diff --git a/src/identity/test_identity.conf b/src/identity/test_identity.conf
index 54ea63fd8..1653a88f8 100644
--- a/src/identity/test_identity.conf
+++ b/src/identity/test_identity.conf
@@ -1,6 +1,5 @@
 [arm]
 PORT = 12000
-DEFAULTSERVICES = identity
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [identity]
diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 2a675ce2d..e69de29bb 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast
diff --git a/src/namecache/test_namecache_api.conf b/src/namecache/test_namecache_api.conf
index 908b0e294..7221033c6 100644
--- a/src/namecache/test_namecache_api.conf
+++ b/src/namecache/test_namecache_api.conf
@@ -1,13 +1,7 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-namecache/
 
-[arm]
-PORT = 12000
-DEFAULTSERVICES = namecache
-
 [namecache]
-#PREFIX = valgrind
-AUTOSTART = YES
 DATABASE = sqlite
 
 [namecache-sqlite]
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 1478d185b..0163b2f52 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -1,13 +1,7 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-namestore/
 
-[arm]
-PORT = 12000
-DEFAULTSERVICES = namecache namestore
-
 [namestore]
-#PREFIX = valgrind
-AUTOSTART = YES
 DATABASE = sqlite
 
 [namestore-sqlite]
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index 42c1399cf..d23a49162 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -4,15 +4,6 @@ GNUNET_TEST_HOME = /tmp/nat-test
 # configuration file is assumed to be the default,
 # which is what we want by default...
 
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[TESTING]
-WEAKRANDOM = NO
-
-[client]
-
-
 [nat]
 # Are we behind NAT?
 BEHIND_NAT = YES
@@ -27,9 +18,9 @@ ENABLE_UPNP = YES
 USE_LOCALADDR = YES
 
 # External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
-# normal interface IP address for non-NATed peers; 
+# normal interface IP address for non-NATed peers;
 # possibly auto-detected (using UPnP) if possible if not specified
-# EXTERNAL_ADDRESS = 
+# EXTERNAL_ADDRESS =
 
 # Should we use ICMP-based NAT traversal to try connect to NATed peers
 # or, if we are behind NAT, to allow connections to us?
@@ -37,98 +28,10 @@ ENABLE_ICMP_CLIENT = NO
 ENABLE_ICMP_SERVER = NO
 
 # IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
-# normal interface IP address for non-NATed peers; 
+# normal interface IP address for non-NATed peers;
 # likely auto-detected (via interface list) if not specified (!)
-# INTERNAL_ADDRESS = 
+# INTERNAL_ADDRESS =
 
 # Disable IPv6 support
 DISABLEV6 = NO
 
-[arm]
-PORT = 2087
-HOSTNAME = localhost
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs
-# GLOBAL_PREFIX =
-# USERNAME =
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[statistics]
-AUTOSTART = YES
-PORT = 2088
-HOSTNAME = localhost
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[resolver]
-AUTOSTART = YES
-PORT = 2089
-HOSTNAME = localhost
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-# DISABLE_SOCKET_FORWARDING = NO
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-
-[peerinfo]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-
-[consensus]
-AUTOSTART = NO
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index 96d82d812..02e7261cf 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,5 +1,6 @@
 [nse]
 AUTOSTART = @AUTOSTART@
+FORCESTART = YES
 @JAVAPORT@PORT = 2097
 HOSTNAME = localhost
 BINARY = gnunet-service-nse
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index fc2e4f8b7..8e98b18c3 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -3,7 +3,7 @@ GNUNET_TEST_HOME = /tmp/nse-profiler/
 
 [testbed]
 AUTOSTART = NO
-PORT = 12113
+ORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
 HOSTNAME = localhost
 MAX_PARALLEL_OPERATIONS = 400
@@ -14,12 +14,7 @@ SETUP_TIMEOUT = 30m
 STATS_DIR= /home/totakura/nse/test/load
 
 [nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = NO
+FORCESTART = YES
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
@@ -28,23 +23,6 @@ WORKBITS = 0
 PROOFFILE = $GNUNET_TEST_HOME/nse.proof
 HISTOGRAM_DIR = /home/totakura/nse/test/histograms
 
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1
@@ -60,36 +38,6 @@ plugins = udp
 [transport-udp]
 PORT = 12116
 
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nse-profiler]
 OUTPUT_FILE = nse_output_2000_peers.dat
 TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 26bcda520..b118132d1 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -12,11 +12,7 @@ OVERLAY_RANDOM_LINKS = 1000
 OPERATION_TIMEOUT = 45 s
 
 [nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+FORCESTART = YES
 AUTOSTART = NO
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
@@ -25,23 +21,6 @@ INTERVAL = 10 s
 WORKBITS = 0
 PROOFFILE = $GNUNET_TEST_HOME/nse.proof
 
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1
@@ -54,39 +33,6 @@ EXTERNAL_ADDRESS = 127.0.0.1
 [transport]
 plugins = udp
 
-[transport-udp]
-PORT = 12116
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nse-profiler]
 OUTPUT_FILE = nse_output_2000_peers.dat
 TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index b6239140e..c6061f421 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -2,45 +2,16 @@
 GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
 
 [nse]
-PORT = 22353
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = YES
+FORCESTART = YES
 PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 1 ms
 INTERVAL = 60 s
 WORKBITS = 1
-
 HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
 
-
-[arm]
-PORT = 22354
-DEFAULTSERVICES = nse core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = YES
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
 [nat]
 DISABLEV6 = YES
 BINDTO = 127.0.0.1
@@ -50,27 +21,3 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[dns]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 10
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = SMALL_WORLD_RING
-PERCENTAGE = 3
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-
-DELETE_FILES = NO
-
-
-[consensus]
-AUTOSTART = NO
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 31c310232..78dac1d13 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -1,37 +1,10 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/gnunet-test-peerinfo/
 
-[gnunetd]
-#HOSTKEY = test_gnunet_peerinfo.hostkey
-
-[peerinfo]
-PORT = 24354
-
-[resolver]
-PORT = 24355
-
-[arm]
-DEFAULTSERVICES = 
-
-[testing]
-WEAKRANDOM = YES
-
 [transport]
 plugins = tcp
 PORT = 24356
 
-[transport-tcp]
-PORT = 24357
-
-[dns]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 43a5adb75..e69de29bb 100644
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast psycstore psyc
diff --git a/src/psycstore/test_psycstore.conf b/src/psycstore/test_psycstore.conf
index 0d52a0829..bf7865c88 100644
--- a/src/psycstore/test_psycstore.conf
+++ b/src/psycstore/test_psycstore.conf
@@ -1,16 +1,7 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-psycstore/
 
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-arm.sock
-DEFAULTSERVICES = psycstore
-
 [psycstore]
-AUTOSTART = YES
-BINARY = gnunet-service-psycstore
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-psycstore.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
 DATABASE = sqlite
 
 [psycstore-sqlite]
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 96391dd2e..8f7046b2d 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -5,7 +5,6 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-gns-vpn/
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics exit cadet vpn namestore gns
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index 38f479775..5540c0fe4 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -5,7 +5,6 @@ GNUNET_TEST_HOME = /tmp/gnunet-test-vpn/
 PLUGINS = tcp
 
 [arm]
-DEFAULTSERVICES = statistics exit vpn
 PORT = 0
 ALLOW_SHUTDOWN = YES
 
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 4977d3b19..5c7ad1abd 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -45,7 +45,6 @@ PORT = 2089
 PORT = 2088
 
 [arm]
-DEFAULTSERVICES = 
 PORT = 2087
 
 [transport-tcp]
diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index 9718b68e4..3b11ffba6 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,5 +1,6 @@
 [revocation]
 AUTOSTART = @AUTOSTART@
+FORCESTART = YES
 @JAVAPORT@PORT = 2112
 HOSTNAME = localhost
 BINARY = gnunet-service-revocation
diff --git a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
index f6eb33602..04ee95055 100644
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -4,9 +4,7 @@ SERVICEHOME=/tmp/test-revocation-service
 
 [revocation]
 WORKBITS = 3
-
-[arm]
-DEFAULTSERVICES = core identity revocation
+FORCESTART = YES
 
 [identity]
 # Directory where we store information about our egos
@@ -17,9 +15,6 @@ SUBSYSTEM_CFG = $SERVICEHOME/s.conf
 AUTOSTART = NO
 SERVERS = dummy
 
-[transport-udp]
-BROADCAST = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index f27bf0717..0a5655d53 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -19,16 +19,12 @@ INITSIZE = 4
 
 ALPHA = 0.45
 
-
-[arm]
-DEFAULTSERVICES = core ats transport cadet nse rps
-
 [testbed]
 OPERATION_TIMEOUT = 60 s
 
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1
 OVERLAY_TOPOLOGY = CLIQUE
-#SCALE_FREE_TOPOLOGY_CAP = 
+#SCALE_FREE_TOPOLOGY_CAP =
 
 OVERLAY_RANDOM_LINKS = 5
 
diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/scalarproduct/test_scalarproduct.conf
index cd93ef158..ffa6336af 100644
--- a/src/scalarproduct/test_scalarproduct.conf
+++ b/src/scalarproduct/test_scalarproduct.conf
@@ -1,7 +1,3 @@
-[arm]
-DEFAULTSERVICES = core cadet statistics set
-PORT = 12366
-
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-scalarproduct/
 
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
index 0a22561cd..a0e440084 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -409,7 +409,9 @@ time_between (struct GNUNET_TIME_Absolute start,
 static int
 peer_id_cmp (const void *p1, const void *p2)
 {
-  return memcmp (p1, p2, sizeof (struct GNUNET_PeerIdentity));
+  return memcmp (p1,
+                 p2,
+                 sizeof (struct GNUNET_PeerIdentity));
 }
 
 
@@ -427,8 +429,11 @@ peer_find (const struct GNUNET_PeerIdentity *haystack, unsigned int n,
            const struct GNUNET_PeerIdentity *needle)
 {
   unsigned int i;
+
   for (i = 0; i < n; i++)
-    if (0 == memcmp (&haystack[i], needle, sizeof (struct GNUNET_PeerIdentity)))
+    if (0 == memcmp (&haystack[i],
+                     needle,
+                     sizeof (struct GNUNET_PeerIdentity)))
       return i;
   return -1;
 }
@@ -468,8 +473,13 @@ normalize_peers (struct GNUNET_PeerIdentity *listed,
   if (GNUNET_NO == local_peer_in_list)
     normalized[n - 1] = my_peer;
 
-  memcpy (normalized, listed, num_listed * sizeof (struct GNUNET_PeerIdentity));
-  qsort (normalized, n, sizeof (struct GNUNET_PeerIdentity), &peer_id_cmp);
+  memcpy (normalized,
+          listed,
+          num_listed * sizeof (struct GNUNET_PeerIdentity));
+  qsort (normalized,
+         n,
+         sizeof (struct GNUNET_PeerIdentity),
+         &peer_id_cmp);
 
   if (NULL != my_peer_idx)
     *my_peer_idx = peer_find (normalized, n, &my_peer);
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index ec31ae8f0..9980666cd 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -10,10 +10,6 @@ AUTOSTART = YES
 OPTIONS = -LERROR
 PLUGINS = unix
 
-
-[arm]
-DEFAULTSERVICES = core consensus set secretsharing
-
 [set]
 OPTIONS = -L INFO
 AUTOSTART = YES
@@ -23,7 +19,7 @@ AUTOSTART = YES
 OVERLAY_TOPOLOGY = CLIQUE
 
 [hostlist]
-SERVERS = 
+SERVERS =
 
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)
diff --git a/src/sensor/gnunet-sensor-profiler.conf b/src/sensor/gnunet-sensor-profiler.conf
index 34a0f41b2..1c9cdb3bd 100644
--- a/src/sensor/gnunet-sensor-profiler.conf
+++ b/src/sensor/gnunet-sensor-profiler.conf
@@ -1,9 +1,6 @@
 [testbed]
 OVERLAY_TOPOLOGY = FROM_FILE
 
-[arm]
-DEFAULTSERVICES = topology dht cadet
-
 [sensor]
 SENSOR_DIR = /tmp/gnunet-sensor-profiler/
 
diff --git a/src/sensor/test_gnunet-service-sensor_reporting.conf b/src/sensor/test_gnunet-service-sensor_reporting.conf
index 6c1ad845b..119191f01 100644
--- a/src/sensor/test_gnunet-service-sensor_reporting.conf
+++ b/src/sensor/test_gnunet-service-sensor_reporting.conf
@@ -1,9 +1,6 @@
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
 
-[arm]
-DEFAULTSERVICES = topology dht cadet
-
 [sensor]
 #PREFIX = valgrind --leak-check=full
 SENSOR_DIR = /tmp/test-gnunet-service-sensor-reporting/
diff --git a/src/sensor/test_pow_sign.conf b/src/sensor/test_pow_sign.conf
index ae23d4d26..e69de29bb 100644
--- a/src/sensor/test_pow_sign.conf
+++ b/src/sensor/test_pow_sign.conf
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = core
\ No newline at end of file
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 8b727d2f8..011a5ed4b 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -2,9 +2,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-set/
 
-[arm]
-DEFAULTSERVICES = topology dht nse cadet
-
 [set]
 AUTOSTART = YES
 @UNIXONLY@ PORT = 2106
diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index 5fcfb8d3b..e69de29bb 100644
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -1,2 +0,0 @@
-[arm]
-DEFAULTSERVICES = statistics core transport dht cadet multicast psycstore psyc social
diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index e458f08bf..c4fdb6aec 100644
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_api_data.conf
@@ -8,47 +8,28 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-statistics.unix
 
 [arm]
 PORT = 22354
-DEFAULTSERVICES =
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-arm.unix
 
-[fs]
-AUTOSTART = NO
+[hostlist]
+FORCESTART = NO
 
 [datastore]
-AUTOSTART = NO
+FORCESTART = NO
 
 [dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
-[peerinfo]
-AUTOSTART = NO
-
-[dns]
-AUTOSTART = NO
+FORCESTART = NO
 
 [nse]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
+FORCESTART = NO
 
-[ats]
-AUTOSTART = NO
+[cadet]
+FORCESTART = NO
 
-[namestore]
-AUTOSTART = NO
+[revocation]
+FORCESTART = NO
 
-[gns]
-AUTOSTART = NO
+[topology]
+FORCESTART = NO
 
-[vpn]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
+[fs]
+FORCESTART = NO
\ No newline at end of file
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index f08cb5b9a..f7c9b7c76 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -6,18 +6,6 @@ HOSTNAME = localhost
 OVERLAY_TOPOLOGY = NONE
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -27,54 +15,22 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-PORT = 12365
 
 [ats]
 WAN_QUOTA_OUT = 3932160
 WAN_QUOTA_IN = 3932160
 
 [core]
-PORT = 12092
-AUTOSTART = YES
 USE_EPHEMERAL_KEYS = NO
 
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
 [transport-udp]
 TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-testbed/
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
 [peerinfo]
 NO_IO = YES
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 7a174b9dd..ec0334c05 100644
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -1,36 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-testing/
 
-[resolver]
-PORT = 2564
-
 [transport]
-PORT = 2565
 PLUGINS = tcp
 
 [transport-tcp]
 TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -40,39 +19,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf
index b8408774f..e1830edd2 100644
--- a/src/testing/test_testing_sharedservices.conf
+++ b/src/testing/test_testing_sharedservices.conf
@@ -6,37 +6,15 @@ PORT = 15000
 UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
 DIR = /tmp/testbed-logger
 
-[resolver]
-PORT = 2564
-
 [transport]
-PORT = 2565
 PLUGINS = tcp
 
 [transport-tcp]
 TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
 
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 BINDTO = 127.0.0.1
 
-[peerinfo]
-PORT = 2569
-AUTOSTART = NO
-
-[core]
-PORT = 2570
-
-[dht]
-AUTOSTART = NO
-
 [nat]
 DISABLEV6 = YES
 ENABLE_UPNP = NO
@@ -46,39 +24,3 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 79f12e5e1..a413ab72c 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -1,27 +1,15 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-topology/
 
-[resolver]
-PORT = 2664
-
 [transport]
-PORT = 2665
 PLUGINS = tcp
 #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
 
-[arm]
-PORT = 2666
-DEFAULTSERVICES = topology
-
 [testbed]
 OVERLAY_TOPOLOGY=LINE
 
-[statistics]
-PORT = 2667
-
 [transport-tcp]
-PORT = 2668
 BINDTO = 127.0.0.1
 
 [nat]
@@ -34,36 +22,3 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 USE_HOSTNAME = NO
 
-[peerinfo]
-PORT = 2669
-
-[core]
-PORT = 2670
-
-[topology]
-#PREFIX = valgrind --tool=memcheck
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 5e72d57ce..79dd52347 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -1,4 +1,5 @@
 [topology]
+FORCESTART = YES
 MINIMUM-FRIENDS = 0
 FRIENDS-ONLY = NO
 TARGET-CONNECTION-COUNT = 16
diff --git a/src/transport/perf_http_peer1.conf b/src/transport/perf_http_peer1.conf
index b62be1ba1..fd99469ae 100644
--- a/src/transport/perf_http_peer1.conf
+++ b/src/transport/perf_http_peer1.conf
@@ -7,8 +7,6 @@ PORT = 12001
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = http_client
 
-[transport-http_client]
-
 [nat]
 # Disable IPv6 support
 DISABLEV6 = YES
@@ -18,7 +16,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_http_peer2.conf b/src/transport/perf_http_peer2.conf
index 8ae6970f6..3c6f7fd8e 100644
--- a/src/transport/perf_http_peer2.conf
+++ b/src/transport/perf_http_peer2.conf
@@ -19,7 +19,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_https_peer1.conf b/src/transport/perf_https_peer1.conf
index 6a2de711c..1f8c5bc90 100644
--- a/src/transport/perf_https_peer1.conf
+++ b/src/transport/perf_https_peer1.conf
@@ -18,7 +18,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_https_peer2.conf b/src/transport/perf_https_peer2.conf
index 8a613b794..96d09a9ba 100644
--- a/src/transport/perf_https_peer2.conf
+++ b/src/transport/perf_https_peer2.conf
@@ -19,7 +19,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_tcp_peer1.conf b/src/transport/perf_tcp_peer1.conf
index 9cca25b3c..610a88ab6 100644
--- a/src/transport/perf_tcp_peer1.conf
+++ b/src/transport/perf_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_tcp_peer2.conf b/src/transport/perf_tcp_peer2.conf
index 8f6b551e9..a39b985dc 100644
--- a/src/transport/perf_tcp_peer2.conf
+++ b/src/transport/perf_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_udp_peer1.conf b/src/transport/perf_udp_peer1.conf
index 89822048f..225303fee 100644
--- a/src/transport/perf_udp_peer1.conf
+++ b/src/transport/perf_udp_peer1.conf
@@ -24,7 +24,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_udp_peer2.conf b/src/transport/perf_udp_peer2.conf
index e8b065ead..6562da5aa 100644
--- a/src/transport/perf_udp_peer2.conf
+++ b/src/transport/perf_udp_peer2.conf
@@ -24,7 +24,6 @@ RETURN_LOCAL_ADDRESSES = NO
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_unix_peer1.conf b/src/transport/perf_unix_peer1.conf
index 297ae4cbc..96cda0748 100644
--- a/src/transport/perf_unix_peer1.conf
+++ b/src/transport/perf_unix_peer1.conf
@@ -12,7 +12,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-unix.sock
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/perf_unix_peer2.conf b/src/transport/perf_unix_peer2.conf
index 587b47b68..a9178ed8f 100644
--- a/src/transport/perf_unix_peer2.conf
+++ b/src/transport/perf_unix_peer2.conf
@@ -13,7 +13,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-unix.sock
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport hostlist
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 3042ce862..caab17154 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -18,7 +18,6 @@ PORT = 12007
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
@@ -46,4 +45,4 @@ PORT = 12006
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [hostlist]
-SERVERS = dummy
\ No newline at end of file
+SERVERS = dummy
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index f81eeae62..fbac192c1 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -14,7 +14,6 @@ PORT = 12017
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
@@ -40,4 +39,4 @@ PORT = 12016
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [hostlist]
-SERVERS = dummy
\ No newline at end of file
+SERVERS = dummy
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index c24403954..2b9d134dc 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -8,8 +8,6 @@ PORT = 2400
 [transport-udp]
 PORT = 2401
 
-[transport-unix]
-
 [transport-wlan]
 INTERFACE = mon0
 TESTMODE = 1
@@ -18,13 +16,9 @@ TESTMODE = 1
 INTERFACE = hci0
 TESTMODE = 1
 
-[transport-http_client]
-
 [transport-http_server]
 PORT = 2402
 
-[transport-https_client]
-
 [transport-https_server]
 PORT = 2403
 
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index d1e91a220..04c5161e9 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index c80e588ce..326943504 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_http_peer1.conf b/src/transport/test_transport_address_switch_http_peer1.conf
index da35eae27..623d1c114 100644
--- a/src/transport/test_transport_address_switch_http_peer1.conf
+++ b/src/transport/test_transport_address_switch_http_peer1.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_http_peer2.conf b/src/transport/test_transport_address_switch_http_peer2.conf
index 969485f80..b783b0710 100644
--- a/src/transport/test_transport_address_switch_http_peer2.conf
+++ b/src/transport/test_transport_address_switch_http_peer2.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_https_peer1.conf b/src/transport/test_transport_address_switch_https_peer1.conf
index a95dc9029..4fe0ea574 100644
--- a/src/transport/test_transport_address_switch_https_peer1.conf
+++ b/src/transport/test_transport_address_switch_https_peer1.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_https_peer2.conf b/src/transport/test_transport_address_switch_https_peer2.conf
index 61b073a6d..351e2af21 100644
--- a/src/transport/test_transport_address_switch_https_peer2.conf
+++ b/src/transport/test_transport_address_switch_https_peer2.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_tcp_peer1.conf b/src/transport/test_transport_address_switch_tcp_peer1.conf
index e00c25631..34248b9e3 100644
--- a/src/transport/test_transport_address_switch_tcp_peer1.conf
+++ b/src/transport/test_transport_address_switch_tcp_peer1.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_address_switch_tcp_peer2.conf
index b3fdcce09..91a699d76 100644
--- a/src/transport/test_transport_address_switch_tcp_peer2.conf
+++ b/src/transport/test_transport_address_switch_tcp_peer2.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_udp_peer1.conf b/src/transport/test_transport_address_switch_udp_peer1.conf
index 12fe3d25f..69887cf25 100644
--- a/src/transport/test_transport_address_switch_udp_peer1.conf
+++ b/src/transport/test_transport_address_switch_udp_peer1.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_address_switch_udp_peer2.conf b/src/transport/test_transport_address_switch_udp_peer2.conf
index f9f1cfa5e..a0b1d405c 100644
--- a/src/transport/test_transport_address_switch_udp_peer2.conf
+++ b/src/transport/test_transport_address_switch_udp_peer2.conf
@@ -27,7 +27,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
index 855fa2557..dff464e45 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf
@@ -4,7 +4,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/
 
 [arm]
 PORT = 12000
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
index c81777ae3..245175788 100644
--- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf
+++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf
@@ -4,7 +4,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/
 
 [arm]
 PORT = 12010
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
index 66daf44ec..297382fcf 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
index c80e588ce..326943504 100644
--- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf
+++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 238089c42..f7bc22fd2 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -6,7 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 [arm]
 PORT = 12085
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index f2b748fd8..4e443d890 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -9,7 +9,6 @@ USE_IPv6 = YES
 
 [arm]
 PORT = 12095
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index aebaf88e2..9b203a819 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -7,7 +7,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
 [arm]
 PORT = 12095
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf
index 210e44a02..e5a2fa73d 100644
--- a/src/transport/test_transport_api_http_reverse_peer2.conf
+++ b/src/transport/test_transport_api_http_reverse_peer2.conf
@@ -16,7 +16,6 @@ EXTERNAL_HOSTNAME_ONLY = YES
 
 [arm]
 PORT = 12085
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index 2e9912593..4cdfdcdee 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index 06bd8aeca..da6e70185 100644
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
index 952230a49..49ddc3236 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
@@ -28,4 +27,4 @@ PORT = 12001
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 PLUGINS = tcp
 MANIPULATE_DELAY_IN = 100 ms
-MANIPULATE_DELAY_OUT = 100 ms
\ No newline at end of file
+MANIPULATE_DELAY_OUT = 100 ms
diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
index 85127bee4..fa3f25e04 100644
--- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
index c05439ab2..d75e23e06 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
index c80e588ce..326943504 100644
--- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
index c05439ab2..d75e23e06 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
index c80e588ce..326943504 100644
--- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
+++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 0313f5b60..4a2bc08da 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -17,7 +17,6 @@ PORT = 12143
 
 [arm]
 PORT = 12149
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 2d548a66d..1cf0d9e2e 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -20,7 +20,6 @@ PORT = 12153
 
 [arm]
 PORT = 12159
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
index 6de950189..e3c14dc0b 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -13,7 +13,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 1204
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
index 5e8b54a68..6a648c41c 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -12,7 +12,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12034
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 66daf44ec..297382fcf 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf
index e6baa32f6..879223ad9 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 0b2e7a4d3..946d5e1cb 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -13,7 +13,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 1204
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index b2afa4a8d..eae20a8d5 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -12,7 +12,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12034
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index c05439ab2..d75e23e06 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index c80e588ce..326943504 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index 9c3f90998..5811761d2 100644
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -2,13 +2,8 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/
 
-[nat]
-
-[transport-http_client]
-
 [arm]
 PORT = 12085
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index 7d0359fd2..934dc8c6c 100644
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -2,8 +2,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/
 
-[nat]
-
 [transport-http_server]
 PORT = 12090
 USE_IPv6 = NO
@@ -12,7 +10,6 @@ BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12095
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index 00980de99..8fc2edf2e 100644
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -2,8 +2,6 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/
 
-[transport-https_client]
-
 [arm]
 PORT = 12105
 
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf
index 2e9912593..4cdfdcdee 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer1.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf
index b3c68ac0e..2abd5331c 100644
--- a/src/transport/test_transport_api_timeout_tcp_peer2.conf
+++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf
@@ -10,7 +10,6 @@ PORT = 12100
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 526f3e6b1..23f280b5e 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -12,7 +12,6 @@ PORT = 0
 
 [arm]
 PORT = 12065
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 24bb6f691..702791846 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -10,7 +10,6 @@ PORT = 12070
 
 [arm]
 PORT = 12075
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
index f9b5a18cc..d9e665e35 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
@@ -33,4 +32,4 @@ PLUGINS = tcp
 #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
 
 [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
\ No newline at end of file
+DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
index b56cca0f6..3f5dd407f 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
@@ -34,4 +33,4 @@ PLUGINS = tcp udp
 
 [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
 DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
- 
\ No newline at end of file
+ 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
index 05f2d0891..d1650a014 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
@@ -34,4 +33,4 @@ PLUGINS = tcp
 
 [transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
 DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
- 
\ No newline at end of file
+ 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
index 1700929f7..85e8d7518 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
@@ -34,4 +33,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG =
- 
\ No newline at end of file
+ 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
index 34d4acd05..c16da07a9 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
@@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
 
 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
\ No newline at end of file
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
index ad7fd4322..6af51d699 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
@@ -33,4 +32,4 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 #Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
 
 [transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp 
\ No newline at end of file
+6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp 
diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf
index c05439ab2..d75e23e06 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer1.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12005
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf
index e6baa32f6..879223ad9 100644
--- a/src/transport/test_transport_blacklisting_cfg_peer2.conf
+++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf
@@ -8,7 +8,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index 48cdb0022..40b92433e 100644
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -4,29 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-transport-api/
 [transport-tcp]
 TIMEOUT = 300 s
 
-[arm]
-DEFAULTSERVICES =
-
 [transport]
 #PREFIX = valgrind -v --gen-suppressions=yes 
 
 [core]
 AUTOSTART = NO
+FORCESTART = NO
 
 [datastore]
 AUTOSTART = NO
 
 [fs]
 AUTOSTART = NO
+FORCESTART = NO
 
 [dht]
 AUTOSTART = NO
+FORCESTART = NO
 
 [cadet]
 AUTOSTART = NO
+FORCESTART = NO
 
 [nse]
 AUTOSTART = NO
+FORCESTART = NO
 
 [dns]
 AUTOSTART = NO
@@ -58,9 +60,6 @@ AUTOSTART = NO
 [sensor]
 AUTOSTART = NO
 
-[mesh]
-AUTOSTART = NO
-
 [set]
 AUTOSTART = NO
 
@@ -75,6 +74,7 @@ AUTOSTART = NO
 
 [revocation]
 AUTOSTART = NO
+FORCESTART = NO
 
 [nat]
 DISABLEV6 = NO
@@ -83,8 +83,5 @@ BINDTO = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[TESTING]
-WEAKRANDOM = YES
-
 [transport-udp]
 BROADCAST_RECEIVE = no
diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf
index 8e161382b..164a38f69 100644
--- a/src/transport/test_transport_startonly.conf
+++ b/src/transport/test_transport_startonly.conf
@@ -1,9 +1,6 @@
 @INLINE@ test_transport_defaults.conf
 [PATHS]
 
-[arm]
-DEFAULTSERVICES = transport
-
 [transport-tcp]
 PORT = 2094
 
diff --git a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
index 6542a826d..377cfe689 100644
--- a/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
+++ b/src/transport/test_transport_test_transport_address_switch_tcp_peer2.conf
@@ -29,7 +29,6 @@ TIMEOUT = 5 s
 
 [arm]
 PORT = 12014
-DEFAULTSERVICES = transport
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]