diff --git a/ChangeLog b/ChangeLog
index f734739a2..4f44c570f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2008-08-07  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManager.c
+	  src/NetworkManagerSystem.h
+	  src/backends/NetworkManagerArch.c
+	  src/backends/NetworkManagerDebian.c
+	  src/backends/NetworkManagerFrugalware.c
+	  src/backends/NetworkManagerGeneric.c
+	  src/backends/NetworkManagerGeneric.h
+	  src/backends/NetworkManagerGentoo.c
+	  src/backends/NetworkManagerMandriva.c
+	  src/backends/NetworkManagerPaldo.c
+	  src/backends/NetworkManagerRedHat.c
+	  src/backends/NetworkManagerSlackware.c
+	  src/backends/NetworkManagerSuSE.c
+		- (nm_system_init, nm_system_kill_all_dhcp_daemons): remove, unused
+
 2008-08-06  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-glib/nm-ip4-config.c
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 9468c94ba..e3079db48 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -287,7 +287,6 @@ main (int argc, char *argv[])
 	nm_logging_setup (become_daemon);
 	nm_info ("starting...");
 
-	nm_system_init ();
 	main_loop = g_main_loop_new (NULL, FALSE);
 
 	/* Create watch functions that monitor cards for link status. */
diff --git a/src/NetworkManagerSystem.h b/src/NetworkManagerSystem.h
index fa2b33795..d50ce7c87 100644
--- a/src/NetworkManagerSystem.h
+++ b/src/NetworkManagerSystem.h
@@ -32,8 +32,6 @@
  * implemented in the backend files in backends/ directory
  */
 
-void			nm_system_init (void);
-
 void			nm_system_device_flush_ip4_routes				(NMDevice *dev);
 void			nm_system_device_flush_ip4_routes_with_iface	(const char *iface);
 
@@ -45,7 +43,6 @@ void			nm_system_device_flush_ip4_addresses			(NMDevice *dev);
 void			nm_system_device_flush_ip4_addresses_with_iface	(const char *iface);
 
 void			nm_system_enable_loopback				(void);
-void			nm_system_kill_all_dhcp_daemons			(void);
 void			nm_system_update_dns					(void);
 
 gboolean		nm_system_device_set_from_ip4_config		(const char *iface,
diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
index c7dc1bfd3..47fe55369 100644
--- a/src/backends/NetworkManagerArch.c
+++ b/src/backends/NetworkManagerArch.c
@@ -51,17 +51,6 @@
 #include "nm-device.h"
 #include "nm-utils.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -73,18 +62,6 @@ void nm_system_enable_loopback (void)
 	nm_system_device_set_up_down_with_iface ("lo", TRUE);
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-	nm_spawn_process ("/usr/bin/killall -q dhclient");
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
index ef6e50146..5d4f88486 100644
--- a/src/backends/NetworkManagerDebian.c
+++ b/src/backends/NetworkManagerDebian.c
@@ -40,17 +40,6 @@
 #include "nm-device.h"
 #include "nm-utils.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -62,18 +51,6 @@ void nm_system_enable_loopback (void)
 	nm_spawn_process ("/sbin/ifup lo");
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-	nm_spawn_process ("/usr/bin/killall -q dhclient");
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c
index 301985ddf..f5e7f0bfa 100644
--- a/src/backends/NetworkManagerFrugalware.c
+++ b/src/backends/NetworkManagerFrugalware.c
@@ -38,16 +38,6 @@
 // Provided by the frugalwareutils package on Frugalware
 #include <libfwnetconfig.h>
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -60,18 +50,6 @@ void nm_system_enable_loopback (void)
 }
 
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-	nm_spawn_process ("/usr/bin/killall -q dhclient");
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c
index 1143c4387..8197e5288 100644
--- a/src/backends/NetworkManagerGeneric.c
+++ b/src/backends/NetworkManagerGeneric.c
@@ -44,18 +44,6 @@
 #include <netlink/route/addr.h>
 #include <netlink/netlink.h>
 
