remove additional refs to jquery, fix jquery conflicts