Cleanup server to make it more consistent.