minor server code cleanup