diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
index e4f3a5d5dbd41707c5c91f60d9c43055b126de92..0e6eeb5c4bf803d9069bbf86aacf4fef3117180b 100755
--- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
+++ b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
@@ -27,10 +27,7 @@ public class RedisMessageReceiver {
UsersMessageReceiver usersRx = new UsersMessageReceiver(bbbGW);
receivers.add(usersRx);
-
- VoiceMessageReceiver voiceRx = new VoiceMessageReceiver(bbbGW);
- receivers.add(voiceRx);
-
+
WhiteboardMessageReceiver whiteboardRx = new WhiteboardMessageReceiver(bbbGW);
receivers.add(whiteboardRx);
diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageReceiver.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageReceiver.java
deleted file mode 100755
index 1a3ad5f4849a38ed2aee8ccb09dd963cdfdb0a7a..0000000000000000000000000000000000000000
--- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/VoiceMessageReceiver.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bigbluebutton.core.pubsub.receivers;
-
-import org.bigbluebutton.common.messages.MessagingConstants;
-import org.bigbluebutton.core.api.IBigBlueButtonInGW;
-import org.bigbluebutton.core.service.voice.VoiceKeyUtil;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class VoiceMessageReceiver implements MessageHandler {
-
- private IBigBlueButtonInGW bbbGW;
-
- public VoiceMessageReceiver(IBigBlueButtonInGW bbbGW) {
- this.bbbGW = bbbGW;
- }
-
- @Override
- public void handleMessage(String pattern, String channel, String message) {
- if (channel.equalsIgnoreCase(MessagingConstants.TO_VOICE_CHANNEL)) {
-
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- JsonObject headerObject = (JsonObject) obj.get("header");
- JsonObject payloadObject = (JsonObject) obj.get("payload");
-
- String eventName = headerObject.get("name").toString().replace("\"", "");
-
- if (eventName.equalsIgnoreCase(MessagingConstants.MUTE_USER_REQUEST)){
-
- String meetingID = payloadObject.get("meeting_id").toString().replace("\"", "");
- String requesterID = payloadObject.get("requester_id").toString().replace("\"", "");
- String userID = payloadObject.get("userid").toString().replace("\"", "");
- String muteString = payloadObject.get(VoiceKeyUtil.MUTE).toString().replace("\"", "");
- Boolean mute = Boolean.valueOf(muteString);
-
- System.out.println("handling mute_user_request");
- bbbGW.muteUser(meetingID, requesterID, userID, mute);
- }
- else if (eventName.equalsIgnoreCase(MessagingConstants.USER_LEFT_VOICE_REQUEST)){
-
- String meetingID = payloadObject.get("meeting_id").toString().replace("\"", "");
- String userID = payloadObject.get("userid").toString().replace("\"", "");
-
- System.out.println("handling user_left_voice_request");
- bbbGW.voiceUserLeft(meetingID, userID);
- }
- }
- }
-}
diff --git a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/ConferenceEventListener.java b/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/ConferenceEventListener.java
deleted file mode 100755
index f881e3dc9edf1de9d3b9b0e0e1fa8eeba01470fd..0000000000000000000000000000000000000000
--- a/labs/akka-bbb-apps/src/main/java/org/bigbluebutton/core/voice/events/ConferenceEventListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 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.core.voice.events;
-
-
-public interface ConferenceEventListener {
- public void handleConferenceEvent(VoiceConferenceEvent event);
-
-}
diff --git a/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/Message.scala b/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/Message.scala
deleted file mode 100644
index 336601f40152dd6340e3bab63170ea51bba10eba..0000000000000000000000000000000000000000
--- a/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/Message.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-case class JsonMessage(channel: String, message: String)
\ No newline at end of file
diff --git a/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPubSubActor.scala b/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPubSubActor.scala
deleted file mode 100644
index 22bea5fde4b5a942eda9f45aacba5135c5b62617..0000000000000000000000000000000000000000
--- a/labs/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPubSubActor.scala
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import akka.actor.Props
-import java.net.InetSocketAddress
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.{ PMessage, Message }
-import redis.RedisClient
-import scala.concurrent.duration._
-import scala.concurrent.ExecutionContext.Implicits.global
-
-class RedisPubSubActor {
- implicit val akkaSystem = akka.actor.ActorSystem()
-
- val redis = RedisClient()
-
- // publish after 2 seconds every 2 or 5 seconds
- akkaSystem.scheduler.schedule(2 seconds, 2 seconds)(redis.publish("time", System.currentTimeMillis()))
- akkaSystem.scheduler.schedule(2 seconds, 5 seconds)(redis.publish("pattern.match", "pattern value"))
- // shutdown Akka in 20 seconds
- akkaSystem.scheduler.scheduleOnce(20 seconds)(akkaSystem.shutdown())
-
- val channels = Seq("time")
- val patterns = Seq("pattern.*")
- // create SubscribeActor instance
- akkaSystem.actorOf(Props(classOf[SubscribeActor], channels, patterns).withDispatcher("rediscala.rediscala-client-worker-dispatcher"))
-
-}
-
-class SubscribeActor(channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(new InetSocketAddress("localhost", 6379), channels, patterns) {
-
- def onMessage(message: Message) {
- println(s"message received: $message")
- }
-
- def onPMessage(pmessage: PMessage) {
- println(s"pattern message received: $pmessage")
- }
-}
\ No newline at end of file