Removing JQuery
merge conflict resolution. untested but probably okay.