diff -Nur e-smith-base-5.8.0/createlinks e-smith-base-5.8.0_bz9420/createlinks
--- e-smith-base-5.8.0/createlinks	2016-04-11 20:46:45.734751970 +0200
+++ e-smith-base-5.8.0_bz9420/createlinks	2016-04-11 20:47:58.185758832 +0200
@@ -38,8 +38,6 @@
 service_link_enhanced("wan", "K90", "0");
 service_link_enhanced("wan", "K90", "1");
 
-service_link_enhanced("udev-post", "S26", "7");
-
 # conf-dialup
 foreach (qw(
     /etc/sysconfig/network-scripts/ifcfg-ppp0
@@ -550,8 +548,6 @@
     smartd    	=> "40",
     acpid    	=> "44",
     dhcpd    	=> "65",
-    messagebus 	=> "97",
-    haldaemon  	=> "98",
     'local'    	=> "99",
 );
 
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/haldaemon/status e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/haldaemon/status
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/haldaemon/status	2005-11-21 05:28:04.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/haldaemon/status	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-enabled
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/haldaemon/type e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/haldaemon/type
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/haldaemon/type	2005-11-21 05:28:04.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/haldaemon/type	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-service
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/messagebus/status e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/messagebus/status
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/messagebus/status	2005-11-21 05:28:04.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/messagebus/status	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-enabled
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/messagebus/type e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/messagebus/type
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/messagebus/type	2005-11-21 05:28:04.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/messagebus/type	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-service
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/udev-post/status e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/udev-post/status
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/udev-post/status	2014-03-24 03:47:25.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/udev-post/status	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-enabled
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/udev-post/type e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/udev-post/type
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/defaults/udev-post/type	2014-03-24 03:47:25.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/defaults/udev-post/type	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-service
diff -Nur e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices
--- e-smith-base-5.8.0/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.8.0_bz9420/root/etc/e-smith/db/configuration/migrate/50RemoveObsoleteServices	2016-04-11 20:58:44.861730298 +0200
@@ -0,0 +1,10 @@
+{
+
+  # Remove old, unused services from the configuration database
+  my @services = qw(haldaemon smolt udev-post messagebus);
+  foreach my $service (@services){
+    my $entry = $DB->get($service);
+    $entry->delete if $entry;
+  }
+
+}