maintenance: clean up #2061#2173

profnandaa merged 4 commits intomcfix/combined-prsvalidatorjs/validator.js:mcfix/combined-prsfrom

clean-up-2061validatorjs/validator.js:clean-up-2061Copy head branch name to clipboard