Refactor block drop clear