diff --git a/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java b/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
index 38b599d..84a439d 100644
--- a/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
+++ b/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
@@ -31,10 +31,7 @@
 
     /**
      * Annotation key for instance name.
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String NAME = "name";
 
     /**
@@ -47,18 +44,12 @@
 
     /**
      * Annotation key for latitude (e.g. latitude of device).
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String LATITUDE = "latitude";
 
     /**
      * Annotation key for longitute (e.g. longitude of device).
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String LONGITUDE = "longitude";
 
     /**
@@ -68,10 +59,7 @@
 
     /**
      * Annotation key for the device driver name.
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String DRIVER = "driver";
 
     /**
@@ -87,19 +75,13 @@
 
     /**
      * Annotation key for latency.
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String LATENCY = "latency";
 
     /**
      * Annotation key for bandwidth.
      * The value for this key is interpreted as Mbps.
-     *
-     * @deprecated since Cardinal
      */
-    @Deprecated
     public static final String BANDWIDTH = "bandwidth";
 
     /**