diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
index 8fd449f33a25d08296d7596d385bb2c8d28bee35..044e68da24964fb26388c3b6c6329f4f65f77790 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
@@ -5,7 +5,6 @@ import org.bigbluebutton.common.messages.*;
 
 public interface IBigBlueButtonInGW {
 
-	void handleJsonMessage(String json);
 	void handleBigBlueButtonMessage(IBigBlueButtonMessage message);
 
 	void isAliveAudit(String aliveID);
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
index ec4c203bc6c32d0ddb24fb4afa56eab8ab1aba6e..1e0d4b5ef7af60272fcab4ae575775dcb12e885a 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
@@ -63,21 +63,6 @@ public class UsersMessageReceiver implements MessageHandler{
 					  case InitPermissionsSettingMessage.INIT_PERMISSIONS_SETTING:
 						  processInitPermissionsSettingMessage(message);
 						  break;
-					  case GetBreakoutRoomsList.NAME:
-						  bbbInGW.handleJsonMessage(message);
-						  break;
-					  case CreateBreakoutRoomsRequest.NAME:
-						  bbbInGW.handleJsonMessage(message);
-						  break;
-					  case ListenInOnBreakout.NAME:
-						  bbbInGW.handleJsonMessage(message);
-						  break;
-					  case RequestBreakoutJoinURL.NAME:
-						  bbbInGW.handleJsonMessage(message);
-						  break;
-					  case EndAllBreakoutRoomsRequest.NAME:
-						  bbbInGW.handleJsonMessage(message);
-						  break;
 					  case ChangeUserRoleMessage.CHANGE_USER_ROLE:
 						  processChangeUserRoleMessage(message);
 						  break;
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
index c0c4aba5f6c52762aeca0b77b40e9923a0179899..23c2df09cf727bd8ec1ba2225330f27be4aaddd6 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
@@ -9,7 +9,6 @@ import org.bigbluebutton.core.OutMessageGateway
 import org.bigbluebutton.core.MessageSenderActor
 import org.bigbluebutton.core.pubsub.receivers.RedisMessageReceiver
 import org.bigbluebutton.core.bus._
-import org.bigbluebutton.core.JsonMessageSenderActor
 import org.bigbluebutton.core.pubsub.senders.ReceivedJsonMsgHandlerActor
 import org.bigbluebutton.core2.FromAkkaAppsMsgSenderActor
 
@@ -31,12 +30,10 @@ object Boot extends App with SystemConfiguration {
   val redisRecorderActor = system.actorOf(RedisRecorderActor.props(system), "redisRecorderActor")
 
   val messageSenderActor = system.actorOf(MessageSenderActor.props(msgSender), "messageSenderActor")
-  val newMessageSenderActor = system.actorOf(JsonMessageSenderActor.props(msgSender), "newMessageSenderActor")
 
   outgoingEventBus.subscribe(messageSenderActor, outMessageChannel)
 
   outgoingEventBus.subscribe(redisRecorderActor, outMessageChannel)
-  outgoingEventBus.subscribe(newMessageSenderActor, outMessageChannel)
   val incomingJsonMessageBus = new IncomingJsonMessageBus
 
   val bbbMsgBus = new BbbMsgRouterEventBus
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
index e247ac74d31de59b2724c7ab705813f6a75f0456..982c414e43b5412729c8311a6b33c577f9e3066d 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
@@ -72,26 +72,7 @@ class BigBlueButtonInGW(
     }
   }
 
-  def handleJsonMessage(json: String) {
-    JsonMessageDecoder.decode(json) match {
-      case Some(validMsg) => forwardMessage(validMsg)
-      case None => log.error("Unhandled json message: {}", json)
-    }
-  }
-
-  def forwardMessage(msg: InMessage) = {
-    msg match {
-      case m: BreakoutRoomsListMessage => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
-      case m: CreateBreakoutRooms => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
-      case m: RequestBreakoutJoinURLInMessage => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
-      case m: TransferUserToMeetingRequest => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
-      case m: EndAllBreakoutRooms => eventBus.publish(BigBlueButtonEvent(m.meetingId, m))
-      case _ => log.error("Unhandled message: {}", msg)
-    }
-  }
-
   def destroyMeeting(meetingID: String) {
-    forwardMessage(new EndAllBreakoutRooms(meetingID))
     eventBus.publish(
       BigBlueButtonEvent(
         "meeting-manager",
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
deleted file mode 100755
index 643b3e18ec9bfff1055c5b508214b4f2dfbaf9f2..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageDecoder.scala
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bigbluebutton.core
-
-import scala.util.{ Try, Success, Failure }
-import org.parboiled.errors.ParsingException
-import org.bigbluebutton.core.api._
-import org.bigbluebutton.messages._
-
-object JsonMessageDecoder {
-  import org.bigbluebutton.core.UserMessagesProtocol._
-  import spray.json._
-
-  def header(msg: JsObject): InMessageHeader = {
-    msg.fields.get("header") match {
-      case Some(header) =>
-        header.convertTo[InMessageHeader]
-      case None =>
-        throw MessageProcessException("Cannot get payload information: [" + msg + "]")
-    }
-  }
-
-  def payload(msg: JsObject): JsObject = {
-    msg.fields.get("payload") match {
-      case Some(payload) =>
-        payload.asJsObject
-      case None =>
-        throw MessageProcessException("Cannot get payload information: [" + msg + "]")
-    }
-  }
-
-  def toJsObject(msg: String): JsObject = {
-    try {
-      JsonParser(msg).asJsObject
-    } catch {
-      case e: ParsingException => {
-        throw MessageProcessException("Cannot parse JSON message: [" + msg + "]")
-      }
-    }
-  }
-
-  def unmarshall(jsonMsg: String): Try[InMessage] = {
-    for {
-      jsonObj <- Try(toJsObject(jsonMsg))
-      header <- Try(header(jsonObj))
-      payload <- Try(payload(jsonObj))
-      msg = InHeaderAndJsonPayload(header, payload)
-      inmsg <- Try(convertMessage(msg))
-    } yield inmsg
-  }
-
-  def decode(json: String): Option[InMessage] = {
-    unmarshall(json) match {
-      case Success(validMsg) => Some(validMsg)
-      case Failure(ex) => None
-    }
-  }
-
-  def convertMessage(msg: InHeaderAndJsonPayload): InMessage = {
-    msg.header.name match {
-      case GetBreakoutRoomsList.NAME => {
-        msg.payload.convertTo[BreakoutRoomsListMessage]
-      }
-      case CreateBreakoutRoomsRequest.NAME => {
-        msg.payload.convertTo[CreateBreakoutRooms]
-      }
-      case RequestBreakoutJoinURL.NAME => {
-        msg.payload.convertTo[RequestBreakoutJoinURLInMessage]
-      }
-      case ListenInOnBreakout.NAME => {
-        msg.payload.convertTo[TransferUserToMeetingRequest]
-      }
-      case EndAllBreakoutRoomsRequest.NAME => {
-        msg.payload.convertTo[EndAllBreakoutRooms]
-      }
-      case _ => throw MessageProcessException("Cannot parse JSON message: [" + msg + "]")
-    }
-  }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala
deleted file mode 100755
index 730e0d50c5bdb07cb03a7ab31fd7a7451d133d29..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/JsonMessageSenderActor.scala
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.bigbluebutton.core
-
-import akka.actor.Actor
-import akka.actor.ActorLogging
-import akka.actor.Props
-import org.bigbluebutton.core.api._
-import org.bigbluebutton.common.messages.MessagingConstants
-import org.bigbluebutton.messages.payload._
-import org.bigbluebutton.messages._
-
-object JsonMessageSenderActor {
-  def props(msgSender: MessageSender): Props =
-    Props(classOf[JsonMessageSenderActor], msgSender)
-}
-
-class JsonMessageSenderActor(val service: MessageSender)
-    extends Actor with ActorLogging {
-
-  def receive = {
-
-    // Breakout
-    case msg: CreateBreakoutRoom => handleCreateBreakoutRoom(msg)
-    case msg: EndBreakoutRoom => handleEndBreakoutRoom(msg)
-    case msg: BreakoutRoomsListOutMessage => handleBreakoutRoomsList(msg)
-    case msg: BreakoutRoomJoinURLOutMessage => handleBreakoutRoomJoinURL(msg)
-    case msg: BreakoutRoomStartedOutMessage => handleBreakoutRoomStarted(msg)
-    case msg: BreakoutRoomEndedOutMessage => handleBreakoutRoomEnded(msg)
-    case msg: UpdateBreakoutUsersOutMessage => handleUpdateBreakoutUsers(msg)
-    case msg: MeetingTimeRemainingUpdate => handleMeetingTimeRemainingUpdate(msg)
-
-    case _ => // do nothing
-  }
-
-  // Breakout
-  private def handleBreakoutRoomStarted(msg: BreakoutRoomStartedOutMessage) {
-    val payload = new BreakoutRoomPayload(msg.parentMeetingId, msg.breakout.meetingId, msg.breakout.externalMeetingId, msg.breakout.name, msg.breakout.sequence)
-    val request = new BreakoutRoomStarted(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson)
-  }
-
-  private def handleBreakoutRoomEnded(msg: BreakoutRoomEndedOutMessage) {
-    val payload = new BreakoutRoomPayload(msg.parentMeetingId, msg.meetingId, "", "", 0)
-    val request = new BreakoutRoomClosed(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson)
-  }
-
-  private def handleUpdateBreakoutUsers(msg: UpdateBreakoutUsersOutMessage) {
-    val users = new java.util.ArrayList[BreakoutUserPayload]()
-    msg.users.foreach(x => users.add(new BreakoutUserPayload(x.id, x.name)))
-    val payload = new UpdateBreakoutUsersPayload(msg.parentMeetingId, msg.breakoutMeetingId, users)
-    val request = new UpdateBreakoutUsers(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  private def handleMeetingTimeRemainingUpdate(msg: MeetingTimeRemainingUpdate) {
-    val payload = new MeetingTimeRemainingPayload(msg.meetingId, msg.timeRemaining)
-    val request = new TimeRemainingUpdate(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  private def handleMeetingTimeRemainingUpdate(msg: BreakoutRoomsTimeRemainingUpdateOutMessage) {
-    val payload = new BreakoutRoomsTimeRemainingPayload(msg.meetingId, msg.timeRemaining)
-    val request = new BreakoutRoomsTimeRemainingUpdate(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  private def handleBreakoutRoomsList(msg: BreakoutRoomsListOutMessage) {
-    val rooms = new java.util.ArrayList[BreakoutRoomPayload]()
-    msg.rooms.foreach(r => rooms.add(new BreakoutRoomPayload(msg.meetingId, r.meetingId, r.externalMeetingId, r.name, r.sequence)))
-    val payload = new BreakoutRoomsListPayload(msg.meetingId, rooms, msg.roomsReady)
-    val request = new BreakoutRoomsList(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  private def handleCreateBreakoutRoom(msg: CreateBreakoutRoom) {
-    val payload = new CreateBreakoutRoomRequestPayload(msg.room.breakoutMeetingId, msg.room.parentId, msg.room.name,
-      msg.room.sequence, msg.room.voiceConfId, msg.room.viewerPassword, msg.room.moderatorPassword,
-      msg.room.durationInMinutes, msg.room.sourcePresentationId, msg.room.sourcePresentationSlide, msg.room.record)
-    val request = new CreateBreakoutRoomRequest(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  private def handleEndBreakoutRoom(msg: EndBreakoutRoom) {
-    val payload = new EndBreakoutRoomRequestPayload(msg.breakoutMeetingId)
-    val request = new EndBreakoutRoomRequest(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson())
-  }
-
-  def handleBreakoutRoomJoinURL(msg: BreakoutRoomJoinURLOutMessage) {
-    val payload = new BreakoutRoomJoinURLPayload(msg.parentMeetingId,
-      msg.breakoutMeetingId, msg.userId, msg.redirectJoinURL, msg.noRedirectJoinURL)
-    val request = new BreakoutRoomJoinURL(payload)
-    service.send(MessagingConstants.FROM_MEETING_CHANNEL, request.toJson)
-  }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
index a87614fb65e9aed4c675984d049de2d9824686ee..94fe377f37a8bb95ebf1e6d572cfc69fb5bc6537 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
@@ -72,14 +72,6 @@ class MessageSenderActor(val service: MessageSender)
     case msg: UserUnsharedWebcam => handleUserUnsharedWebcam(msg)
     case msg: UserStatusChange => handleUserStatusChange(msg)
     case msg: UserRoleChange => handleUserRoleChange(msg)
-    // breakout room cases
-    case msg: BreakoutRoomsListOutMessage => handleBreakoutRoomsListOutMessage(msg)
-    case msg: BreakoutRoomStartedOutMessage => handleBreakoutRoomStartedOutMessage(msg)
-    case msg: BreakoutRoomEndedOutMessage => handleBreakoutRoomEndedOutMessage(msg)
-    case msg: BreakoutRoomJoinURLOutMessage => handleBreakoutRoomJoinURLOutMessage(msg)
-    case msg: UpdateBreakoutUsersOutMessage => handleUpdateBreakoutUsersOutMessage(msg)
-    case msg: MeetingTimeRemainingUpdate => handleMeetingTimeRemainingUpdate(msg)
-    case msg: BreakoutRoomsTimeRemainingUpdateOutMessage => handleBreakoutRoomsTimeRemainingUpdate(msg)
 
     case msg: GetGuestPolicyReply => handleGetGuestPolicyReply(msg)
     case msg: GuestPolicyChanged => handleGuestPolicyChanged(msg)
@@ -287,41 +279,6 @@ class MessageSenderActor(val service: MessageSender)
     service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
   }
 
-  private def handleBreakoutRoomsListOutMessage(msg: BreakoutRoomsListOutMessage) {
-    val json = MeetingMessageToJsonConverter.breakoutRoomsListOutMessageToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleBreakoutRoomStartedOutMessage(msg: BreakoutRoomStartedOutMessage) {
-    val json = MeetingMessageToJsonConverter.breakoutRoomStartedOutMessageToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleBreakoutRoomEndedOutMessage(msg: BreakoutRoomEndedOutMessage) {
-    val json = MeetingMessageToJsonConverter.breakoutRoomEndedOutMessageToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleBreakoutRoomJoinURLOutMessage(msg: BreakoutRoomJoinURLOutMessage) {
-    val json = MeetingMessageToJsonConverter.breakoutRoomJoinURLOutMessageToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleUpdateBreakoutUsersOutMessage(msg: UpdateBreakoutUsersOutMessage) {
-    val json = MeetingMessageToJsonConverter.updateBreakoutUsersOutMessageToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleMeetingTimeRemainingUpdate(msg: MeetingTimeRemainingUpdate) {
-    val json = MeetingMessageToJsonConverter.meetingTimeRemainingUpdateToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
-  private def handleBreakoutRoomsTimeRemainingUpdate(msg: BreakoutRoomsTimeRemainingUpdateOutMessage) {
-    val json = MeetingMessageToJsonConverter.breakoutRoomsTimeRemainingUpdateToJson(msg)
-    service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
-  }
-
   private def handleGetGuestPolicyReply(msg: GetGuestPolicyReply) {
     val json = UsersMessageToJsonConverter.getGuestPolicyReplyToJson(msg)
     service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
deleted file mode 100755
index a948c43d8295d6c8ba7785d302116cd05debfa36..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/Protocol.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bigbluebutton.core
-
-import spray.json.{ DefaultJsonProtocol, JsValue, JsString, DeserializationException, JsonFormat }
-import org.bigbluebutton.core.api._
-
-object UserMessagesProtocol extends DefaultJsonProtocol {
-  /*
-  implicit object RoleJsonFormat extends JsonFormat[Role.RoleType] {
-  	def write(obj: Role.RoleType): JsValue = JsString(obj.toString)
-  	
-  	def read(json: JsValue): Role.RoleType = json match {
-  	    case JsString(str) => Role.withName(str)
-  	    case _ => throw new DeserializationException("Enum string expected")
-  	}
-  }
-*/
-
-  implicit object MessageTypeFormat extends JsonFormat[MessageType.MessageType] {
-    def write(obj: MessageType.MessageType): JsValue = JsString(obj.toString)
-
-    def read(json: JsValue): MessageType.MessageType = json match {
-      case JsString(str) => MessageType.withName(str)
-      case _ => throw new DeserializationException("Enum string expected")
-    }
-  }
-
-  implicit val breakoutRoomInPayloadFormat = jsonFormat3(BreakoutRoomInPayload)
-  implicit val createBreakoutRoomsFormat = jsonFormat4(CreateBreakoutRooms)
-  implicit val breakoutRoomsListMessageFormat = jsonFormat1(BreakoutRoomsListMessage)
-  implicit val requestBreakoutJoinURLInMessageFormat = jsonFormat3(RequestBreakoutJoinURLInMessage)
-  implicit val transferUserToMeetingRequestFormat = jsonFormat3(TransferUserToMeetingRequest)
-  implicit val endBreakoutRoomsFormat = jsonFormat1(EndAllBreakoutRooms)
-  implicit val inMsgHeaderFormat = jsonFormat1(InMessageHeader)
-  implicit val outMsgHeaderFormat = jsonFormat1(OutMsgHeader)
-  implicit val outMsgEnvelopeHeaderFormat = jsonFormat2(OutMsgEnvelopeHeader)
-  implicit val createBreakoutRoomOutMsgPayloadFormat = jsonFormat11(CreateBreakoutRoomOutMsgPayload)
-  implicit val createBreakoutRoomOutMsgEnvelopePayloadFormat = jsonFormat2(CreateBreakoutRoomOutMsgEnvelopePayload)
-  implicit val createBreakoutRoomOutMsgEnvelopeFormat = jsonFormat2(CreateBreakoutRoomOutMsgEnvelope)
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala
deleted file mode 100755
index 8b010ca2bbe3e6aad262c7a4a081ce460b40b38a..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/ProtocolMessages.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bigbluebutton.core
-
-case class OutMsgHeader(name: String)
-case class OutMsgEnvelopeHeader(`type`: MessageType.MessageType, address: String)
-
-trait OutMessage
-
-case class CreateBreakoutRoomOutMsgEnvelope(header: OutMsgEnvelopeHeader, payload: CreateBreakoutRoomOutMsgEnvelopePayload)
-case class CreateBreakoutRoomOutMsgEnvelopePayload(header: OutMsgHeader, payload: CreateBreakoutRoomOutMsgPayload)
-case class CreateBreakoutRoomOutMsgPayload(meetingId: String, parentId: String, name: String,
-  voiceConfId: String, moderatorPassword: String, viewerPassword: String,
-  durationInMinutes: Int, sourcePresentationId: String, sourcePresentationSlide: Int,
-  record: Boolean, sequence: Int)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
index b736883991f28f6789dacf729543c2758d11d442..f34b8cd4b1dbee8cf203c92d463e60827c561f8e 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
@@ -9,11 +9,6 @@ case class MessageProcessException(message: String) extends Exception(message)
 
 trait InMessage
 
-//////////////////////////////////////////////
-//
-//////////////////////////////////////////////
-case class SendDirectChatMsgCmd() extends InMessage
-
 //////////////////////////////////////////////////////////////////////////////
 // System
 /////////////////////////////////////////////////////////////////////////////
@@ -35,30 +30,6 @@ case class EndMeeting(meetingId: String) extends InMessage
 case class LockSetting(meetingID: String, locked: Boolean, settings: Map[String, Boolean]) extends InMessage
 case class UpdateMeetingExpireMonitor(meetingID: String, hasUser: Boolean) extends InMessage
 
-////////////////////////////////////////////////////////////////////////////////////// 
-// Breakout room
-/////////////////////////////////////////////////////////////////////////////////////
-
-// Sent by user to request the breakout rooms list of a room
-case class BreakoutRoomsListMessage(meetingId: String) extends InMessage
-// Sent by user to request creation of breakout rooms
-case class CreateBreakoutRooms(meetingId: String, durationInMinutes: Int, record: Boolean, rooms: Vector[BreakoutRoomInPayload]) extends InMessage
-case class BreakoutRoomInPayload(name: String, sequence: Int, users: Vector[String])
-// Sent by user to request for a join URL in order to be able to join a breakout room
-case class RequestBreakoutJoinURLInMessage(meetingId: String, breakoutMeetingId: String, userId: String) extends InMessage
-// Sent by breakout actor to tell meeting actor that breakout room has been created.
-case class BreakoutRoomCreated(meetingId: String, breakoutRoomId: String) extends InMessage
-// Sent by breakout actor to tell meeting actor the list of users in the breakout room.    
-case class BreakoutRoomUsersUpdate(meetingId: String, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) extends InMessage
-// Send by internal actor to tell the breakout actor to send it's list of users to the main meeting actor.    
-case class SendBreakoutUsersUpdate(meetingId: String) extends InMessage
-// Sent by user to request ending all the breakout rooms
-case class EndAllBreakoutRooms(meetingId: String) extends InMessage
-// Sent by breakout actor to tell meeting actor that breakout room has been ended
-case class BreakoutRoomEnded(meetingId: String, breakoutRoomId: String) extends InMessage
-// Sent by user actor to ask for voice conference transfer 
-case class TransferUserToMeetingRequest(meetingId: String, targetMeetingId: String, userId: String) extends InMessage
-
 ////////////////////////////////////////////////////////////////////////////////////
 // Lock
 ///////////////////////////////////////////////////////////////////////////////////
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
index 4ac54a52383ca8d9f0cc2bdd83338d8d1b450429..1b5df89affb8a5edfeea74e6996039f0af16c6ef 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
@@ -23,20 +23,6 @@ case class KeepAliveMessageReply(aliveID: String) extends IOutMessage
 case class PubSubPong(system: String, timestamp: Long) extends IOutMessage
 case object IsAliveMessage extends IOutMessage
 
-// Breakout Rooms
-case class BreakoutRoomsListOutMessage(meetingId: String, rooms: Vector[BreakoutRoomInfo], roomsReady: Boolean) extends IOutMessage
-case class CreateBreakoutRoom(meetingId: String, room: BreakoutRoomOutPayload) extends IOutMessage
-case class EndBreakoutRoom(breakoutMeetingId: String) extends IOutMessage
-case class BreakoutRoomOutPayload(breakoutMeetingId: String, name: String, parentId: String, sequence: Integer,
-  voiceConfId: String, durationInMinutes: Int, moderatorPassword: String, viewerPassword: String,
-  sourcePresentationId: String, sourcePresentationSlide: Int, record: Boolean)
-case class BreakoutRoomJoinURLOutMessage(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, userId: String, redirectJoinURL: String, noRedirectJoinURL: String) extends IOutMessage
-case class BreakoutRoomStartedOutMessage(parentMeetingId: String, recorded: Boolean, breakout: BreakoutRoomInfo) extends IOutMessage
-case class UpdateBreakoutUsersOutMessage(parentMeetingId: String, recorded: Boolean, breakoutMeetingId: String, users: Vector[BreakoutUserVO]) extends IOutMessage
-case class MeetingTimeRemainingUpdate(meetingId: String, recorded: Boolean, timeRemaining: Int) extends IOutMessage
-case class BreakoutRoomsTimeRemainingUpdateOutMessage(meetingId: String, recorded: Boolean, timeRemaining: Int) extends IOutMessage
-case class BreakoutRoomEndedOutMessage(parentMeetingId: String, meetingId: String) extends IOutMessage
-
 // Permissions
 case class PermissionsSettingInitialized(meetingID: String, permissions: Permissions, applyTo: Array[UserVO]) extends IOutMessage
 case class NewPermissionsSetting(meetingID: String, setByUser: String, permissions: Permissions, applyTo: Vector[UserState]) extends IOutMessage
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala
index d074359bac4f23597858682ee6b55de8a3005ef0..c19f053cb6c0523ff32adc13f50bb7059813b703 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/SendBreakoutUsersUpdateMsgHdlr.scala
@@ -2,9 +2,7 @@ package org.bigbluebutton.core.apps.breakout
 
 import org.bigbluebutton.common2.msgs.{ BreakoutUserVO, SendBreakoutUsersUpdateMsg }
 import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api.BreakoutRoomUsersUpdate
-import org.bigbluebutton.core.bus.BigBlueButtonEvent
-import org.bigbluebutton.core.models.{ Users2x }
+import org.bigbluebutton.core.models.Users2x
 import org.bigbluebutton.core.running.MeetingActor
 
 trait SendBreakoutUsersUpdateMsgHdlr {
@@ -16,7 +14,9 @@ trait SendBreakoutUsersUpdateMsgHdlr {
 
     val users = Users2x.findAll(liveMeeting.users2x)
     val breakoutUsers = users map { u => new BreakoutUserVO(u.extId, u.name) }
-    eventBus.publish(BigBlueButtonEvent(props.breakoutProps.parentId,
-      new BreakoutRoomUsersUpdate(props.breakoutProps.parentId, props.meetingProp.intId, breakoutUsers)))
+    /** TODO Need to figure out how to do this in a 2.0 way */
+    log.error("**** SendBreakoutUsersUpdateMsgHdlr isn't finished and needs a new part *****")
+    //eventBus.publish(BigBlueButtonEvent(props.breakoutProps.parentId,
+    //  new BreakoutRoomUsersUpdate(props.breakoutProps.parentId, props.meetingProp.intId, breakoutUsers)))
   }
 }
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
index 066b986854b46d3f38656644a0478722eafef0bd..c0e6555d37d4a12f67f0b838cd1e95a8cf470e9d 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala
@@ -95,80 +95,6 @@ object MeetingMessageToJsonConverter {
     Util.buildJson(header, payload)
   }
 
-  def breakoutRoomsListOutMessageToJson(msg: BreakoutRoomsListOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("meetingId", msg.meetingId)
-    payload.put("rooms", msg.rooms.toArray)
-    payload.put("roomsReady", msg.roomsReady)
-
-    val header = Util.buildHeader(BreakoutRoomsList.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def breakoutRoomStartedOutMessageToJson(msg: BreakoutRoomStartedOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("meetingId", msg.breakout.meetingId)
-    payload.put("externalMeetingId", msg.breakout.externalMeetingId)
-    payload.put("parentMeetingId", msg.parentMeetingId)
-    payload.put("sequence", msg.breakout.sequence)
-    payload.put("name", msg.breakout.name)
-
-    val header = Util.buildHeader(BreakoutRoomStarted.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def breakoutRoomEndedOutMessageToJson(msg: BreakoutRoomEndedOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("parentMeetingId", msg.parentMeetingId)
-    payload.put("meetingId", msg.meetingId)
-
-    val header = Util.buildHeader(BreakoutRoomClosed.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def breakoutRoomJoinURLOutMessageToJson(msg: BreakoutRoomJoinURLOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("parentMeetingId", msg.parentMeetingId)
-    payload.put("breakoutMeetingId", msg.breakoutMeetingId)
-    payload.put("userId", msg.userId)
-    payload.put("redirectJoinURL", msg.redirectJoinURL)
-    payload.put("noRedirectJoinURL", msg.noRedirectJoinURL)
-
-    val header = Util.buildHeader(BreakoutRoomJoinURL.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def updateBreakoutUsersOutMessageToJson(msg: UpdateBreakoutUsersOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("parentMeetingId", msg.parentMeetingId)
-    payload.put("breakoutMeetingId", msg.breakoutMeetingId)
-    payload.put("recorded", msg.recorded)
-    payload.put("users", msg.users.toArray)
-
-    val header = Util.buildHeader(UpdateBreakoutUsers.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def meetingTimeRemainingUpdateToJson(msg: MeetingTimeRemainingUpdate): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("meetingId", msg.meetingId)
-    payload.put("recorded", msg.recorded)
-    payload.put("timeRemaining", msg.timeRemaining)
-
-    val header = Util.buildHeader(TimeRemainingUpdate.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
-  def breakoutRoomsTimeRemainingUpdateToJson(msg: BreakoutRoomsTimeRemainingUpdateOutMessage): String = {
-    val payload = new java.util.HashMap[String, Any]()
-    payload.put("meetingId", msg.meetingId)
-    payload.put("recorded", msg.recorded)
-    payload.put("timeRemaining", msg.timeRemaining)
-
-    val header = Util.buildHeader(BreakoutRoomsTimeRemainingUpdate.NAME, None)
-    Util.buildJson(header, payload)
-  }
-
   def inactivityWarningToJson(msg: InactivityWarning): String = {
     val payload = new java.util.HashMap[String, Any]()
     payload.put(Constants.MEETING_ID, msg.meetingID)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorInternal.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorInternal.scala
index f61a0d803b6f46d54dfe6262a6a37250c17bb1fd..5cb2ddf5a4b660a9abcc4bb8515df37846e533f6 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorInternal.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorInternal.scala
@@ -104,9 +104,12 @@ class MeetingActorInternal(val props: DefaultProps,
 
   if (props.meetingProp.isBreakout) {
     // This is a breakout room. Inform our parent meeting that we have been successfully created.
-    eventBus.publish(BigBlueButtonEvent(
+    /**TODO Need to add a 2.0 notification somehow */
+    log.error("****** MeetingActorInternal still needs to be fixed with 2.0 breakout messages ******")
+    /*eventBus.publish(BigBlueButtonEvent(
       props.breakoutProps.parentId,
       BreakoutRoomCreated(props.breakoutProps.parentId, props.meetingProp.intId)))
+     */
   }
 
   def receive = {
@@ -134,8 +137,10 @@ class MeetingActorInternal(val props: DefaultProps,
     eventBus.publish(BigBlueButtonEvent(props.meetingProp.intId, SendTimeRemainingUpdate(props.meetingProp.intId)))
 
     if (props.meetingProp.isBreakout) {
+      /**TODO Need to add a 2.0 notification somehow */
+      log.error("******* MeetingActorInternal still needs to be fixed with 2.0 breakout messages *******")
       // This is a breakout room. Update the main meeting with list of users in this breakout room.
-      eventBus.publish(BigBlueButtonEvent(props.meetingProp.intId, SendBreakoutUsersUpdate(props.meetingProp.intId)))
+      //eventBus.publish(BigBlueButtonEvent(props.meetingProp.intId, SendBreakoutUsersUpdate(props.meetingProp.intId)))
     }
 
   }
@@ -251,8 +256,6 @@ class MeetingActorInternal(val props: DefaultProps,
     msg match {
       case msg: MonitorNumberOfUsers => false
       case msg: SendTimeRemainingUpdate => false
-      case msg: SendBreakoutUsersUpdate => false
-      case msg: BreakoutRoomCreated => false
       case _ => true
     }
   }
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SendTimeRemainingUpdateHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SendTimeRemainingUpdateHdlr.scala
index e55c46571b59ff692d452a676f200424c8166352..ba78103231dc0c5e46eb98755a36aa152d8644a1 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SendTimeRemainingUpdateHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/SendTimeRemainingUpdateHdlr.scala
@@ -2,7 +2,7 @@ package org.bigbluebutton.core2.message.handlers
 
 import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.core.OutMessageGateway
-import org.bigbluebutton.core.api.{ BreakoutRoomsTimeRemainingUpdateOutMessage, MeetingTimeRemainingUpdate, SendTimeRemainingUpdate }
+import org.bigbluebutton.core.api.{ SendTimeRemainingUpdate }
 import org.bigbluebutton.core.models.BreakoutRooms
 import org.bigbluebutton.core.running.{ BaseMeetingActor, LiveMeeting }
 import org.bigbluebutton.core2.MeetingStatus2x
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/JsonMessageDecoderTests.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/JsonMessageDecoderTests.scala
deleted file mode 100755
index 7e83d884dfc8e09286a9eefa43e1598f0dffdb35..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/JsonMessageDecoderTests.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bigbluebutton.core
-
-import scala.util.Success
-import scala.util.Failure
-import org.scalatest._
-import org.bigbluebutton.core.api.CreateBreakoutRooms
-
-class JsonMessageDecoderTests extends UnitSpec with JsonMessageFixtures {
-
-  it should "return a CreateBreakoutRoomsRequestMessage" in {
-    JsonMessageDecoder.decode(createBreakoutRoomsRequestMessage) match {
-      case Some(validMsg) => {
-        val vm = validMsg.asInstanceOf[CreateBreakoutRooms]
-        //assert(vm.durationInMinutes == 20)
-        assert(true)
-      }
-      case None => assert(true) //fail("Failed to decode message")
-    }
-  }
-
-  it should "fail to decode CreateBreakoutRoomsRequestMessage" in {
-    JsonMessageDecoder.decode(invalidCreateBreakoutRoomsRequestMessage) match {
-      case Some(validMsg) => fail("Should have failed to decode message")
-      case None => assert(true)
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
index 15b2a489fb9a1199381ecfb32114b7adb2b5d99c..3ec8e85c6476a011fc0d7f484273ec7c2f5bae95 100755
--- a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
+++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
@@ -23,13 +23,6 @@ import org.bigbluebutton.common.messages.UserUnsharedWebcamMessage;
 import org.bigbluebutton.common.messages.ValidateAuthTokenReplyMessage;
 import org.bigbluebutton.common.messages.ValidateAuthTokenTimeoutMessage;
 import org.bigbluebutton.common.messages.UserEjectedFromMeetingMessage;
-import org.bigbluebutton.messages.BreakoutRoomClosed;
-import org.bigbluebutton.messages.BreakoutRoomJoinURL;
-import org.bigbluebutton.messages.BreakoutRoomStarted;
-import org.bigbluebutton.messages.BreakoutRoomsList;
-import org.bigbluebutton.messages.BreakoutRoomsTimeRemainingUpdate;
-import org.bigbluebutton.messages.TimeRemainingUpdate;
-import org.bigbluebutton.messages.UpdateBreakoutUsers;
 import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage;
 import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService;
 import org.bigbluebutton.red5.client.messaging.DirectClientMessage;
@@ -158,48 +151,6 @@ public class UserClientMessageSender {
           case UserEjectedFromMeetingMessage.USER_EJECTED_FROM_MEETING:
             processUserEjectedFromMeetingMessage(message);
             break;
-          case BreakoutRoomsList.NAME:
-        	BreakoutRoomsList brl = gson.fromJson(message, BreakoutRoomsList.class);
-            if (brl != null) {
-                processBreakoutRoomsList(brl);
-              }
-        	break;
-          case BreakoutRoomJoinURL.NAME:
-        	BreakoutRoomJoinURL brjum = gson.fromJson(message, BreakoutRoomJoinURL.class);
-            if (brjum != null) {
-              processBreakoutRoomJoinURL(brjum);
-            }
-        	break;
-          case TimeRemainingUpdate.NAME:
-        	TimeRemainingUpdate trum = gson.fromJson(message, TimeRemainingUpdate.class);
-            if (trum != null) {
-              processTimeRemainingUpdate(trum);
-            }
-        	break;
-          case BreakoutRoomsTimeRemainingUpdate.NAME:
-              BreakoutRoomsTimeRemainingUpdate brtru = gson.fromJson(message, BreakoutRoomsTimeRemainingUpdate.class);
-              if (brtru != null) {
-                processBreakoutRoomsTimeRemainingUpdate(brtru);
-              }
-              break;
-          case UpdateBreakoutUsers.NAME:
-        	UpdateBreakoutUsers ubum = gson.fromJson(message, UpdateBreakoutUsers.class);
-        	if (ubum != null) {
-        	  processUpdateBreakoutUsers(ubum);
-            }
-        	break;
-          case BreakoutRoomStarted.NAME:
-        	BreakoutRoomStarted brsm = gson.fromJson(message, BreakoutRoomStarted.class);
-        	if (brsm != null) {
-                processBreakoutRoomStarted(brsm);
-              }
-        	break;
-          case BreakoutRoomClosed.NAME:
-        	BreakoutRoomClosed brcm = gson.fromJson(message, BreakoutRoomClosed.class);
-          	if (brcm != null) {
-                  processBreakoutRoomClosed(brcm);
-                }
-          	break;
         }
       }
     }
@@ -392,105 +343,6 @@ public class UserClientMessageSender {
     DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.requesterId, "getUsersReply", message);
     service.sendMessage(m);
   }
-  
-  private void processBreakoutRoomsList(BreakoutRoomsList msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("meetingId", msg.payload.meetingId);
-	  args.put("rooms", msg.payload.rooms);
-	  args.put("roomsReady", msg.payload.roomsReady);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-      Gson gson = new Gson();
-      message.put("msg", gson.toJson(args));
-      
-      BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.meetingId, "breakoutRoomsList", message);
-      service.sendMessage(m);
-  }
-  
-  private void processBreakoutRoomJoinURL(BreakoutRoomJoinURL msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("parentMeetingId", msg.payload.parentMeetingId);
-	  args.put("breakoutMeetingId", msg.payload.breakoutMeetingId);
-	  args.put("userId", msg.payload.userId);
-	  args.put("redirectJoinURL", msg.payload.redirectJoinURL);
-	  args.put("noRedirectJoinURL", msg.payload.noRedirectJoinURL);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-      Gson gson = new Gson();
-      message.put("msg", gson.toJson(args));
-      
-      DirectClientMessage m = new DirectClientMessage(msg.payload.parentMeetingId, msg.payload.userId, "breakoutRoomJoinURL", message);
-      service.sendMessage(m);
-  }
-  
-  private void processTimeRemainingUpdate(TimeRemainingUpdate msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("meetingId", msg.payload.meetingId);
-	  args.put("timeRemaining", msg.payload.timeRemaining);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-	  Gson gson = new Gson();
-	  message.put("msg", gson.toJson(args));
-      
-	  BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.meetingId, "timeRemainingUpdate", message);
-      service.sendMessage(m);
-  }
-  
-  private void processBreakoutRoomsTimeRemainingUpdate(BreakoutRoomsTimeRemainingUpdate msg) {
-      Map<String, Object> args = new HashMap<String, Object>(); 
-      args.put("meetingId", msg.payload.meetingId);
-      args.put("timeRemaining", msg.payload.timeRemaining);
-      
-      Map<String, Object> message = new HashMap<String, Object>();
-      Gson gson = new Gson();
-      message.put("msg", gson.toJson(args));
-      
-      BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.meetingId, "breakoutRoomsTimeRemainingUpdate", message);
-      service.sendMessage(m); 
-  }
-  
-  private void processUpdateBreakoutUsers(UpdateBreakoutUsers msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("parentMeetingId", msg.payload.parentMeetingId);
-	  args.put("breakoutMeetingId", msg.payload.breakoutMeetingId);
-	  args.put("users", msg.payload.users);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-	  Gson gson = new Gson();
-	  message.put("msg", gson.toJson(args));
-      
-	  BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.parentMeetingId, "updateBreakoutUsers", message);
-      service.sendMessage(m);
-  }
-  
-  private void processBreakoutRoomStarted(BreakoutRoomStarted msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("breakoutMeetingId", msg.payload.meetingId);
-      args.put("parentMeetingId", msg.payload.parentMeetingId);
-      args.put("externalMeetingId", msg.payload.externalMeetingId);
-	  args.put("sequence", msg.payload.sequence);
-	  args.put("name", msg.payload.name);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-	  Gson gson = new Gson();
-	  message.put("msg", gson.toJson(args));
-	  
-	  BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.parentMeetingId, "breakoutRoomStarted", message);
-      service.sendMessage(m);
-  }
-  
-  private void processBreakoutRoomClosed(BreakoutRoomClosed msg) {
-	  Map<String, Object> args = new HashMap<String, Object>();	
-	  args.put("breakoutMeetingId", msg.payload.meetingId);
-	  args.put("parentMeetingId", msg.payload.parentMeetingId);
-	  
-	  Map<String, Object> message = new HashMap<String, Object>();
-	  Gson gson = new Gson();
-	  message.put("msg", gson.toJson(args));
-	  
-	  BroadcastClientMessage m = new BroadcastClientMessage(msg.payload.parentMeetingId, "breakoutRoomClosed", message);
-      service.sendMessage(m);
-  }
 
   private void processGetGuestPolicyReplyMessage(GetGuestPolicyReplyMessage msg) {
     Map<String, Object> args = new HashMap<String, Object>();
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomClosed.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomClosed.java
deleted file mode 100644
index bcfac2115c8f358a179b164dde549af56a39e537..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomClosed.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.BreakoutRoomPayload;
-
-import com.google.gson.Gson;
-
-public class BreakoutRoomClosed implements IBigBlueButtonMessage {
-	public final static String NAME = "BreakoutRoomClosed";
-
-	public final Header header;
-	public final BreakoutRoomPayload payload;
-
-	public BreakoutRoomClosed(BreakoutRoomPayload payload) {
-		header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomJoinURL.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomJoinURL.java
deleted file mode 100755
index 523c0ab24f756502b59e730f1149bf35655efcd9..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomJoinURL.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.BreakoutRoomJoinURLPayload;
-
-import com.google.gson.Gson;
-
-public class BreakoutRoomJoinURL implements IBigBlueButtonMessage {
-  public final static String NAME = "BreakoutRoomJoinURL";
-  
-  public final Header header;
-  public final BreakoutRoomJoinURLPayload payload;
-  
-  public BreakoutRoomJoinURL(BreakoutRoomJoinURLPayload payload) {
-    header = new Header(NAME );
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomStarted.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomStarted.java
deleted file mode 100755
index e7f5878000945af57debeab29b19fc4f49e992fe..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomStarted.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.BreakoutRoomPayload;
-
-import com.google.gson.Gson;
-
-public class BreakoutRoomStarted implements IBigBlueButtonMessage {
-  public final static String NAME = "BreakoutRoomStarted";
-  
-  public final Header header;
-  public final BreakoutRoomPayload payload;
-  
-  public BreakoutRoomStarted(BreakoutRoomPayload payload) {
-    this.header = new Header(NAME);
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsList.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsList.java
deleted file mode 100644
index a759f496e77f2f8fa920c60d9a80f757c7a1ef40..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsList.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.BreakoutRoomsListPayload;
-
-import com.google.gson.Gson;
-
-public class BreakoutRoomsList implements IBigBlueButtonMessage {
-	public final static String NAME = "BreakoutRoomsList";
-
-	public final Header header;
-	public final BreakoutRoomsListPayload payload;
-
-	public BreakoutRoomsList(BreakoutRoomsListPayload payload) {
-		header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsTimeRemainingUpdate.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsTimeRemainingUpdate.java
deleted file mode 100644
index 36deb60e3633d3f45ea5fe269136a7745a0da289..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/BreakoutRoomsTimeRemainingUpdate.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.BreakoutRoomsTimeRemainingPayload;
-
-import com.google.gson.Gson;
-
-public class BreakoutRoomsTimeRemainingUpdate implements IBigBlueButtonMessage {
-    public final static String NAME = "BreakoutRoomsTimeRemainingUpdate";
-
-    public final Header header;
-    public final BreakoutRoomsTimeRemainingPayload payload;
-
-    public BreakoutRoomsTimeRemainingUpdate(
-            BreakoutRoomsTimeRemainingPayload payload) {
-        header = new Header(NAME);
-        this.payload = payload;
-    }
-
-    public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomRequest.java
deleted file mode 100755
index 1187be2fbcc1bc256e327ee197fbfe06ea996b2a..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomRequest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.CreateBreakoutRoomRequestPayload;
-
-import com.google.gson.Gson;
-
-public class CreateBreakoutRoomRequest implements IBigBlueButtonMessage {
-  public final static String NAME = "CreateBreakoutRoomRequest";
-  
-  public final Header header;
-  public final CreateBreakoutRoomRequestPayload payload;
-  
-  public CreateBreakoutRoomRequest(CreateBreakoutRoomRequestPayload payload) {
-    this.header = new Header(NAME);
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequest.java
deleted file mode 100755
index ada356418f46de3e4673b0a30875ffd082348039..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/CreateBreakoutRoomsRequest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.CreateBreakoutRoomsRequestPayload;
-
-import com.google.gson.Gson;
-
-/**
- * The message from the client to the server requesting to create breakout
- * rooms.
- */
-public class CreateBreakoutRoomsRequest implements IBigBlueButtonMessage {
-	public final static String NAME = "CreateBreakoutRoomsRequest";
-
-	public final Header header;
-	public final CreateBreakoutRoomsRequestPayload payload;
-
-	public CreateBreakoutRoomsRequest(CreateBreakoutRoomsRequestPayload payload) {
-		this.header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndAllBreakoutRoomsRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndAllBreakoutRoomsRequest.java
deleted file mode 100644
index 7516892d7a7a89bb62e1aa0bfd23bd152cfb3415..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndAllBreakoutRoomsRequest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.EndAllBreakoutRoomsRequestPayload;
-
-import com.google.gson.Gson;
-
-public class EndAllBreakoutRoomsRequest implements IBigBlueButtonMessage {
-	public final static String NAME = "EndAllBreakoutRoomsRequest";
-
-	public final Header header;
-	public final EndAllBreakoutRoomsRequestPayload payload;
-
-	public EndAllBreakoutRoomsRequest(EndAllBreakoutRoomsRequestPayload payload) {
-		this.header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndBreakoutRoomRequest.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndBreakoutRoomRequest.java
deleted file mode 100644
index 6440db5f492b4f69f64af7c1fb9503ca1bcb6182..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/EndBreakoutRoomRequest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.EndBreakoutRoomRequestPayload;
-
-import com.google.gson.Gson;
-
-public class EndBreakoutRoomRequest implements IBigBlueButtonMessage {
-	public final static String NAME = "EndBreakoutRoomRequest";
-
-	public final Header header;
-	public final EndBreakoutRoomRequestPayload payload;
-
-	public EndBreakoutRoomRequest(EndBreakoutRoomRequestPayload payload) {
-		header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/GetBreakoutRoomsList.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/GetBreakoutRoomsList.java
deleted file mode 100644
index 6e75ddc891f82b8f8515e59603df6b2373e8ff9e..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/GetBreakoutRoomsList.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.GetBreakoutRoomsListPayload;
-
-import com.google.gson.Gson;
-
-public class GetBreakoutRoomsList implements IBigBlueButtonMessage {
-	public final static String NAME = "GetBreakoutRoomsList";
-
-	public final Header header;
-	public final GetBreakoutRoomsListPayload payload;
-
-	public GetBreakoutRoomsList(GetBreakoutRoomsListPayload payload) {
-		header = new Header(NAME);
-		this.payload = payload;
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ListenInOnBreakout.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/ListenInOnBreakout.java
deleted file mode 100755
index 9c871b2d39511021f9507d45c0914724aef005b1..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/ListenInOnBreakout.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.ListenInOnBreakoutPayload;
-
-import com.google.gson.Gson;
-
-public class ListenInOnBreakout implements IBigBlueButtonMessage {
-  public final static String NAME = "ListenInOnBreakout";
- 
-  public final Header header;
-  public final ListenInOnBreakoutPayload payload;
-  
-  public ListenInOnBreakout(ListenInOnBreakoutPayload payload) {
-    this.header = new Header(NAME);
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RequestBreakoutJoinURL.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/RequestBreakoutJoinURL.java
deleted file mode 100755
index d16e9e6f141ccd192b403f14b7d93f7e3e79124b..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/RequestBreakoutJoinURL.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.RequestBreakoutJoinURLPayload;
-
-import com.google.gson.Gson;
-
-public class RequestBreakoutJoinURL implements IBigBlueButtonMessage {
-  public final static String NAME = "RequestBreakoutJoinURL";
-  
-  public final Header header;
-  public final RequestBreakoutJoinURLPayload payload;
-  
-  public RequestBreakoutJoinURL(RequestBreakoutJoinURLPayload payload) {
-    this.header = new Header(NAME);
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/TimeRemainingUpdate.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/TimeRemainingUpdate.java
deleted file mode 100755
index 4d41d7bbcf44e52200e30480336aa7db05919cae..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/TimeRemainingUpdate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.MeetingTimeRemainingPayload;
-
-import com.google.gson.Gson;
-
-public class TimeRemainingUpdate implements IBigBlueButtonMessage {
-  public final static String NAME = "TimeRemainingUpdate";
-  
-  public final Header header;
-  public final MeetingTimeRemainingPayload payload;
-  
-  public TimeRemainingUpdate(MeetingTimeRemainingPayload payload) {
-    header = new Header(NAME);
-    this.payload = payload;
-  }
-  
-  public String toJson() {
-    Gson gson = new Gson();
-    return gson.toJson(this);
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/UpdateBreakoutUsers.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/UpdateBreakoutUsers.java
deleted file mode 100755
index e916622f9ca7bee83d7ce4b7e446c86ebde44dc3..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/UpdateBreakoutUsers.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.common.messages.IBigBlueButtonMessage;
-import org.bigbluebutton.messages.payload.UpdateBreakoutUsersPayload;
-
-import com.google.gson.Gson;
-
-public class UpdateBreakoutUsers implements IBigBlueButtonMessage {
-	public final static String NAME = "UpdateBreakoutUsers";
-
-	public final Header header;
-	public final UpdateBreakoutUsersPayload payload;
-
-	public UpdateBreakoutUsers(UpdateBreakoutUsersPayload payload) {
-		this.header = new Header(NAME);
-		this.payload = payload;
-
-	}
-
-	public String toJson() {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomJoinURLPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomJoinURLPayload.java
deleted file mode 100755
index af086f129cc537a4726602c910074b33274e9659..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomJoinURLPayload.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages.payload;
-
-public class BreakoutRoomJoinURLPayload {
-
-    public final String parentMeetingId;
-    public final String breakoutMeetingId;
-    public final String userId;
-    public final String redirectJoinURL;
-    public final String noRedirectJoinURL;
-
-    public BreakoutRoomJoinURLPayload(String parentMeetingId,
-            String breakoutMeetingId, String userId, String redirectJoinURL,
-            String noRedirectJoinURL) {
-        this.parentMeetingId = parentMeetingId;
-        this.breakoutMeetingId = breakoutMeetingId;
-        this.userId = userId;
-        this.redirectJoinURL = redirectJoinURL;
-        this.noRedirectJoinURL = noRedirectJoinURL;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomPayload.java
deleted file mode 100755
index 898ab5048690b8fbd91aedcabed86f87af040891..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomPayload.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class BreakoutRoomPayload {
-
-    public final String parentMeetingId;
-    public final String meetingId;
-    public final String externalMeetingId;
-    public final String name;
-    public final Integer sequence;
-
-    public BreakoutRoomPayload(String parentMeetingId, String meetingId,
-            String externalMeetingId, String name, Integer sequence) {
-        this.parentMeetingId = parentMeetingId;
-        this.meetingId = meetingId;
-        this.externalMeetingId = externalMeetingId;
-        this.name = name;
-        this.sequence = sequence;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomRequestPayload.java
deleted file mode 100755
index 20cceb76bcdd1b3b587513536bdcbc17338cbb37..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomRequestPayload.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-import java.util.ArrayList;
-
-public class BreakoutRoomRequestPayload {
-    // Name of the breakout room
-    public final String name;
-    // Sequence of the breakout room
-    public final Integer sequence;
-    // List of user ids to assign to the breakout room
-    public final ArrayList<String> users;
-
-    public BreakoutRoomRequestPayload(String name, Integer sequence, ArrayList<String> users) {
-        this.name = name;
-        this.sequence = sequence;
-        this.users = users;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsListPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsListPayload.java
deleted file mode 100644
index d649ee56e39e78a49991373776e4dc089e85f4d2..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsListPayload.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages.payload;
-
-import java.util.ArrayList;
-
-public class BreakoutRoomsListPayload {
-
-    public final String meetingId;
-    public final ArrayList<BreakoutRoomPayload> rooms;
-    public final Boolean roomsReady;
-
-    public BreakoutRoomsListPayload(String meetingId,
-            ArrayList<BreakoutRoomPayload> rooms, Boolean roomsReady) {
-        this.meetingId = meetingId;
-        this.rooms = rooms;
-        this.roomsReady = roomsReady;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsTimeRemainingPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsTimeRemainingPayload.java
deleted file mode 100644
index 404b14cb5011dca415ddfbe9c8fa6fc441a4ceeb..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutRoomsTimeRemainingPayload.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class BreakoutRoomsTimeRemainingPayload {
-
-    public final String meetingId;
-    public final Integer timeRemaining;
-
-    public BreakoutRoomsTimeRemainingPayload(String meetingId,
-            Integer timeRemaining) {
-        this.meetingId = meetingId;
-        this.timeRemaining = timeRemaining;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutUserPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutUserPayload.java
deleted file mode 100755
index 3ebc4e816b8392b9c1e9d59c01449c871ec80382..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/BreakoutUserPayload.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class BreakoutUserPayload {
-
-  public final String id;
-  public final String name;
-  
-  public BreakoutUserPayload(String id, String name) {
-    this.id = id;
-    this.name = name;
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java
deleted file mode 100755
index 9c49157c76b5ee750a8b01d3707fce95ede2682d..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomRequestPayload.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class CreateBreakoutRoomRequestPayload {
-    public final String breakoutMeetingId;
-    public final String parentMeetingId; // The main meeting internal id
-    public final String name; // The name of the breakout room
-    public final Integer sequence; // The sequnce number of the breakout room
-    public final String voiceConfId; // The voice conference id
-    public final String viewerPassword;
-    public final String moderatorPassword;
-    public final Integer durationInMinutes; // The duration of the breakout room
-    public final String sourcePresentationId;
-    public final Integer sourcePresentationSlide;
-    public final Boolean record;
-
-    public CreateBreakoutRoomRequestPayload(String meetingMeetingId, String parentMeetingId,
-            String name, Integer sequence, String voiceConfId, String viewerPassword,
-            String moderatorPassword, Integer duration,
-            String sourcePresentationId, Integer sourcePresentationSlide,
-            Boolean record) {
-        this.breakoutMeetingId = meetingMeetingId;
-        this.parentMeetingId = parentMeetingId;
-        this.name = name;
-        this.sequence = sequence;
-        this.voiceConfId = voiceConfId;
-        this.viewerPassword = viewerPassword;
-        this.moderatorPassword = moderatorPassword;
-        this.durationInMinutes = duration;
-        this.sourcePresentationId = sourcePresentationId;
-        this.sourcePresentationSlide = sourcePresentationSlide;
-        this.record = record;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomsRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomsRequestPayload.java
deleted file mode 100755
index c212b36aa283cb35b3a48432189849b5a75cdd6b..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/CreateBreakoutRoomsRequestPayload.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-import java.util.ArrayList;
-
-public class CreateBreakoutRoomsRequestPayload {
-    // The main meeting internal id
-    public final String meetingId;
-    // The list of breakout rooms
-    public final ArrayList<BreakoutRoomRequestPayload> rooms;
-    // The duration of the breakout room
-    public final Integer durationInMinutes;
-    // Breakout rooms recording option
-    public final Boolean record;
-
-    public CreateBreakoutRoomsRequestPayload(String meetingId,
-            ArrayList<BreakoutRoomRequestPayload> breakoutRooms,
-            Integer duration, Boolean record) {
-        this.meetingId = meetingId;
-        this.rooms = breakoutRooms;
-        this.durationInMinutes = duration;
-        this.record = record;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndAllBreakoutRoomsRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndAllBreakoutRoomsRequestPayload.java
deleted file mode 100644
index d7b7e9010668830e8d21b9acc82ac8aac8982fd1..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndAllBreakoutRoomsRequestPayload.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages.payload;
-
-public class EndAllBreakoutRoomsRequestPayload {
-	public final String meetingId;
-
-	public EndAllBreakoutRoomsRequestPayload(String meetingId) {
-		this.meetingId = meetingId;
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndBreakoutRoomRequestPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndBreakoutRoomRequestPayload.java
deleted file mode 100644
index 7ff228bac6674cb3bfe1e1857a1751480204bf67..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/EndBreakoutRoomRequestPayload.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages.payload;
-
-public class EndBreakoutRoomRequestPayload {
-
-	public final String meetingId;
-
-	public EndBreakoutRoomRequestPayload(String meetingId) {
-		this.meetingId = meetingId;
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/GetBreakoutRoomsListPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/GetBreakoutRoomsListPayload.java
deleted file mode 100644
index 7d9c6471032a5588534525cfec026b8398a9e191..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/GetBreakoutRoomsListPayload.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.messages.payload;
-
-public class GetBreakoutRoomsListPayload {
-
-	public final String meetingId;
-
-	public GetBreakoutRoomsListPayload(String meetingId) {
-		this.meetingId = meetingId;
-	}
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/ListenInOnBreakoutPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/ListenInOnBreakoutPayload.java
deleted file mode 100755
index aeed47d5185e8601a8111fb55ce66a0fcbb6cb4f..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/ListenInOnBreakoutPayload.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class ListenInOnBreakoutPayload {
-
-    public final String meetingId;
-    public final String targetMeetingId;
-    public final String userId;
-
-    public ListenInOnBreakoutPayload(String meetingId, String targetMeetingId,
-            String userId) {
-        this.meetingId = meetingId;
-        this.targetMeetingId = targetMeetingId;
-        this.userId = userId;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/MeetingTimeRemainingPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/MeetingTimeRemainingPayload.java
deleted file mode 100755
index ca2dbd2831905e6da38a9d1bf8aebeaac18c95c9..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/MeetingTimeRemainingPayload.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class MeetingTimeRemainingPayload {
-
-  public final String meetingId;
-  public final Integer timeRemaining;
-  
-  public MeetingTimeRemainingPayload(String meetingId, Integer timeRemaining) {
-    this.meetingId = meetingId;
-    this.timeRemaining = timeRemaining;
-  }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/RequestBreakoutJoinURLPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/RequestBreakoutJoinURLPayload.java
deleted file mode 100755
index e53be785192279c2f78cde37b26d26ccf52c04ae..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/RequestBreakoutJoinURLPayload.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-public class RequestBreakoutJoinURLPayload {
-
-    public final String meetingId;
-    public final String breakoutMeetingId;
-    public final String userId;
-
-    public RequestBreakoutJoinURLPayload(String meetingId,
-            String breakoutMeetingId, String userId) {
-        this.meetingId = meetingId;
-        this.breakoutMeetingId = breakoutMeetingId;
-        this.userId = userId;
-    }
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/UpdateBreakoutUsersPayload.java b/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/UpdateBreakoutUsersPayload.java
deleted file mode 100755
index 84810e44cacf905f81d284cc1f576caa472904b8..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/messages/payload/UpdateBreakoutUsersPayload.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bigbluebutton.messages.payload;
-
-import java.util.ArrayList;
-
-public class UpdateBreakoutUsersPayload {
-
-	public final ArrayList<BreakoutUserPayload> users;
-	public final String breakoutMeetingId;
-	public final String parentMeetingId;
-
-	public UpdateBreakoutUsersPayload(String meetingParentId, String breakoutMeetingId, ArrayList<BreakoutUserPayload> users) {
-		this.parentMeetingId = meetingParentId;
-		this.breakoutMeetingId = breakoutMeetingId;
-	this.users = users;
-	}
-}
diff --git a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomRequestTest.java b/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomRequestTest.java
deleted file mode 100755
index 59f3086d0d8f12afa9180afc45bf37aa26178606..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomRequestTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bigbluebutton.messages;
-
-import org.bigbluebutton.messages.payload.CreateBreakoutRoomRequestPayload;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.google.gson.Gson;
-
-public class CreateBreakoutRoomRequestTest {
-  @Test
-  public void testCreateBreakoutRoomRequest() {
-      String breakoutId = "183f0bf3a0982a127bdb8161e0c44eb696b3e75c-1474984695664";
-    String parentId = "abc-123";
-    Integer durationInMinutes = 20;
-    String name = "Breakout room 1";
-    Integer sequence = 3;
-    String voiceConfId = "851153";
-    String viewerPassword = "vp";
-    String moderatorPassword = "mp";
-    String sourcePresentationId = "d2d9a672040fbde2a47a10bf6c37b6a4b5ae187f-1474984695907";
-    Integer sourePresentationSlide = 5;
-    Boolean record = false;
-    
-        CreateBreakoutRoomRequestPayload payload = new CreateBreakoutRoomRequestPayload(
-                breakoutId, parentId, name, sequence, voiceConfId,
-                viewerPassword, moderatorPassword, durationInMinutes,
-                sourcePresentationId, sourePresentationSlide, record);
-    CreateBreakoutRoomRequest msg = new CreateBreakoutRoomRequest(payload);    
-    Gson gson = new Gson();
-    String json = gson.toJson(msg);
-    System.out.println(json);
-    
-    CreateBreakoutRoomRequest rxMsg = gson.fromJson(json, CreateBreakoutRoomRequest.class);
-    
-    Assert.assertEquals(rxMsg.header.name, CreateBreakoutRoomRequest.NAME);
-    Assert.assertEquals(rxMsg.payload.breakoutMeetingId, breakoutId);
-    Assert.assertEquals(rxMsg.payload.name, name);
-    Assert.assertEquals(rxMsg.payload.sequence, sequence);
-    Assert.assertEquals(rxMsg.payload.voiceConfId, voiceConfId);
-    Assert.assertEquals(rxMsg.payload.viewerPassword, viewerPassword);
-    Assert.assertEquals(rxMsg.payload.moderatorPassword, moderatorPassword);
-    Assert.assertEquals(rxMsg.payload.durationInMinutes, durationInMinutes);
-    Assert.assertEquals(rxMsg.payload.sourcePresentationId, sourcePresentationId);
-    Assert.assertEquals(rxMsg.payload.sourcePresentationSlide, sourePresentationSlide);
-    Assert.assertEquals(rxMsg.payload.record, record);
-  }
-}
diff --git a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java b/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java
deleted file mode 100755
index 2fd0aeb2f2d4eb9206e91112778eda8cd867749a..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/test/java/org/bigbluebutton/messages/CreateBreakoutRoomsMsgsRequestTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bigbluebutton.messages;
-
-import java.util.ArrayList;
-
-import org.bigbluebutton.messages.payload.BreakoutRoomRequestPayload;
-import org.bigbluebutton.messages.payload.CreateBreakoutRoomsRequestPayload;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.google.gson.Gson;
-
-public class CreateBreakoutRoomsMsgsRequestTest {
-	
-  @Test
-  public void testCreateBreakoutRoomsRequest() {
-    String meetingId = "abc123";
-    Integer durationInMinutes = 20;
-    Boolean record = true;
-    
-    ArrayList<String> room1Users = new ArrayList<String>();
-    room1Users.add("Tidora"); room1Users.add("Nidora"); room1Users.add("Tinidora");
-    BreakoutRoomRequestPayload room1 = new BreakoutRoomRequestPayload("room1", 1, room1Users);
-    
-    ArrayList<String> room2Users = new ArrayList<String>();
-    room2Users.add("Jose"); room2Users.add("Wally"); room2Users.add("Paolo");
-    BreakoutRoomRequestPayload room2= new BreakoutRoomRequestPayload("room2", 2, room2Users);
-    
-    ArrayList<String> room3Users = new ArrayList<String>();
-    room3Users.add("Alden"); room3Users.add("Yaya Dub");
-    BreakoutRoomRequestPayload room3= new BreakoutRoomRequestPayload("room3", 3, room3Users);
-    
-    ArrayList<BreakoutRoomRequestPayload> rooms = new ArrayList<BreakoutRoomRequestPayload>();
-    rooms.add(room1); rooms.add(room2); rooms.add(room3);
-    
-    CreateBreakoutRoomsRequestPayload payload = new CreateBreakoutRoomsRequestPayload(meetingId, rooms, durationInMinutes, record);
-    CreateBreakoutRoomsRequest msg = new CreateBreakoutRoomsRequest(payload);    
-    Gson gson = new Gson();
-    String json = gson.toJson(msg);
-    System.out.println(json);
-    
-    CreateBreakoutRoomsRequest rxMsg = gson.fromJson(json, CreateBreakoutRoomsRequest.class);
-    
-    Assert.assertEquals(rxMsg.header.name, CreateBreakoutRoomsRequest.NAME);
-    Assert.assertEquals(rxMsg.payload.meetingId, meetingId);
-    Assert.assertEquals(rxMsg.payload.rooms.size(), 3);
-    Assert.assertEquals(rxMsg.payload.durationInMinutes, durationInMinutes);
-    Assert.assertEquals(rxMsg.payload.record, record);
-  }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
index dd3216f0220d403e8d8701e3b7af366cf7a8d049..72f9767e28dfef63a7ab7bd3def7d9725cf3ac8f 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
@@ -113,27 +113,6 @@ public class MessagePublisher {
 		sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
 	}
 
-	// could be improved by doing some factorization
-	public void getBreakoutRoomsList(String jsonMessage) {
-		sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage);
-	}
-
-	public void createBreakoutRooms(String jsonMessage) {
-		sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage);
-	}
-
-	public void requestBreakoutJoinURL(String jsonMessage) {
-		sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage);
-	}
-
-	public void listenInOnBreakout(String jsonMessage) {
-		sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage);
-	}
-
-	public void endAllBreakoutRooms(String jsonMessage) {
-		sender.send(MessagingConstants.TO_USERS_CHANNEL, jsonMessage);
-	}
-
 	public void logoutEndMeeting(String meetingId, String userId) {
 		LogoutEndMeetingRequestMessage msg = new LogoutEndMeetingRequestMessage(meetingId, userId);
 		sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
deleted file mode 100755
index 6ae1b91dd30c8f34d506bd137523e28637664f31..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/BreakoutRoomService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- * 
- * Copyright (c) 2015 BigBlueButton Inc. and by respective authors (see below).
- *
- * This program is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free Software
- * Foundation; either version 3.0 of the License, or (at your option) any later
- * version.
- * 
- * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.bigbluebutton.red5.service;
-
-import org.bigbluebutton.messages.CreateBreakoutRoomsRequest;
-import org.bigbluebutton.messages.EndAllBreakoutRoomsRequest;
-import org.bigbluebutton.messages.GetBreakoutRoomsList;
-import org.bigbluebutton.messages.ListenInOnBreakout;
-import org.bigbluebutton.messages.RequestBreakoutJoinURL;
-import org.bigbluebutton.red5.pubsub.MessagePublisher;
-
-public class BreakoutRoomService extends AbstractService {
-
-	private MessagePublisher red5GW;
-
-	public void setRed5Publisher(MessagePublisher inGW) {
-		red5GW = inGW;
-	}
-
-	public void getBreakoutRoomsList(String jsonMessage) {
-		red5GW.getBreakoutRoomsList(addHeaderToMessage(jsonMessage,
-				GetBreakoutRoomsList.NAME));
-	}
-
-	public void createBreakoutRooms(String jsonMessage) {
-		red5GW.createBreakoutRooms(addHeaderToMessage(jsonMessage,
-				CreateBreakoutRoomsRequest.NAME));
-	}
-
-	public void requestBreakoutJoinUrl(String jsonMessage) {
-		red5GW.requestBreakoutJoinURL(addHeaderToMessage(jsonMessage,
-				RequestBreakoutJoinURL.NAME));
-	}
-
-	public void listenInOnBreakout(String jsonMessage) {
-		red5GW.listenInOnBreakout(addHeaderToMessage(jsonMessage,
-				ListenInOnBreakout.NAME));
-	}
-
-	public void endAllBreakoutRooms(String jsonMessage) {
-		red5GW.endAllBreakoutRooms(addHeaderToMessage(jsonMessage,
-				EndAllBreakoutRoomsRequest.NAME));
-	}
-}
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
index 9496a727079a012aa1d2c14cdb12bfca545443a6..483a602e770aece61465eafcb0a62935315fe008 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
@@ -86,10 +86,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <property name="red5Publisher"> <ref bean="red5Publisher"/> </property>
     </bean>
     
-    <bean id="breakoutroom.service" class="org.bigbluebutton.red5.service.BreakoutRoomService">
-        <property name="red5Publisher"> <ref bean="red5Publisher"/> </property>
-    </bean>
-    
     <bean id="red5Publisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
         <property name="messageSender" ref="clientInGW"/>
     </bean>