diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index be6f42394..30e4b7e51 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -35,9 +35,9 @@ SchedulerUI_OBJC_FILES =		\
 	UIxComponentEditor.m		\
 	UIxCalendarSelector.m		\
 	UIxAppointmentEditor.m		\
-	UIxAppointmentProposal.m	\
+# 	UIxAppointmentProposal.m	\
 	UIxTaskEditor.m		\
-	UIxTaskProposal.m	\
+# 	UIxTaskProposal.m	\
 	UIxCalDateLabel.m		\
 	UIxDatePicker.m			\
 	UIxTimeDateControl.m		\
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 745d432a9..81cff9b69 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -60,6 +60,7 @@
 - (void) dealloc
 {
   [item release];
+  [event release];
   [aptStartDate release];
   [aptEndDate release];
   [super dealloc];
@@ -91,7 +92,7 @@
   hm = [self queryParameterForKey: @"hm"];
 
   return (isAllDay
-	  || (hm && [hm isEqualToString: @"allday"]));
+	  || [hm isEqualToString: @"allday"]);
 }
 
 - (void) setIsAllDay: (BOOL) newIsAllDay
@@ -137,7 +138,7 @@
   int hour;
 
   newStartDate = [self selectedDate];
-  if ([[self queryParameterForKey: @"hm"] length] == 0)
+  if (![[self queryParameterForKey: @"hm"] length])
     {
       now = [NSCalendarDate calendarDate];
       timeZone = [[context activeUser] timeZone];
@@ -202,7 +203,7 @@
 
   co = [self clientObject];
   objectId = [co globallyUniqueObjectId];
-  if ([objectId length] > 0)
+  if ([objectId length])
     {
       method = [NSString stringWithFormat:@"%@/%@.ics/editAsAppointment",
                          [co soURL], objectId];
diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m
index bfb2efc1f..0541b600b 100644
--- a/UI/Scheduler/UIxCalDateSelector.m
+++ b/UI/Scheduler/UIxCalDateSelector.m
@@ -128,7 +128,6 @@
   return [self localizedAbbreviatedNameForDayOfWeek: [self dayOfWeek]];
 }
 
-
 /* stylesheets */
 
 - (NSString *) currentWeekStyle
@@ -151,9 +150,14 @@
 
 - (NSString *) extraStyle
 {
-  return (([[self selectedDate] isDateOnSameDay: currentDay])
-          ? [self selectedDayExtraStyle]
-          : nil);
+  NSString *extraStyle;
+
+  if ([[self selectedDate] isDateOnSameDay: currentDay])
+    extraStyle = [self selectedDayExtraStyle];
+  else
+    extraStyle = nil;
+
+  return extraStyle;
 }
 
 /* URLs */
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index d0939c643..1ffa77a92 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -126,32 +126,28 @@ static NSMutableArray *yearMenuItems = nil;
 
 - (NSString *) verticalDragHandleStyle
 {
-   NSString *vertical;
+  [self _setupContext];
 
-   [self _setupContext];
-   vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
-   
-   return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil);
+  return [[moduleSettings objectForKey: @"DragHandleVertical"]
+	   stringByAppendingString: @"px"];
 }
 
 - (NSString *) horizontalDragHandleStyle
 {
-   NSString *horizontal;
+  [self _setupContext];
 
-   [self _setupContext];
-   horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
-
-   return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil);
+  return [[moduleSettings objectForKey: @"DragHandleHorizontal"]
+	   stringByAppendingString: @"px"];
 }
 
 - (NSString *) eventsListViewStyle
 {
-   NSString *height;
+  NSString *height;
 
-   [self _setupContext];
-   height = [moduleSettings objectForKey: @"DragHandleVertical"];
+  [self _setupContext];
+  height = [moduleSettings objectForKey: @"DragHandleVertical"];
 
-   return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
+  return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
 }
 
 - (WOResponse *) saveDragHandleStateAction