diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
index 87b94cb..abc0da8 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/ElementManagement.java
@@ -66,8 +66,6 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 	
 	protected Logger logger = LoggerFactory.getLogger(this.getClass());
 	
-	// private static Logger staticLogger = LoggerFactory.getLogger(ElementManagement.class);
-	
 	public final static String DELETED = "deleted"; 
 	
 	public final static String AT = "@";
@@ -120,9 +118,6 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 		this.reload = false;
 		
 		this.entryPoint = false;
-		
-		// this.superClassesToBeExcluded = new HashSet<>();
-		
 	}
 	
 	public void cleanCachedSerialization() {
@@ -335,7 +330,6 @@ public abstract class ElementManagement<El extends OElement, T extends Type> {
 			
 			objectNode.put(Element.CLASS_PROPERTY, getTypeName());
 			
-			//Collection<String> superClasses = getSuperclasses();
 			Collection<String> superClasses = getCachedType().getSuperTypes();
 			ArrayNode arrayNode = objectMapper.valueToTree(superClasses);
 			
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java
index 09b606a..c311987 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/base/properties/PropertyElementManagement.java
@@ -94,18 +94,8 @@ public class PropertyElementManagement {
 					
 					// Decrypting with Context Key (default key)
 					String decryptedValue = EncryptedImpl.decrypt(contextEncryptedValue); 
-					
 					encrypted.setDecryptedValue(decryptedValue, false);
 					
-					/*
-					// Encrypting with DB Key
-					Key databaseKey = DatabaseEnvironment.getDatabaseKey();
-					String dbEncryptedValue = EncryptedImpl.encrypt(decryptedValue, databaseKey);
-					
-					// Setting the value encrypted with DB key
-					encrypted.setEncryptedValue(dbEncryptedValue);
-					*/
-					
 				} catch(Exception e) {
 					throw new ResourceRegistryException("Unable to manage "+Encrypted.NAME+" "+org.gcube.informationsystem.model.reference.properties.Property.NAME);
 				}
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
index 758bd03..8873e77 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/entities/EntityManagement.java
@@ -150,11 +150,6 @@ public abstract class EntityManagement<E extends Entity, ET extends EntityType>
 		
 		this.relationManagements = new HashMap<>();
 		
-		/*
-		this.superClassesToBeExcluded.add(AccessType.ENTITY_ELEMENT.getName());
-		this.superClassesToBeExcluded.add(AccessType.ENTITY.getName());
-		*/
-		
 		/*
 		 * By the default the system execute the the operation of
 		 * context sharing so this variable is initialised as false.
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
index 158652b..e305829 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/instances/model/relations/RelationManagement.java
@@ -136,11 +136,6 @@ public abstract class RelationManagement<T extends EntityManagement<? extends En
 		super(accessType, Resource.class, targetEntityClass);
 		this.defaultPropagationConstraint = defaultPropagationConstraint;
 		
-		/*
-		this.superClassesToBeExcluded.add(AccessType.RELATION_ELEMENT.getName());
-		this.superClassesToBeExcluded.add(AccessType.RELATION.getName());
-		*/
-		
 		/*
 		 * By the default the system execute the the operation of
 		 * context sharing so this variable is initialised as false.