World|Server: Cleanup