Revert "cppcheck: some cleanings"

This reverts commit 647a326023d9deb88810013c2e141dbaf9d5ff1b.