Removed token check for now