[cleanup] some more cleanup as suggested by cppcheck