> Yes that looks like a great cleanup. I guess we could even get rid of the getIndexManagerFactory() 

That was my idea.