[ticket/12890] Code cleanup

PHPBB3-12890