working on cleaning up authn service