Better collision detection and drop removal