Removed SOLR and added Spark