Cleaned up DropEvent, now removing an item also return said item