Cleaned all the server code
commit