["Server] Fix it
[Server] Cleanup