Cleanup cppcheck