diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 491178b..e5153d6 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -1,21 +1,13 @@
 package cactusServer.entities;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import cactusServer.utils.RandomStringGenerator;
 import net.arnx.jsonic.JSONHint;
 
-public class Account extends Entity{
-	private String id, name, token;
-	
-	
-	private String pass;
-	
-	@JSONHint(ignore=true)
-	private String uniqueID;
-	
-	@JSONHint(ignore=true)
+public class Account extends Entity {
+	private String id, name, token, pass, uniqueID;
 	private boolean login = false;
 
 	public Account(String userID, String userName, String userPass, String uniqueID) {
@@ -41,7 +33,8 @@
 	public void setName(String name) {
 		this.name = name;
 	}
-	@JSONHint(ignore=true)
+
+	@JSONHint(ignore = true)
 	public String getPass() {
 		return pass;
 	}
@@ -49,7 +42,8 @@
 	public void setPass(String pass) {
 		this.pass = pass;
 	}
-	@JSONHint(ignore=true)
+
+	@JSONHint(ignore = true)
 	public boolean isLogin() {
 		return login;
 	}
@@ -66,7 +60,8 @@
 		token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC);
 		return token;
 	}
-	@JSONHint(ignore=true)
+
+	@JSONHint(ignore = true)
 	public String getUniqueID() {
 		return uniqueID;
 	}
diff --git a/src/main/java/cactusServer/entities/Session.java b/src/main/java/cactusServer/entities/Session.java
index cabea47..6c99857 100644
--- a/src/main/java/cactusServer/entities/Session.java
+++ b/src/main/java/cactusServer/entities/Session.java
@@ -3,12 +3,13 @@
 import java.net.URI;
 
 import cactusServer.entities.Account;
+import net.arnx.jsonic.JSONHint;
 
 public class Session extends URIAddressedEntity{
 	public Session(Account account, URI accountURI) {
 		super(accountURI, account);
 	}
-
+	@JSONHint(ignore = true)
 	public Account getAccount() {
 		return (Account)getBody();
 	}
@@ -16,7 +17,7 @@
 	public void setAccount(Account account) {
 		setBody(account);
 	}
-
+	@JSONHint(ignore = true)
 	public URI getAccountURI() {
 		return getUri();
 	}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index cf8a9d3..ee05a49 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -100,16 +100,16 @@
 		Accounts.getInstance().getAccountToken(token).setLogin(false);
 		return Accounts.getInstance().getAccountToken(token);
 	}
-	
-	public Account deleteAccount(String token) {
-		Account edit = Accounts.getInstance().getAccountToken(token);
+
+	public Account deleteAccount(String uniqueID) {
+		Account edit = Accounts.getInstance().getAccountToken(uniqueID);
 		userIDSet.remove(edit.getId());
 		uniqueIDSet.remove(edit.getUniqueID());
 		accounts.remove(edit);
 		return edit;
 	}
 
-	public ArrayList<Account> getAccounts(){
+	public ArrayList<Account> getAccounts() {
 		return accounts;
 	}
 }