Addition of config_file_to_be_deleted, fixes #119 and #143
Refactoring, fixes #146 and adds to the fix for #119 and #143