Removed debug + indexer refactor start.