Cleanup unused variables

Removed unused fields which was caught by CLANG build.