diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
index b721ed057..95efe3ae0 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -634,11 +634,8 @@ static SoSecurityManager *sm = nil;
 {
   SOGoAppointmentFolder *currentFolder;
   NSArray *subFolderNames, *proxyRoles;
-  NSMutableArray *subscribers;
   int folderCount, folderMax, userCount, userMax;
 
-  subscribers = [NSMutableArray array];
-
   proxyRoles = [self _requiredProxyRolesWithWriteAccess: write];
   subFolderNames = [self subFolders];
   folderMax = [subFolderNames count];
@@ -664,11 +661,8 @@ static SoSecurityManager *sm = nil;
 {
   SOGoAppointmentFolder *currentFolder;
   NSArray *subFolderNames;
-  NSMutableArray *subscribers;
   int folderCount, folderMax, userCount, userMax;
 
-  subscribers = [NSMutableArray array];
-
   subFolderNames = [self subFolders];
   folderMax = [subFolderNames count];
   for (folderCount = 0; folderCount < folderMax; folderCount++)
diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
index 1a32b73cb..31f712ee3 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
+#import <Foundation/NSNull.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 4294e50b8..862525153 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -22,7 +22,6 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSEnumerator.h>
-#import <Foundation/NSNull.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>