Removed unused vars to address jshint issues