[feature/oauth] Clean up unneeded complexity

PHPBB3-11673