Remove context from Indexer