fixing solr config. code cleanup.