cleanup duplication between entity, location, policy and enricher