more server code cleanup