Remove keyring and change to basic cfg file handling