World|Surface: Cleanup