Get removal closer to actually working