diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java
index cfa24ea..f4ced6f 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/er/relation/RelationManagement.java
@@ -476,27 +476,27 @@ public abstract class RelationManagement<R extends Relation> extends
 		element.remove();
 
 		switch (removeConstraint) {
-		case cascade:
-			deleteTargetVertex(target);
-			break;
-
-		case cascadeWhenOrphan:
-			Iterable<Edge> iterable = target.getEdges(Direction.IN);
-			Iterator<Edge> iterator = iterable.iterator();
-			if (iterator.hasNext()) {
-				logger.trace(
-						"{} point to {} which is not orphan. Giving {} directive, it will be keep.",
-						element, target, removeConstraint);
-			} else {
+			case cascade:
 				deleteTargetVertex(target);
-			}
-			break;
-
-		case keep:
-			break;
-
-		default:
-			break;
+				break;
+	
+			case cascadeWhenOrphan:
+				Iterable<Edge> iterable = target.getEdges(Direction.IN);
+				Iterator<Edge> iterator = iterable.iterator();
+				if (iterator.hasNext()) {
+					logger.trace(
+							"{} point to {} which is not orphan. Giving {} directive, it will be keep.",
+							element, target, removeConstraint);
+				} else {
+					deleteTargetVertex(target);
+				}
+				break;
+	
+			case keep:
+				break;
+	
+			default:
+				break;
 		}
 
 		return true;
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java
index e949835..a01df24 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/utils/HeaderOrient.java
@@ -13,7 +13,6 @@ import com.orientechnologies.orient.core.record.impl.ODocument;
 /**
  * @author Luca Frosini (ISTI - CNR)
  */
-@SuppressWarnings("unchecked")
 public class HeaderOrient extends ODocument implements org.gcube.informationsystem.model.embedded.Header {
 
 	public HeaderOrient(){
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java
index 04f33c1..ef35d9a 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java
@@ -348,7 +348,8 @@ public class ERManagementTest extends ScopedTest {
 		facetManagement.setUUID(sharedFacetUUID);
 		
 		try {
-			facetManagement.read();
+			String read = facetManagement.read();
+			logger.debug("Read facet is : {}", read);
 			throw new Exception(String.format("Shared Facet %s was not deleted", shared));
 		}catch(FacetNotFoundException e){
 			logger.debug("Shared Facet was not foud as expected");