removed some unused tokens