diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m
index 97e7f51d0..761ec4557 100644
--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@@ -38,21 +38,14 @@
 #undef DEBUG
 #include <mapistore/mapistore.h>
 
-static Class SOGoUserFolderK;
-
 @implementation MAPIStoreCalendarContext
 
-+ (void) initialize
-{
-  SOGoUserFolderK = [SOGoUserFolder class];
-}
-
 - (void) setupModuleFolder
 {
   id userFolder;
 
-  userFolder = [SOGoUserFolderK objectWithName: [authenticator username]
-                                   inContainer: MAPIApp];
+  userFolder = [SOGoUserFolder objectWithName: [authenticator username]
+                                  inContainer: MAPIApp];
   [woContext setClientObject: userFolder];
   [userFolder retain]; // LEAK
 
diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m
index 28d01c2e6..ffb327e6c 100644
--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@@ -36,21 +36,14 @@
 #undef DEBUG
 #include <mapistore/mapistore.h>
 
-static Class SOGoUserFolderK;
-
 @implementation MAPIStoreTasksContext
 
-+ (void) initialize
-{
-  SOGoUserFolderK = [SOGoUserFolder class];
-}
-
 - (void) setupModuleFolder
 {
   id userFolder;
 
-  userFolder = [SOGoUserFolderK objectWithName: [authenticator username]
-                                   inContainer: MAPIApp];
+  userFolder = [SOGoUserFolder objectWithName: [authenticator username]
+                                  inContainer: MAPIApp];
   [woContext setClientObject: userFolder];
   [userFolder retain]; // LEAK