World|Sky: Cleanup