AUTHZ - OAuth2 - code clean up