Removes mock datastreams;  adds missing properties to model specifying TODOs for missing solr mappings;  minor refactorings/reformattings to enhance readability