diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java
index 4eac49d5fd..8a25d72532 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeConstraintCodecHelper.java
@@ -195,10 +195,6 @@ public final class DecodeConstraintCodecHelper {
             return decodeWaypointConstraint();
         } else if (type.equals(AsymmetricPathConstraint.class.getSimpleName())) {
             return decodeAsymmetricPathConstraint();
-        } else if (type.equals(LinkTypeConstraint.class.getSimpleName())) {
-            return decodeLinkTypeConstraint();
-        } else if (type.equals(AnnotationConstraint.class.getSimpleName())) {
-            return decodeAnnotationConstraint();
         }
         throw new IllegalArgumentException("Instruction type "
                 + type + " is not supported");