Complete migration to OAuth and new services