removed token check (not needed anymore)