diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
old mode 100644
new mode 100755
index f7442132cc1724bc80586189caa8c298b716c75d..7f95201e26a76d2eb9331cab62eed675d4487b8b
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
@@ -22,10 +22,7 @@ package org.bigbluebutton.modules.layout.events
 
   public class LayoutEvent extends Event
   {
-    public static const SYNC_LAYOUT_EVENT:String = 'SYNC_LAYOUT_EVENT';
     public static const BROADCAST_LAYOUT_EVENT:String = 'BROADCAST_LAYOUT_EVENT';
-    public static const LOCK_LAYOUT_EVENT:String = 'LOCK_LAYOUT_EVENT';
-    public static const UNLOCK_LAYOUT_EVENT:String = 'UNLOCK_LAYOUT_EVENT';
     public static const STOP_LAYOUT_MODULE_EVENT:String = 'STOP_LAYOUT_MODULE_EVENT';
     public static const VIEW_INITIALIZED_EVENT:String = 'VIEW_INITIALIZED_EVENT';
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
index 36c0e29d27252f70bee42663883af6f6912b9fec..c8de8cfb70486a600a555da682d3b49e59f006d3 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
@@ -84,7 +84,7 @@ package org.bigbluebutton.modules.layout.managers
       });
       _sendCurrentLayoutUpdateTimer.addEventListener(TimerEvent.TIMER, function(e:TimerEvent):void {
         //trace(LOG + "Applying layout due to window resize");
-        sendLayoutUpdate(updateCurrentLayout(null));
+        updateCurrentLayout(null);
       });
     }
     
@@ -202,12 +202,6 @@ package org.bigbluebutton.modules.layout.managers
       layoutEvent.layoutID = layoutID;
       _globalDispatcher.dispatchEvent(layoutEvent);      
     }
-
-    public function syncLayout():void {
-      if (UsersUtil.amIModerator() || UsersUtil.amIPresenter()) {
-        _globalDispatcher.dispatchEvent(new SyncLayoutEvent(_currentLayout));
-      }
-    }
       
 		public function lockLayout():void {
 			_locked = true;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
index aad0a45a88b1614735a6aa90d36b3f562cdc4a75..877b027688c6870fc7e5219023a578c3d9107bb4 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
@@ -66,18 +66,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <EventHandlers type="{LayoutEvent.APPLY_DEFAULT_LAYOUT_EVENT}">
    		<MethodInvoker generator="{LayoutManager}" method="applyDefaultLayout" />
     </EventHandlers>
-    
-    <EventHandlers type="{LayoutEvent.LOCK_LAYOUT_EVENT}">
-      <MethodInvoker generator="{LayoutManager}" method="lockLayout" />
-    </EventHandlers>
 
   <EventHandlers type="{EventConstants.LOCK_LAYOUT_REQ}">
     <MethodInvoker generator="{LayoutManager}" method="lockLayout"/>
   </EventHandlers>
-  
-    <EventHandlers type="{LayoutEvent.UNLOCK_LAYOUT_EVENT}">
-   		<MethodInvoker generator="{LayoutService}" method="unlockLayout" />
-    </EventHandlers>
 
   <EventHandlers type="{EventConstants.UNLOCK_LAYOUT_REQ}">
     <MethodInvoker generator="{LayoutService}" method="unlockLayout"/>
@@ -103,10 +95,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <EventHandlers type="{LayoutFromRemoteEvent.LAYOUT_FROM_REMOTE}">
    		<MethodInvoker generator="{LayoutManager}" method="applyRemoteLayout" arguments="{event}" />
     </EventHandlers>
-
-  <EventHandlers type="{LayoutEvent.SYNC_LAYOUT_EVENT}">
-    <MethodInvoker generator="{LayoutManager}" method="syncLayout" />
-  </EventHandlers>
   
     <EventHandlers type="{LayoutEvent.SAVE_LAYOUTS_EVENT}">
    		<MethodInvoker generator="{LayoutManager}" method="saveLayoutsToFile" />
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
old mode 100644
new mode 100755
index 2cb2399f1ef23bf5edd35ef6558b86354913b559..0095c7ceb38f3d76cc4e7fcff0a3ae24ec22b78c
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
@@ -55,7 +55,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function onClick(e:Event):void {
-				_dispatcher.dispatchEvent(new LayoutEvent(LayoutEvent.SYNC_LAYOUT_EVENT));
+				//_dispatcher.dispatchEvent(new LayoutEvent(LayoutEvent.SYNC_LAYOUT_EVENT));
 			}
 			
 			private function onLockLayoutEvent(e:Event):void {