Remove DataIndexer class