Remove references to solr

Change-Id: Ia4da14632c572e3196436445c0dbe6e172a2c06e