More refactoring: removing OAuth2MessageHelper layer