diff --git a/pom.xml b/pom.xml
index 7ade6662037f52c14b19d9a0a2a6b523cbd7aa61..256ae9d0c61848d658aed48e33ed7986a0239a02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,11 +156,6 @@
 			<artifactId>spring-webmvc</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-websocket</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
 		<!-- Security -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
diff --git a/src/main/java/de/thm/arsnova/socket/EchoHandler.java b/src/main/java/de/thm/arsnova/socket/EchoHandler.java
deleted file mode 100644
index a4b08812dd5351b1d79c8841ecea977ea83e59f0..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/socket/EchoHandler.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.thm.arsnova.socket;
-
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
-import org.springframework.web.socket.handler.TextWebSocketHandler;
-
-public class EchoHandler extends TextWebSocketHandler {
-
-  @Override
-  public void handleTextMessage(WebSocketSession session,
-      TextMessage message) throws Exception {
-
-    session.sendMessage(message);
-  }
-
-}
diff --git a/src/main/java/de/thm/arsnova/socket/WebSocketConfig.java b/src/main/java/de/thm/arsnova/socket/WebSocketConfig.java
deleted file mode 100644
index 3650e2be3ed57d812d470fdb0b8a84f1604680bb..0000000000000000000000000000000000000000
--- a/src/main/java/de/thm/arsnova/socket/WebSocketConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.thm.arsnova.socket;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
-
-@Configuration
-@EnableWebSocket
-public class WebSocketConfig implements WebSocketConfigurer {
-
-	@Override
-	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-		registry.addHandler(new EchoHandler(), "/socket/echo");
-	}
-
-}