Fix/Reimplement removeDrops