consolidate would_drop function
3 files changed