World: Cleanup
World|Client: Cleanup