get rid of unnecessary tokens class