1 files changed, 1 insertions, 22 deletions
diff --git a/src/comp.c b/src/comp.c
index 2346306..25f2657 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -26,7 +26,2 @@ struct complist
 
-/* 0 on the first load, and 1 on all subsequent reloads. Tells the
-   component_config_commit whether we're starting from scratch or just
-   updating an already loaded configuration */
-static int loaded;
-
 static struct complist comp_list[2];
@@ -542,12 +537,3 @@ component_config_commit (void)
   /* Rearrange components, registering entries for the new ones */
-  for (comp = list->head, i = 0; comp; )
-    {
-      struct component *next = comp->next;
-      if (loaded && comp->mode == pies_comp_startup)
-	{
-	  /* Ignore startup components */
-	  component_unlink (comp);
-	  component_free (comp);
-	}
-      else
+  for (comp = list->head, i = 0; comp; comp = comp->next, i++)
     {
@@ -565,8 +551,3 @@ component_config_commit (void)
       comp->arridx = i;
-	  i++;
     }
-      comp = next;
-    }
-  /* Adjust comp_count */
-  comp_count = i;
 
@@ -587,4 +568,2 @@ component_config_commit (void)
       register_prog (comp);
-
-  loaded = 1;
 }