Remove dependency to PCMIndexer