In progress - removal of jquery dependencies