clean up server a bit