Remove unnecessary tokens