Cleanup from my test

Collisions can be ugly