diff --git a/OpenChange/SOGoGCSFolder+MAPIStore.h b/OpenChange/SOGoGCSFolder+MAPIStore.h
deleted file mode 100644
index 868e555ae..000000000
--- a/OpenChange/SOGoGCSFolder+MAPIStore.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SOGoGCSFolder+MAPIStore.h - this file is part of SOGo
- *
- * Copyright (C) 2010 Inverse inc.
- *
- * 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 3, 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 SOGOGCSFOLDER_MAPISTORE_H
-#define SOGOGCSFOLDER_MAPISTORE_H
-
-#import <SOGo/SOGoGCSFolder.h>
-
-@class NSString;
-
-@interface SOGoGCSFolder (MAPIStore)
-
-- (NSArray *) componentKeysWithType: (NSString *) component;
-
-@end
-
-#endif /* SOGOGCSFOLDER+MAPISTORE_H */
diff --git a/OpenChange/SOGoGCSFolder+MAPIStore.m b/OpenChange/SOGoGCSFolder+MAPIStore.m
deleted file mode 100644
index 6fcb4e97b..000000000
--- a/OpenChange/SOGoGCSFolder+MAPIStore.m
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SOGoGCSFolder+MAPIStore.m - this file is part of SOGo
- *
- * Copyright (C) 2010 Inverse inc.
- *
- * 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 3, 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 "SOGoGCSFolder+MAPIStore.h"
-
-@implementation SOGoGCSFolder (MAPIStore)
-
-- (NSArray *) componentKeysWithType: (NSString *) component
-{
-  NSArray *records;
-  NSMutableArray *keys;
-  NSInteger count, max;
-  NSDictionary *record;
-
-  [self toOneRelationshipKeys];
-
-  records = [childRecords allValues];
-  max = [records count];
-  keys = [NSMutableArray arrayWithCapacity: max];
-  for (count = 0; count < max; count++)
-    {
-      record = [records objectAtIndex: count];
-      if ([[record objectForKey: @"c_component"]
-            isEqualToString: component])
-        [keys addObject: [record objectForKey: @"c_name"]];
-    }
-
-  return keys;
-}
-
-@end