Fix the remove process - refs BT#9041