Updated a little bit on the client server cleanup