More cleanup, removing all the credential work, that's not necessary.