Remove out-of-band registration for OAuth
refactoring: better names for methods
Use the right string for substitution