Bugs in the removal code and since various previous updates.