Kill some space leaks in the new server, cleanup.