Sector|World|Client: Cleanup