remove fallback in oauth2 provider & more tweaks . . .