Merge pull request #1067 from JoesCat/master

comment-out some variables to reduce number of warnings about unused variables