[Server] More cleanup