jQuery removal & minor reworks