Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as	(.../WizardEvent.as)	(revision 4071e019e3f49ff24ab7137412dabf98e92aea3a)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as	(.../WizardEvent.as)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -50,7 +50,6 @@
 		
 		public var startEvent_type:String;
 		public var schedule:String;
-		public var timeZone:String;
 		
 		public var scheduledNumberDaysToLessonFinish:int;
 		
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -r41c5f293e1903794bd4f56aafa70824b29ba6de4 -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 41c5f293e1903794bd4f56aafa70824b29ba6de4)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -209,7 +209,7 @@
 		
 		<!-- schedule lesson -->
 		<HTTPServiceInvoker instance="{scheduleLessonService}">
-			<Request lessonID="{event.lesson.lessonID}" lessonStartDate="{event.schedule}" scheduleTimeZoneIdx="{event.timeZone}" userID="{userID}" />
+			<Request lessonID="{event.lesson.lessonID}" lessonStartDate="{event.schedule}" userID="{userID}" />
 			<resultHandlers>
 				<EventAnnouncer generator="{WizardEvent}" type="{WizardEvent.CHECK_SCHEDULE_LESSON_FINISH}" />
 				
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as	(.../LessonValidator.as)	(revision 4071e019e3f49ff24ab7137412dabf98e92aea3a)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as	(.../LessonValidator.as)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -34,7 +34,7 @@
             } else if(value is FormItem) {
             	var children:Array = (value as FormItem).getChildren();
             	if(children.length > 0) {
-            		validateScheduleDate(children[0] as DateTimePicker, children[1] as ComboBox);
+            		validateScheduleDate(children[0] as DateTimePicker);
             	}
             } 
             
@@ -62,18 +62,9 @@
         		results.push(new ValidationResult(true, "", "noLearners", this.errorMessage));
         }
         
