Cleanup

Cleanup before re-implementing 2D collision detection.