Removed some collision detection cruft