[ticket/12408] Code cleanup

PHPBB3-12408