Update indexer to use settings, remove unsed imports