Make part_removal_cleanup a bit more robust.