Make sure we remove client from client list on disconnect.
Removed redundant code.
Got rid of unneeded usage.
Added TODO