Cleaned up includes, and removed hard coded solr field.