Remove remaining pieces of Solr