Removed a lot of token pair parameter with the use of the alt cache.