Fix some jshint "defined but never used" issues