added solr indexer and cleanup