clean up some codenarc unused variables