cleanup of reindexers to be adhered with master