Removed deprecated methods on tokenspan.
Removed most of the deprecation warnings.