More server cleanup