cleanup and configurable config file name