Remove Tariff indexer

Refactor reindexing code