Refactoring storing-indexing-doc. Remove html