Adding more robust file list repopulation after adding/deleting/renaming
Removing commented out code