removing extra models and schema types, working on getting the store_matches