Remove unnecessary vars due to jshint warnings