removed token and commented methods