Got rid of unnecessary tokens