[ticket/12649] Cleanup code after recent merges

PHPBB3-12649