Asteroids and General Cleanups - Merge