SOS-2442 SF Remove commented code
LPS-49586 refactor to use document factory for creating solr docs
LPS-49586 Sort
LPS-49586 SF