Trying to rework removal code

But I must sleep. Weirdness reigns.