diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java b/dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java
index c9d15ff76..6a986e145 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java
@@ -10,22 +10,8 @@ public class Constants {
 	public static final Map<String, String> accessRightsCoarMap = Maps.newHashMap();
 	public static final Map<String, String> coarCodeLabelMap = Maps.newHashMap();
 
-	public static final String INFERRED = "Inferred by OpenAIRE";
-
-	public static final String HARVESTED = "Harvested";
-	public static final String DEFAULT_TRUST = "0.9";
-	public static final String USER_CLAIM = "Linked by user";;
-
 	public static String COAR_ACCESS_RIGHT_SCHEMA = "http://vocabularies.coar-repositories.org/documentation/access_rights/";
 
-	public static String ZENODO_COMMUNITY_PREFIX = "https://zenodo.org/communities/";
-
-	public static String RESEARCH_COMMUNITY = "Research Community";
-
-	public static String RESEARCH_INFRASTRUCTURE = "Research Infrastructure/Initiative";
-
-	public static String ORCID = "orcid";
-
 	static {
 		accessRightsCoarMap.put("OPEN", "c_abf2");
 		accessRightsCoarMap.put("RESTRICTED", "c_16ec");
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java b/dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java
index 5e37f15db..3956410d5 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java
@@ -383,7 +383,7 @@ public class GraphResultMapper implements Serializable {
 
     private static Pid getOrcid(List<StructuredProperty> p) {
         for (StructuredProperty pid : p) {
-            if (pid.getQualifier().getClassid().equals(Constants.ORCID)) {
+            if (pid.getQualifier().getClassid().equals(ModelConstants.ORCID)) {
                 Optional<DataInfo> di = Optional.ofNullable(pid.getDataInfo());
                 if (di.isPresent()) {
                     return Pid