Collision is fixed for now. Clean-up occurs later.