diff --git a/src/main/java/envoy/server/database/PersistenceManager.java b/src/main/java/envoy/server/database/PersistenceManager.java
index 2d611ee..803f177 100644
--- a/src/main/java/envoy/server/database/PersistenceManager.java
+++ b/src/main/java/envoy/server/database/PersistenceManager.java
@@ -132,37 +132,6 @@ public class PersistenceManager {
 		entityManager.getTransaction().commit();
 	}
 
-	/**
-	 * @param action the action that should be applied for this entity. Case does
-	 *               <b>not</b> matter.<br>
-	 *               Currently supported values are:<br>
-	 *               -"add"/"persist" to add an object to the database<br>
-	 *               -"update"/"merge" to update this object in the database<br>
-	 *               -"delete"/"remove" to delete this object in the database
-	 * @param entity the object to apply the action to
-	 * @since Envoy Server Standalone v0.1-alpha
-	 */
-	public void applyAction(String action, Object entity) {
-		entityManager.getTransaction().begin();
-		switch (action.trim().toLowerCase()) {
-			case "add":
-			case "persist":
-				entityManager.persist(entity);
-				break;
-			case "update":
-			case "merge":
-				entityManager.merge(entity);
-				break;
-			case "delete":
-			case "remove":
-				entityManager.remove(entity);
-				break;
-			default:
-				throw new IllegalStateException("Unknown action: " + action + " was selected to be executed in the database");
-		}
-		entityManager.getTransaction().commit();
-	}
-
 	/**
 	 * Searches for a {@link User} with a specific id.
 	 *
diff --git a/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java b/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
index 0ed56bc..43e6153 100644
--- a/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
+++ b/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
@@ -22,8 +22,8 @@ import envoy.server.net.ObjectWriteProxy;
  */
 public class UserStatusChangeProcessor implements ObjectProcessor<UserStatusChangeEvent> {
 
-	private static ObjectWriteProxy	writeProxy;
-	private static PersistenceManager		persistenceManager	= PersistenceManager.getPersistenceManager();
+	private static ObjectWriteProxy		writeProxy;
+	private static PersistenceManager	persistenceManager	= PersistenceManager.getPersistenceManager();
 
 	@Override
 	public Class<UserStatusChangeEvent> getInputClass() { return UserStatusChangeEvent.class; }
@@ -59,9 +59,7 @@ public class UserStatusChangeProcessor implements ObjectProcessor<UserStatusChan
 	 * @param evt the {@link UserStatusChangeEvent}
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
-	public static void updateUserStatus(UserStatusChangeEvent evt) {
-		updateUserStatus(persistenceManager.getUserById(evt.getId()));
-	}
+	public static void updateUserStatus(UserStatusChangeEvent evt) { updateUserStatus(persistenceManager.getUserById(evt.getId())); }
 
 	/**
 	 * notifies active contacts of this {@link User} that his {@link UserStatus} has
@@ -94,5 +92,6 @@ public class UserStatusChangeProcessor implements ObjectProcessor<UserStatusChan
 	 * @since Envoy Server Standalone v0.1-alpha
 	 */
 	public static void setWriteProxy(ObjectWriteProxy writeProxy) { UserStatusChangeProcessor.writeProxy = writeProxy; }
-
-}
\ No newline at end of file
+	// TODO may cause an problem if two clients log in at the same time.
+	// Change Needed.
+}