diff --git a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
index 786d9f4c220c1d00fc8d0b641825b64d5521f3c1..997bdd34967b3c34c7928ea8af039214c6aebf88 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/ProjectHandler.scala
@@ -15,6 +15,7 @@ import scala.collection.{Map, mutable}
 /**
   * Created by tobias on 13.02.17.
   */
+@Deprecated
 @WebSocket class ProjectHandler(sessionDao: Dao[account.Session, Int], connection: Connection) {
 
 	// TODO mutable.HashSet --> Set
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
index 0bc308885baa1f9d5211222091f988810dfbcda2..20fda786edce1686b70dd5ef6dbda79ee32a8e9c 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionAddListener.scala
@@ -11,6 +11,7 @@ import scala.collection.JavaConverters
 /**
   * Created by tobias on 18.02.17.
   */
+@Deprecated
 class CollectionAddListener extends Listener {
 	override def onChange(json: JsonObject, connection: Connection): Unit = {
 		val childClass = json.get("child_class").getAsString
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
index 20875eb7e976e0873ed4aa3c14896b46ef2f6e8d..9de364042a9f54aff32980c45035a90c27953d77 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/CollectionRemoveListener.scala
@@ -8,6 +8,7 @@ import de.tobias.playpad.server.server.SqlHelper
 /**
   * Created by tobias on 18.02.17.
   */
+@Deprecated
 class CollectionRemoveListener extends Listener {
 	override def onChange(json: JsonObject, connection: Connection): Unit = {
 		val childClass = json.get("child_class").getAsString
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
index 7d8220b2ca75d70acca9433dc9452d9d8cd7b3d0..76703a03300cb3a55067608ea1070085013708c9 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/Listener.scala
@@ -7,6 +7,7 @@ import com.google.gson.JsonObject
 /**
   * Created by tobias on 18.02.17.
   */
+@Deprecated
 trait Listener {
 
 	def onChange(json: JsonObject, connection: Connection): Unit
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
index 33aba2d3d9bba6354bb3de6aa1442331326e9a8e..3bc5a2a28c1fdc5b40f9e04b2bbb758d06924ebb 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/listener/PropertyUpdateListener.scala
@@ -8,6 +8,7 @@ import de.tobias.playpad.server.server.SqlHelper
 /**
   * Created by tobias on 18.02.17.
   */
+@Deprecated
 class PropertyUpdateListener extends Listener {
 	override def onChange(json: JsonObject, connection: Connection): Unit = {
 		json match {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
index 9e73872d79d846312d02c77e64d469439cd2f3a9..24563e075c2770c711d2d8d4d915707e9bda4657 100644
--- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala
@@ -6,7 +6,7 @@ import com.google.gson.{JsonObject, JsonParser}
 import com.j256.ormlite.dao.Dao
 import de.tobias.playpad.server.account
 import de.tobias.playpad.server.account.Account
-import de.tobias.playpad.server.server.project.sync.listener.project.{ProjectAddListener, ProjectUpdateListener}
+import de.tobias.playpad.server.server.project.sync.listener.project.{ProjectAddListener, ProjectRemoveListener, ProjectUpdateListener}
 import org.eclipse.jetty.websocket.api.Session
 import org.eclipse.jetty.websocket.api.annotations.{OnWebSocketClose, OnWebSocketConnect, OnWebSocketMessage, WebSocket}
 
@@ -22,7 +22,8 @@ import scala.collection.{Map, mutable}
 
 	private val listeners = Map(
 		"pro-add" -> new ProjectAddListener(),
-		"pro-update" -> new ProjectUpdateListener()
+		"pro-update" -> new ProjectUpdateListener(),
+		"pro-rm" -> new ProjectRemoveListener()
 	)
 
 	@OnWebSocketConnect def onConnect(serverSession: Session): Unit = {
diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
new file mode 100644
index 0000000000000000000000000000000000000000..21656805f7439b7758497281af177cf18b6f625e
--- /dev/null
+++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/listener/project/ProjectRemoveListener.scala
@@ -0,0 +1,21 @@
+package de.tobias.playpad.server.server.project.sync.listener.project
+
+import java.sql.Connection
+import java.util.UUID
+
+import com.google.gson.JsonObject
+import de.tobias.playpad.server.account.Session
+import de.tobias.playpad.server.project.utils.SqlDef
+import de.tobias.playpad.server.server.SqlHelper
+import de.tobias.playpad.server.server.project.sync.listener.Listener
+
+/**
+  * Created by tobias on 19.02.17.
+  */
+class ProjectRemoveListener extends Listener {
+	override def onChange(json: JsonObject, connection: Connection, session: Session): Unit = {
+		val projectId = UUID.fromString(json.get("id").getAsString)
+
+		SqlHelper.delete(connection, SqlDef.PROJECT, projectId)
+	}
+}