Clean up several jshint conflicts and errors