-        private function validateScheduleDate(timePicker:DateTimePicker, timeZonePicker:ComboBox):void {
+        private function validateScheduleDate(timePicker:DateTimePicker):void {
         	var now:Date = new Date();
-        	var tzList:ArrayCollection = (timeZonePicker.dataProvider != null) ? timeZonePicker.dataProvider as ArrayCollection : new ArrayCollection();
-        	var usersTzIdx:uint = Advanced.getUserTimeZoneIndex(Application.application.param("tz") as String, tzList.toArray());
-        	var usersTzOffset:Number = timeZonePicker.dataProvider[usersTzIdx].data;
- 			
- 			var selectedTzOffset:Number = timeZonePicker.selectedItem.data;
-        	var rawOffset:Number = (usersTzOffset - selectedTzOffset);
-        	
-        	var valTime:Number = now.setTime(now.getTime() - rawOffset);
-        	
-        	if(timePicker.enabled) {
+	       	if(timePicker.enabled) {
 	        	if(timePicker.selectedDate.date > now.date)
 	        		return;	
 	        	else if(timePicker.selectedDate.date == now.date)
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision 4071e019e3f49ff24ab7137412dabf98e92aea3a)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml	(.../Advanced.mxml)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -48,25 +48,6 @@
    			private var instTxt_idx:uint;
    			private static var focusTimeout:uint;
    			
-   			[Bindable]
-   			private var tzList:Array;
-   			
-   			[Bindable]
-   			private var userTimeZoneIndex:uint;
-   			
-			//returns user's timezone index from the list of timezones
-   			public static function getUserTimeZoneIndex(tz:String, tzList:Array):uint {
-   				
-   				for(var i:uint=0; i<tzList.length; i++) {
-   					var timeZoneId:String = tzList[i].timeZoneId;
-					if (tz == timeZoneId) {
-						return i;
-					}
-   				}
-   				
-   				return null;
-   			}
-   			
    			public function enableSplitLessonsOption():void {
    				if(!enableSplitLessons.selected) {
    					Wizard.clearValidationFocus();
@@ -146,7 +127,6 @@
 				if(value) {
 					
 					// tab is current selection
-					createTimeZoneList();
 					enableSplitLessonsOption();
 
 					var valEvent:ValidationResultEvent = scheduleValidator.validate();
@@ -160,18 +140,16 @@
 			}
 			
 			private function checkScheduleDateTime(event:Event):void {
-				if(scheduleDateTZ != null) {
-					this.scheduleDateTimeStr = ScheduleDateDisplay.format(scheduleDateTimePicker.selectedDate);
-					var valEvent:ValidationResultEvent = scheduleValidator.validate();
+				this.scheduleDateTimeStr = ScheduleDateDisplay.format(scheduleDateTimePicker.selectedDate);
+				var valEvent:ValidationResultEvent = scheduleValidator.validate();
 					
-					this.clearValidationFocus(valEvent.currentTarget.listener);
+				this.clearValidationFocus(valEvent.currentTarget.listener);
 	   				
-					if(valEvent.results != null) {
-						this.dispatchEvent(valEvent);
-						this.setValidationFocus(valEvent.currentTarget.listener);
-					} else {
-						this.clearValidationHighlight(valEvent.currentTarget.listener);
-					}
+				if(valEvent.results != null) {
+					this.dispatchEvent(valEvent);
+					this.setValidationFocus(valEvent.currentTarget.listener);
+				} else {
+					this.clearValidationHighlight(valEvent.currentTarget.listener);
 				}
 			}
 			
@@ -229,29 +207,6 @@
 				if(scheduleDateTimePicker.selectedDate < now)
 					scheduleDateTimePicker.selectedDate = now;
 			}
-			
-			private function createTimeZoneList():void {
-				var label:String = "";
-				var value:String = "";
-				var timeZoneId:String = "";
-				
-				if(tzList != null && tzList.length > 0)
-					return;
-				
-				tzList = new Array();
-				
-				// populate TimeZone list from User (java) class passed through in the Dictionary data.
-				var timezoneNumber:uint = uint(dictionary.getValue("timezoneNumber"));
-				for (var i:uint = 0; i < timezoneNumber; i++) {
-					label = dictionary.getLabel(String('timezoneID' + i)) as String;
-					value = dictionary.getValue(String('timezoneID' + i)) as String;
-					timeZoneId = label.substring(0, label.indexOf(" - "));
-					
-					tzList.push({label: label, data: value, timeZoneId: timeZoneId });
-				}
-				
-				userTimeZoneIndex = Advanced.getUserTimeZoneIndex(Application.application.param("tz") as String, tzList);
-			}
 		]]>
 	</mx:Script>
 	
@@ -307,7 +262,6 @@
 			<mx:VBox width="100%">
 				<mx:FormItem id="dateTimePicker_fItm" focusEnabled="true">
 					<timePicker:DateTimePicker id="scheduleDateTimePicker" enabled="{enableScheduling.selected}" selectedDate="{new Date()}" change="checkScheduleDateTime(event)" minuteIncrement="1" backgroundColor="#FFFFFF"/>        
-					<mx:ComboBox id="scheduleDateTZ" editable="false" dataProvider="{tzList}" enabled="{enableScheduling.selected}" change="checkScheduleDateTime(event)" selectedIndex="{userTimeZoneIndex}" />
 				</mx:FormItem>
 			</mx:VBox>
 			
Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 4071e019e3f49ff24ab7137412dabf98e92aea3a)
+++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -189,8 +189,6 @@
 				
 				wizardEvent.lesson = newLesson;
 				wizardEvent.schedule = (newLesson.enableScheduling) ? advanced.scheduleDateTimeStr : null;
-				var selectedTimeZoneIndex:uint = advanced.scheduleDateTZ.selectedIndex;
-				wizardEvent.timeZone = advanced.scheduleDateTZ.dataProvider[selectedTimeZoneIndex].timeZoneId;
 				
 				if(lessonInstances.length > 1) {
 					startLessonInstances(wizardEvent);
@@ -211,8 +209,6 @@
 					
 					wizardEvent.lesson = newLesson;
 					wizardEvent.schedule = event.schedule;
-					var selectedTimeZoneIndex:uint = advanced.scheduleDateTZ.selectedIndex;
-					wizardEvent.timeZone = advanced.scheduleDateTZ.dataProvider[selectedTimeZoneIndex].timeZoneId;
 				
 					wizardEvent.last = (lessonInstances.length == count);
 				
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java
===================================================================
diff -u -r030734e714da9ef57693dc1e5b6c4c769874b28d -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java	(.../MonitoringConstants.java)	(revision 030734e714da9ef57693dc1e5b6c4c769874b28d)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java	(.../MonitoringConstants.java)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -47,7 +47,6 @@
     public static final String KEY_GROUP_ORDER_ID = "orderID";
     public static final String KEY_GROUP_LEARNERS = "learners";
     public static final Object KEY_USERS = "users";
-    public static final String PARAM_SCHEDULE_TIME_ZONE_IDX = "scheduleTimeZoneIdx";
 	
     // ---------------------------------------------------------------------
     // Search type constants used in EmailNotificationsAction
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -r1af4378c901cea902392d4ef17f9d990f25e16f3 -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 1af4378c901cea902392d4ef17f9d990f25e16f3)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -214,11 +214,9 @@
      *            the lesson start date and time.
      * @param userId
      *            checks that the user is a staff member for this lesson
-     * @param timeZoneId
-     * 			  Timezone id to use for the start date
      * @see org.lamsfoundation.lams.monitoring.service#startLesson(long)
      */
-    public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId, String timeZoneId) throws UserAccessDeniedException;
+    public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId) throws UserAccessDeniedException;
 
     /**
      * Finish a lesson on schedule datetime.
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r030734e714da9ef57693dc1e5b6c4c769874b28d -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 030734e714da9ef57693dc1e5b6c4c769874b28d)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -722,7 +722,7 @@
      * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#startLessonOnSchedule(long
      *      , Date, User)
      */
