CLN: cleanup indexing code for field indexer