Removed dependance to solr for now