-    public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId, String timeZoneId) {
+    public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId) {
 
 	// we get the lesson just created
 	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
@@ -747,18 +747,9 @@
 	}
 	
 	// Change client/users schedule date to server's timezone.
-	User user = (User) baseDAO.find(User.class, userId);
-	
-	TimeZone tz = TimeZone.getDefault();
-	TimeZone selectedTz;
-	
-	if (timeZoneId != null) {
-	    selectedTz = TimeZone.getTimeZone(timeZoneId);
-	} else {
-	    selectedTz = TimeZone.getTimeZone(user.getTimeZone());
-	}
-	
-	Date tzStartLessonDate = DateUtil.convertFromTimeZoneToDefault(selectedTz, startDate);
+	User user = (User) baseDAO.find(User.class, userId);	
+	TimeZone userTimeZone = TimeZone.getTimeZone(user.getTimeZone());
+	Date tzStartLessonDate = DateUtil.convertFromTimeZoneToDefault(userTimeZone, startDate);
 
 	JobDetail startLessonJob = getStartScheduleLessonJob();
 	// setup the message for scheduling job
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 4071e019e3f49ff24ab7137412dabf98e92aea3a)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1b6827c217b5614b1b625b5d70c5c82733e813bd)
@@ -284,9 +284,7 @@
         	String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_START_DATE);
     		Date startDate = DateUtil.convertFromLAMSFlashFormat(dateStr);
     		
-    		String timeZoneId = WebUtil.readStrParam(request, MonitoringConstants.PARAM_SCHEDULE_TIME_ZONE_IDX, true);
-    		
-    		monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId(),timeZoneId);
+    		monitoringService.startLessonOnSchedule(lessonId, startDate, getUserId());
     		flashMessage = new FlashMessage("startOnScheduleLesson",Boolean.TRUE);
     	}catch (Exception e) {
 			flashMessage = handleException(e, "startOnScheduleLesson", monitoringService);
@@ -777,27 +775,8 @@
 			languageOutput += "<entry key='" + languageCollection.get(i) + "'><name>" + messageService.getMessage(languageCollection.get(i)) + "</name></entry>";
 		}
 		
-		if(module.equals("wizard")) {
-		    
-		    //sort timezones
-		    TreeSet<Timezone> timezones = new TreeSet<Timezone>(new TimezoneComparator());
-		    timezones.addAll(getTimezoneService().getDefaultTimezones());
-		    
-		    //let Flex know the number of timezones
-    		    languageOutput += "<entry key='timezoneNumber'><data>" + timezones.size() + "</data></entry>";
-
-        	    int i = 0;
-        	    for (Timezone timezone : timezones) {
-        		TimeZone timeZone = TimeZone.getTimeZone(timezone.getTimezoneId());
-        		languageOutput += "<entry key='timezoneID" + i++ + "'>" + 
-        			"<name>" + timezone.getTimezoneId() + " - " + timeZone.getDisplayName() + "</name>" + 
-        			"<data>" + TimeZone.getTimeZone(timezone.getTimezoneId()).getRawOffset() + "</data>" + 
-        			"</entry>";
-        	    }
-        
-        	    if (orgName != null) {
-        		languageOutput += "<entry key='orgName'><name>" + orgName + "</name></entry>";
-        	    }
+		if(module.equals("wizard") && (orgName != null)) {
+		    languageOutput += "<entry key='orgName'><name>" + orgName + "</name></entry>";
 		}
 		
 		languageOutput += "</language></xml>";
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -r4071e019e3f49ff24ab7137412dabf98e92aea3a -r1b6827c217b5614b1b625b5d70c5c82733e813bd
Binary files differ