And some clean up in other files. closes https://github.com/official-stockfish/Stockfish/pull/4269 No functional change