Significantly simplify models. Update ElasticSearch mappings to match.