Removing some unnecessary operations in the drop handler.