diff --git a/ChangeLog b/ChangeLog
index 779e3b4cd..1bafc8212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/NGLdapEntry+Contact.[hm]: removed class
+	module, obsoleted by code in SOGo/LDAPSource.[hm].
+
 2007-05-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxAclEditor.m ([UIxAclEditor -currentUserIsOwner]):
diff --git a/SoObjects/Contacts/NGLdapEntry+Contact.h b/SoObjects/Contacts/NGLdapEntry+Contact.h
deleted file mode 100644
index 0551e6110..000000000
--- a/SoObjects/Contacts/NGLdapEntry+Contact.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* NGLdapEntry+Contact.h - this file is part of SOGo
- *
- * Copyright (C) 2006 Inverse groupe conseil
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef NGLDAPENTRY_CONTACT_H
-#define NGLDAPENTRY_CONTACT_H
-
-#import <NGLdap/NGLdapEntry.h>
-
-@class NSArray;
-@class NSDictionary;
-@class NSString;
-
-@interface NGLdapEntry (SOGoContactExtension)
-
-- (NSString *) singleAttributeWithName: (NSString *) key;
-- (NSDictionary *) asDictionaryWithAttributeNames: (NSArray *) attributes
-                                          withUID: (NSString *) uid
-                                         andCName: (NSString *) cName;
-
-@end
-
-#endif /* NGLDAPENTRY_CONTACT_H */
diff --git a/SoObjects/Contacts/NGLdapEntry+Contact.m b/SoObjects/Contacts/NGLdapEntry+Contact.m
deleted file mode 100644
index 53e9fe42c..000000000
--- a/SoObjects/Contacts/NGLdapEntry+Contact.m
+++ /dev/null
@@ -1,81 +0,0 @@
-/* NGLdapEntry+Contact.m - this file is part of SOGo
- *
- * Copyright (C) 2006 Inverse groupe conseil
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-
-#import <NGLdap/NGLdapAttribute.h>
-
-#import "NGLdapEntry+Contact.h"
-
-@implementation NGLdapEntry (SOGoContactExtension)
-
-- (NSString *) singleAttributeWithName: (NSString *) key
-{
-  return [[self attributeWithName: key]
-           stringValueAtIndex: 0];
-}
-
-- (NSDictionary *) asDictionaryWithAttributeNames: (NSArray *) attributeNames
-                                          withUID: (NSString *) uid
-                                         andCName: (NSString *) cName
-{
-  NSMutableDictionary *valuesDict;
-  NSEnumerator *attrEnum;
-  NSString *attribute, *value;
-
-  if (!attributeNames)
-    attributeNames = [self attributeNames];
-
-  valuesDict = [NSMutableDictionary dictionaryWithCapacity: [attributeNames count]];
-  attrEnum = [attributeNames objectEnumerator];
-  attribute = [attrEnum nextObject];
-  while (attribute)
-    {
-      [valuesDict setObject: [self singleAttributeWithName: attribute]
-                  forKey: attribute];
-      attribute = [attrEnum nextObject];
-    }
-  if (cName)
-    {
-      value = [self singleAttributeWithName: cName];
-      if (!value)
-        value = @"";
-      NSLog (@"value for '%@' = '%@'", cName, value);
-      [valuesDict setObject: value
-                  forKey: @"c_name"];
-    }
-  if (uid)
-    {
-      value = [self singleAttributeWithName: uid];
-      if (!value)
-        value = @"";
-      NSLog (@"value for '%@' = '%@'", uid, value);
-      [valuesDict setObject: value
-                  forKey: @"c_uid"];
-    }
-
-  return valuesDict;
-}
-
-@end