-/*
- * nm_generic_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_generic_init (void)
-{
-	/* Kill any dhclients lying around */
-	nm_system_kill_all_dhcp_daemons ();
-}
-
 /*
  * nm_generic_enable_loopback
  *
@@ -111,17 +99,6 @@ out:
 		rtnl_addr_put (addr);
 }
 
-/*
- * nm_generic_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_generic_kill_all_dhcp_daemons (void)
-{
-}
-
-
 /*
  * nm_generic_update_dns
  *
diff --git a/src/backends/NetworkManagerGeneric.h b/src/backends/NetworkManagerGeneric.h
index 420bc25a4..167d2714c 100644
--- a/src/backends/NetworkManagerGeneric.h
+++ b/src/backends/NetworkManagerGeneric.h
@@ -33,10 +33,7 @@
  * implemented in the backend files in backends/ directory
  */
 
-void			nm_generic_init (void);
-
 void			nm_generic_enable_loopback				(void);
-void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);
 
 void			nm_generic_set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config);
diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c
index ee7e0dbdd..827d07291 100644
--- a/src/backends/NetworkManagerGentoo.c
+++ b/src/backends/NetworkManagerGentoo.c
@@ -41,17 +41,6 @@
 #include "nm-utils.h"
 #include "shvar.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -65,18 +54,6 @@ void nm_system_enable_loopback (void)
 		nm_spawn_process("/etc/init.d/net.lo start");
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-        /* TODO */
-        /* Tell dhcdbd to kill its dhclient instance */
-}
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c
index f41c4bdc4..0b5430ac4 100644
--- a/src/backends/NetworkManagerMandriva.c
+++ b/src/backends/NetworkManagerMandriva.c
@@ -39,18 +39,6 @@
 #include "nm-utils.h"
 #include "shvar.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
-
 /*
  * nm_system_enable_loopback
  *
@@ -62,17 +50,6 @@ void nm_system_enable_loopback (void)
 	nm_generic_enable_loopback ();
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c
index 017d0cbb9..e78bfab4c 100644
--- a/src/backends/NetworkManagerPaldo.c
+++ b/src/backends/NetworkManagerPaldo.c
@@ -40,17 +40,6 @@
 #include "nm-device.h"
 #include "nm-utils.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -62,17 +51,6 @@ void nm_system_enable_loopback (void)
 	nm_generic_enable_loopback ();
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c
index 284ef40e4..c4b09fc36 100644
--- a/src/backends/NetworkManagerRedHat.c
+++ b/src/backends/NetworkManagerRedHat.c
@@ -37,17 +37,6 @@
 #include "nm-utils.h"
 #include "shvar.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -59,17 +48,6 @@ void nm_system_enable_loopback (void)
 	nm_generic_enable_loopback ();
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c
index 91fac1c76..cd3504e49 100644
--- a/src/backends/NetworkManagerSlackware.c
+++ b/src/backends/NetworkManagerSlackware.c
@@ -36,21 +36,6 @@
 #include "nm-device.h"
 #include "nm-utils.h"
 
-/*
- * Mostly a mix of the Gentoo and RedHat Backends
- */
-
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -63,18 +48,6 @@ void nm_system_enable_loopback (void)
 }
 
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-	nm_spawn_process ("/bin/killall -q dhcpcd");
-}
-
-
 /*
  * nm_system_update_dns
  *
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index 8578c7b4c..3f5faeae6 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -46,17 +46,6 @@
 #include "nm-utils.h"
 #include "shvar.h"
 
-/*
- * nm_system_init
- *
- * Initializes the distribution-specific system backend
- *
- */
-void nm_system_init (void)
-{
-	nm_generic_init ();
-}
-
 /*
  * nm_system_enable_loopback
  *
@@ -68,17 +57,6 @@ void nm_system_enable_loopback (void)
 	nm_generic_enable_loopback ();
 }
 
-/*
- * nm_system_kill_all_dhcp_daemons
- *
- * Kill all DHCP daemons currently running, done at startup.
- *
- */
-void nm_system_kill_all_dhcp_daemons (void)
-{
-}
-
-
 /*
  * nm_system_update_dns
  *