Merge pull request #4204 from WoltLab/code_cleanup