diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
index 5f32a3c..bfcc588 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
@@ -149,56 +149,6 @@
     }
 
     /**
-     * @deprecated 1.6.0 Goldeneye release.
-     * Recommended to use ModMplsHeaderInstruction or ModVlanHeaderInstruction instead.
-     */
-    @Deprecated
-    public static final class PushHeaderInstructions extends
-            L2ModificationInstruction {
-
-
-        private final L2SubType subtype;
-        private final EthType ethernetType; // Ethernet type value: 16 bits
-
-        PushHeaderInstructions(L2SubType subType, EthType ethernetType) {
-            this.subtype = subType;
-            this.ethernetType = ethernetType;
-        }
-
-        public EthType ethernetType() {
-            return ethernetType;
-        }
-
-        @Override
-        public L2SubType subtype() {
-            return this.subtype;
-        }
-
-        @Override
-        public String toString() {
-            return subtype().toString() + SEPARATOR + ethernetType;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(type(), subtype, ethernetType);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj instanceof PushHeaderInstructions) {
-                PushHeaderInstructions that = (PushHeaderInstructions) obj;
-                return  Objects.equals(subtype, that.subtype) &&
-                        Objects.equals(this.ethernetType, that.ethernetType);
-            }
-            return false;
-        }
-    }
-
-    /**
      * Represents a MPLS header modification instruction.
      */
     public static final class ModMplsHeaderInstruction extends L2ModificationInstruction {
@@ -332,47 +282,6 @@
     }
 
     /**
-     * Represents a VLAN POP modification instruction.
-     * @deprecated 1.6.0 Goldeneye release.
-     * Recommended to use ModVlanHeaderInstruction instead.
-     */
-    @Deprecated
-    public static final class PopVlanInstruction extends L2ModificationInstruction {
-        private final L2SubType subtype;
-
-        PopVlanInstruction(L2SubType subType) {
-            this.subtype = subType;
-        }
-
-        @Override
-        public L2SubType subtype() {
-            return subtype;
-        }
-
-        @Override
-        public String toString() {
-            return subtype().toString();
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(type(), subtype);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj instanceof PopVlanInstruction) {
-                PopVlanInstruction that = (PopVlanInstruction) obj;
-                return  Objects.equals(subtype, that.subtype);
-            }
-            return false;
-        }
-    }
-
-    /**
      * Represents a VLAN Header modification instruction.
      */
     public static final class ModVlanHeaderInstruction extends L2ModificationInstruction {
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index ced6954..e9a9f22 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -410,8 +410,6 @@
                     L2ModificationInstruction.class,
                     L2ModificationInstruction.L2SubType.class,
                     L2ModificationInstruction.ModEtherInstruction.class,
-                    L2ModificationInstruction.PushHeaderInstructions.class,
-                    L2ModificationInstruction.PopVlanInstruction.class,
                     L2ModificationInstruction.ModMplsHeaderInstruction.class,
                     L2ModificationInstruction.ModVlanIdInstruction.class,
                     L2ModificationInstruction.ModVlanPcpInstruction.class,