Cleanup the collide resolution code