World|Client: Cleanup