More JQuery cleanup