Removing extratoken code