Cleaning up filenames and unused files