Remove unused variable to address compiler warning
Remove unneeded extra declarations causing problems with clang.
Merge branch 'u/jbosch/clangfix'