Change removetoken refs to removenode