config file cleanup and changes to work with ansible