Cleaning up server madness