More server clean up