Small changes for removal of files