removed token check