added option to disable cleaning of filenames