BUG: did not remove names properly with drops