Cleanup unused collision code.

I'm sure lots of this code will make a return, but I don't want to
borrow from old, messy code. It's still best to redo it now that I have
a better handle on how this works.