[NGRINDER-486] fix typo error
[NGRINDER-486]  Remove unnecessary code
[NGRINDER-718] Fix klocwork bug
[NGRINDER-486] Fix klocwork bug