consolodated dropping algorithms, removed redundant code