[Server] cleaned up the mess ...