Removed connect state from client and moved to clientstate