clean up scan-build detected unused variables