fixed cppcheck errors (old values not used)