diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 54d111b691ca98d3fbf63a774e093d473c47f50f..2679eae8ac089308d3c83c5ae56cf18bb2fac0bb 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -4,12 +4,6 @@
 
 
 # Attributes
-attributetype ( 1.3.6.1.4.1.10098.1.1.12.1 NAME 'gosaSubtreeACL'
-  DESC 'GOsa - ACL entry'
-  OBSOLETE
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.2 NAME 'gosaUser'
   DESC 'GOsa - DN of a user'
@@ -23,13 +17,6 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.3 NAME 'gosaObject'
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.12.14 NAME 'gosaDefaultLanguage'
-  DESC 'GOsa - Defines the default language for a user'
-  OBSOLETE
-  EQUALITY caseIgnoreIA5Match
-  SUBSTR caseIgnoreIA5SubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
-
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.30 NAME 'gosaGroupObjects'
   DESC 'GOsa - List of all object types that are in a gosaGroupOfNames'
   EQUALITY caseIgnoreIA5Match
@@ -64,61 +51,17 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.39 NAME 'gosaSnapshotData'
   DESC 'GOsa - Original data of saved object in snapshot'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE)
 
-attributetype ( 1.3.6.1.4.1.10098.1.1.12.46 NAME 'gosaLoginRestriction'
-  DESC 'GOsa - Multivalue attribute to carry a number of allowed ips/subnets'
-  OBSOLETE
-  SUP name)
-
-attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
-  DESC 'Field to represent the academic title'
-  OBSOLETE
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
-
-attributetype ( 1.3.6.1.4.1.15305.2.1 NAME ( 'gender' 'sex' )
-  DESC    'Gender: M for male, F for female'
-  EQUALITY caseIgnoreIA5Match
-  SYNTAX  1.3.6.1.4.1.1466.115.121.1.26{1}
-  SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' )
-  DESC    'Date of birth in ISO 8601 format'
-  EQUALITY caseIgnoreMatch
-  SYNTAX  1.3.6.1.4.1.1466.115.121.1.15{10}
-  SINGLE-VALUE )
-
 # Classes
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY
-  DESC 'GOsa - Class for GOsa settings'
-  OBSOLETE
-  MUST ( )
-  MAY ( gosaSubtreeACL ))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL
   DESC 'GOsa - Class for GOsa locking'
   MUST ( gosaUser $ gosaObject $ cn ))
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL
-  DESC 'GOsa - Class for GOsa caching'
-  OBSOLETE
-  MAY  ( )
-  MUST ( cn $ gosaUser ))
-
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
   DESC 'GOsa - Class to mark Departments for GOsa'
   MUST  ( ou $ description )
   MAY   ( manager $ co $ labeledURI ) )
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
-  DESC 'GOsa - Class for GOsa Accounts'
-  OBSOLETE
-  MUST ( )
-  MAY (
-    gosaLoginRestriction $
-    gosaDefaultLanguage $ academicTitle $ personalTitle $ dateOfBirth $ gender
-  ) )
-
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY
   DESC 'GOsa - Class for GOsa User Templates'
   OBSOLETE