Removing useless variables and adding tokenController