diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientEventBatchService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientEventBatchService.java
index a7674577..087808e2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientEventBatchService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientEventBatchService.java
@@ -160,11 +160,8 @@ public class SEBClientEventBatchService {
                 return eventData;
             }
 
-            ClientConnectionDataInternal clientConnection = null;
-            //synchronized (ExamSessionCacheService.CLIENT_CONNECTION_CREATION_LOCK) {
-            clientConnection = this.examSessionCacheService
+            final ClientConnectionDataInternal clientConnection = this.examSessionCacheService
                     .getClientConnection(eventData.connectionToken);
-            //}
 
             if (clientConnection == null) {
                 log.error("Failed to get ClientConnectionDataInternal for: {}", eventData.connectionToken);
@@ -207,11 +204,8 @@ public class SEBClientEventBatchService {
     private ClientEventRecord toEventRecord(final EventData eventData) {
         try {
 
-            ClientConnectionDataInternal clientConnection = null;
-            //synchronized (ExamSessionCacheService.CLIENT_CONNECTION_CREATION_LOCK) {
-            clientConnection = this.examSessionCacheService
+            final ClientConnectionDataInternal clientConnection = this.examSessionCacheService
                     .getClientConnection(eventData.connectionToken);
-            //}
 
             if (clientConnection == null) {
                 log.warn("Failed to retrieve ClientConnection for token {}. Skip this event",
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
index f0e69a81..81625a41 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientPingBatchService.java
@@ -91,11 +91,8 @@ public class SEBClientPingBatchService {
             return;
         }
 
-        ClientConnectionDataInternal activeClientConnection = null;
-        //synchronized (ExamSessionCacheService.CLIENT_CONNECTION_CREATION_LOCK) {
-        activeClientConnection = this.examSessionCacheService
+        final ClientConnectionDataInternal activeClientConnection = this.examSessionCacheService
                 .getClientConnection(connectionToken);
-        //}
 
         if (activeClientConnection != null) {
             activeClientConnection.notifyPing(timestamp);