Cleaned up unnecessary tokens