Clean up some collision detection.