Better handling of file deletions