diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index 634296d6ff375ff9685a1bf30eb7c6e62c607ea4..0b6d10d194ff4646476c001db9c240786f8fa86e 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -1,34 +1,17 @@
 {literal}<?xml version="1.0"?>{/literal}
 <conf configVersion="{$config_checksum}" >
 
-  <!-- Tab definitions *******************************************************
-       Tab definitions define the sub plugins which get included for certain
-       tabbed dialogs. If you change something here, never (!) remove the
-       primary (the first) "tab" tag which is defined. Most tabbed dialogs
-       need a primary plugin.
-
-       "*tab" should be looked for by a defined plugin. This one will take
-       every "tab" defined "class" and will show it inside of a tabbed dialog
-       with the header defined in "name".
+  <!-- Services **************************************************************
+    Old services that are not based on simpleService needs to be listed here
    -->
   <serverservice>
-    <tab class="goMailServer" />
-    <tab class="serviceKolab" />
-    <tab class="goNtpServer" />
-    <tab class="serviceRepository" />
-    <tab class="goImapServer" />
-    <tab class="goFaxServer" />
-    <tab class="goFonServer" />
-    <tab class="goCupsServer" />
-    <tab class="goKioskService" />
-    <tab class="goTerminalServer" />
-    <tab class="goLdapServer" />
-    <tab class="goShareServer" />
-    <tab class="gospamserver" />
-    <tab class="govirusserver" />
-    <tab class="serviceDHCP" />
-    <tab class="serviceDNS" />
-    <tab class="quotaService" />
+    <tab class="serviceRepository"  />
+    <tab class="serviceKiosk"       />
+    <tab class="serviceLDAP"        />
+    <tab class="serviceShare"       />
+    <tab class="serviceDHCP"        />
+    <tab class="serviceDNS"         />
+    <tab class="serviceQuota"       />
   </serverservice>
 
   <!-- Main section **********************************************************