Cleaned collision detection