Server code cleanup