removes solr_w* and uses references instead