Readded jshint, remove obsolete code