Simplify handling of the removal of single files