clean up configuration and accomodate credentials.json file