diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index 39b9d823ecb18278129a54dcebfec24023835592..5ccbab4ecff2b0e85007b537a9e0475502fabc95 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -103,10 +103,6 @@
        every "tab" defined "class" and will show it inside of a tabbed dialog
        with the header defined in "name".
    -->
-  <arpnewdevicetabs>
-    <tab class="ArpNewDevice" name="Generic" />
-  </arpnewdevicetabs>
-
   <servertabs>
      <tab class="ServerService" name="Services" />
   </servertabs>
diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5
index e48d6535699c2152e2f19e692da0829f3fc81118..aaa57dad7d5086d3ab13774d20fb42ae57813114 100644
--- a/contrib/man/fusiondirectory.conf.5
+++ b/contrib/man/fusiondirectory.conf.5
@@ -779,14 +779,6 @@ departments. Default is
 .I ou=blocklists.
 .PP
 
-.B systemIncomingRDN
-.I string
-.PP
-This statement defines the location where FusionDirectory looks for new systems to be joined to the LDAP.
-Default is
-.I ou=incoming.
-.PP
-
 .B systemRDN
 .I string
 .PP
diff --git a/include/functions.inc b/include/functions.inc
index cfcaac3d4033f9007e0a573b5686ac0f043a46c5..2cfa523e51b4797a0ac9e436bc05061511f7e416 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1574,7 +1574,6 @@ function get_ou($name)
                 "sambaMachineAccountRDN"  => "ou=computers,",
 
                 "faxBlocklistRDN"     => "ou=gofax,ou=systems,",
-                "systemIncomingRDN"   => "ou=incoming,",
                 "aclRoleRDN"          => "ou=aclroles,",
                 "phoneMacroRDN"       => "ou=macros,ou=asterisk,ou=configs,ou=systems,",
                 "phoneConferenceRDN"  => "ou=conferences,ou=asterisk,ou=configs,ou=systems,",
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 121abeae67dcf7ea467f97cefac06df98587a963..b1d91afe813f168b3568fe6f185ebaf3a3b96b07 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -740,7 +740,7 @@ class Step_Migrate extends setup_step
     /* Skip FusionDirectory internal departments */
     $skip_dns = array("/".$cv['peopleou']."/","/".$cv['groupou']."/","/^ou=people,/","/^ou=groups,/","/^ou=sudoers,/",
         "/(,|)ou=configs,/","/(,|)ou=systems,/","/(,|)ou=tokens,/",
-        "/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/","/^ou=incoming,/",
+        "/(,|)ou=apps,/","/(,|)ou=mime,/","/(,|)ou=devices/","/^ou=aclroles,/",
         "/ou=snapshots,/","/(,|)dc=addressbook,/","/^(,|)ou=machineaccounts,/",
         "/(,|)ou=winstations,/","/^ou=hosts,/","/^ou=computers,/","/^ou=idmap,/","/^ou=Idmap,/","/(,|)ou=roles,/");