diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java
index 4a0133a6..12a95bd7 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/main_frame/MainFrameModel.java
@@ -41,11 +41,7 @@ class MainFrameModel {
     }
 
     void disconnectCurrentAccount() {
-        fireAccountDisconnectedEvent();
-        //TODO uncomment code when test are to be done
-        /*
         accountService.logOutCurrentAccount();
-        */
     }
 
     void addListener(IMainFrameModelListener listener){
diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/AccountScreenModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/AccountScreenModel.java
index a1a129a0..471b7506 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/AccountScreenModel.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/AccountScreenModel.java
@@ -37,8 +37,6 @@ class AccountScreenModel {
     }
 
     Collection<AccountLevel> getLevels() {
-        //TODO régler ça aussi
-        //return accountService.getAvailableLevels();
         return EnumSet.allOf(AccountLevel.class);
     }
 }
diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java
index 998e931a..b02374db 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/startup_frame/StartupFrameModel.java
@@ -31,9 +31,6 @@ public class StartupFrameModel {
     }
 
     public void beginStartupProcess(String requiredHost, String requiredPort, String username, String password) {
-        //TODO uncomment code when test are to be done
-        firerer.fireStartupValidated();
-        /*
         if(!startupProcessBegan){
             checkParameters(requiredHost, requiredPort, username, password);
             startupProcessBegan = true;
@@ -65,7 +62,6 @@ public class StartupFrameModel {
                     })
                     .handle();
         }
-        */
     }
 
     private void checkParameters(String host, String port, String username, String password) {
diff --git a/Workspace/client/src/main/java/com/pqt/client/module/account/AccountService.java b/Workspace/client/src/main/java/com/pqt/client/module/account/AccountService.java
index 9c9c96bb..08c35435 100644
--- a/Workspace/client/src/main/java/com/pqt/client/module/account/AccountService.java
+++ b/Workspace/client/src/main/java/com/pqt/client/module/account/AccountService.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 //TODO écrire javadoc
 //TODO add log lines
+//TODO supporter la modif de comptes
 public class AccountService {
 
 	private QueryExecutor executor;