clean up jshint errors
removed unused variables
more clean up on jshint errors