diff --git a/TODO b/TODO
index f998ddc95cf5a8bbeeac2ea46f948c4dd99e2672..188ab82c6dd8aaba506d9cf4f695d236e9c756c5 100644
--- a/TODO
+++ b/TODO
@@ -56,6 +56,8 @@ RC  - Review output of pylint (CODE)
       Do the replication process, the verification stage, with or without
       unfinished transactions, cells have to set as outdated, if yes, should the
       partition table changes be broadcasted ?
+    - Review PENDING/HIDDEN/SHUTDOWN states, avoid use of notifyNodeInformation 
+      to do a state-switch, use a exception-based mechanism ?
     
 
     Storage
diff --git a/neo/client/app.py b/neo/client/app.py
index 50ae35242649aed10eb16696bc7cf702ad3d77f7..d2ba4b43cd943d485fed5aa7e54832b8b374b77d 100644
--- a/neo/client/app.py
+++ b/neo/client/app.py
@@ -891,7 +891,6 @@ class Application(object):
                 conn.unlock()
 
         # Wait for answers from all storages.
-        # FIXME this is a busy loop.
         while len(self.local_var.node_tids) != len(storage_node_list):
             try:
                 self._waitMessage(handler=self.storage_handler)
diff --git a/neo/master/app.py b/neo/master/app.py
index 5f8d61acf33760301be73644650394be300e9180..bf2a1a07a613c8cd934a70ecc2e52ea0bfc265fd 100644
--- a/neo/master/app.py
+++ b/neo/master/app.py
@@ -792,7 +792,6 @@ class Application(object):
                 state = protocol.PENDING_STATE
             handler = storage.StorageServiceHandler
         elif self.cluster_state == protocol.STOPPING:
-            # FIXME: raise a ShuttingDownError ?
             raise protocol.NotReadyError
         else:
             raise RuntimeError('unhandled cluster state')
diff --git a/neo/storage/database.py b/neo/storage/database.py
index adbe97ec51e740d6c5c82e2b98c6416ec4988c8f..d4ad353c14eb278577059c4be3fa9531c68b9a4d 100644
--- a/neo/storage/database.py
+++ b/neo/storage/database.py
@@ -188,9 +188,3 @@ class DatabaseManager(object):
         the given list."""
         raise NotImplementedError('this method must be overridden')
 
-    # FIXME: this was added to ensure the database connection is well closed,
-    # but this raised 'not implemented' exceptions from the mysql db api during
-    # tests. We have to check how close correctly close the database connection
-    # at database manager deletion.
-    #__del__ = close
-