Server code cleaning