Reintroduce automatic entity removal for legacy indexes