diff --git a/UI/Scheduler/UIxAttendeesEditor.h b/UI/Scheduler/UIxAttendeesEditor.h
index 530c33c51..4e08ccfa1 100644
--- a/UI/Scheduler/UIxAttendeesEditor.h
+++ b/UI/Scheduler/UIxAttendeesEditor.h
@@ -1,8 +1,6 @@
 /* UIxAttendeesEditor.h - this file is part of SOGo
  *
- * Copyright (C) 2007-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2015 Inverse inc.
  *
  * 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
diff --git a/UI/Scheduler/UIxAttendeesEditor.m b/UI/Scheduler/UIxAttendeesEditor.m
index 40379d48e..ae7de6700 100644
--- a/UI/Scheduler/UIxAttendeesEditor.m
+++ b/UI/Scheduler/UIxAttendeesEditor.m
@@ -1,8 +1,6 @@
 /* UIxAttendeesEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2015 Inverse inc.
  *
  * 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
diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h
index 201065c11..b660dc436 100644
--- a/UI/Scheduler/UIxComponentEditor.h
+++ b/UI/Scheduler/UIxComponentEditor.h
@@ -1,6 +1,6 @@
 /* UIxComponentEditor.h - this file is part of SOGo
  *
- * Copyright (C) 2006-2014 Inverse inc.
+ * Copyright (C) 2006-2015 Inverse inc.
  *
  * 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
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index c1d666e63..a7581e57c 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -176,7 +176,6 @@ iRANGE(2);
       [self setIsCycleEndNever];
       componentOwner = @"";
       organizer = nil;
-      //organizerIdentity = nil;
       organizerProfile = nil;
       ownerAsAttendee = nil;
       attendee = nil;
@@ -213,7 +212,6 @@ iRANGE(2);
   [title release];
   [location release];
   [organizer release];
-  //[organizerIdentity release];
   [organizerProfile release];
   [ownerAsAttendee release];
   [comment release];
@@ -820,25 +818,27 @@ iRANGE(2);
 	uid = email;
       
       [profile setObject: name
-			   forKey: @"name"];
+                  forKey: @"name"];
       
       [profile setObject: email
-			   forKey: @"email"];
+                  forKey: @"email"];
       
       if (partstat == nil || ![partstat length])
 	partstat = @"accepted";
+      
       [profile setObject: partstat
-			   forKey: @"partstat"];
+                  forKey: @"partstat"];
       
       if (role == nil || ![role length])
 	role = @"chair";
+      
       [profile setObject: role
-			   forKey: @"role"];
+                  forKey: @"role"];
       
       organizerProfile = [NSDictionary dictionaryWithObject: profile forKey: uid];
       [organizerProfile retain];
     }
-
+  
   return organizerProfile;
 }
 
@@ -897,30 +897,6 @@ iRANGE(2);
   return [[[[self organizerProfile] allValues] lastObject] jsonRepresentation];
 }
 
-// - (BOOL) canBeOrganizer
-// {
-//   NSString *owner;
-//   SOGoObject <SOGoComponentOccurence> *co;
-//   SOGoUser *currentUser;
-//   BOOL hasOrganizer;
-//   SoSecurityManager *sm;
-
-//   co = [self clientObject];
-//   owner = [co ownerInContext: context];
-//   currentUser = [context activeUser];
-
-//   hasOrganizer = ([[organizer value: 0] length] > 0);
-
-//   sm = [SoSecurityManager sharedSecurityManager];
-  
-//   return ([co isNew]
-// 	  || (([owner isEqualToString: [currentUser login]]
-// 	       || ![sm validatePermission: SOGoCalendarPerm_ModifyComponent
-// 		       onObject: co
-// 		       inContext: context])
-// 	      && (!hasOrganizer || [component userIsOrganizer: currentUser])));
-// }
-
 - (BOOL) hasOrganizer
 {
   // We check if there's an organizer and if it's not ourself
@@ -948,51 +924,8 @@ iRANGE(2);
     }
 
   return NO;
-
-    //return ([[organizer value: 0] length] && ![self canBeOrganizer]);
 }
 
-//- (void) setOrganizerIdentity: (NSDictionary *) newOrganizerIdentity
-//{
-//  ASSIGN (organizerIdentity, newOrganizerIdentity);
-//}
-
-// - (NSDictionary *) organizerIdentity
-// {
-//   NSArray *allIdentities;
-//   NSEnumerator *identities;
-//   NSDictionary *currentIdentity;
-//   NSString *orgEmail;
-
-//   orgEmail = [organizer rfc822Email];
-//   if (!organizerIdentity)
-//     {
-//       if ([orgEmail length])
-// 	{
-// 	  allIdentities = [[context activeUser] allIdentities];
-// 	  identities = [allIdentities objectEnumerator];
-// 	  while (!organizerIdentity
-// 		 && ((currentIdentity = [identities nextObject])))
-// 	    if ([[currentIdentity objectForKey: @"email"]
-// 		  caseInsensitiveCompare: orgEmail]
-// 		== NSOrderedSame)
-// 	      ASSIGN (organizerIdentity, currentIdentity);
-// 	}
-//     }
-
-//   return organizerIdentity;
-// }
-
-//- (NSArray *) organizerList
-//{
-//  return [[context activeUser] allIdentities];
-//}
-
-//- (NSString *) itemOrganizerText
-//{
-//  return [item keysWithFormat: @"%{fullName} <%{email}>"];
-//}
-
 - (BOOL) hasAttendees
 {
   return ([[component attendees] count] > 0);