diff --git a/SoObjects/Appointments/SOGoTaskObject.h b/SoObjects/Appointments/SOGoTaskObject.h
index 5d15c856a..55c5a2e03 100644
--- a/SoObjects/Appointments/SOGoTaskObject.h
+++ b/SoObjects/Appointments/SOGoTaskObject.h
@@ -1,7 +1,6 @@
 /*
 
-  Copyright (C) 2006-2014 Inverse inc.
-  Copyright (C) 2004-2005 SKYRIX Software AG
+  Copyright (C) 2006-2016 Inverse inc.
 
   This file is part of SOGo.
 
@@ -26,24 +25,6 @@
 
 #import "SOGoCalendarComponent.h"
 
-/*
-  SOGoTaskObject
-  
-  Represents a single task. This SOPE controller object manages all the
-  attendee storages (that is, it might store into multiple folders for meeting
-  tasks!).
-
-  Note: SOGoTaskObject do not need to exist yet. They can also be "new"
-        tasks with an externally generated unique key.
-*/
-
-@class NSArray;
-@class NSException;
-@class NSString;
-
-@class iCalToDo;
-@class iCalCalendar;
-
 @interface SOGoTaskObject : SOGoCalendarComponent
 
 @end
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index 4cbf1a996..1ff97bdd5 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -1,6 +1,5 @@
 /*
-  Copyright (C) 2006-2014 Inverse inc.
-  Copyright (C) 2004-2005 SKYRIX Software AG
+  Copyright (C) 2006-2016 Inverse inc.
 
   This file is part of SOGo.
 
@@ -21,25 +20,17 @@
 */
 
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDate.h>
-#import <Foundation/NSException.h>
 
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalToDo.h>
-#import <NGCards/iCalEventChanges.h>
-#import <NGCards/iCalPerson.h>
-#import <SOGo/SOGoUserManager.h>
-
-#import <SoObjects/SOGo/SOGoMailer.h>
 
 #import "iCalCalendar+SOGo.h"
 #import "NSArray+Appointments.h"
-#import "SOGoAptMailNotification.h"
-#import "SOGoAppointmentFolder.h"
 #import "SOGoTaskOccurence.h"
 
 #import "SOGoTaskObject.h"