we should still try to remove all the data files even if this fails. that way we still get to as clean a state as possible.