Improvement of cleaning up the files