diff --git a/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java b/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
index 23e6c02..038e96a 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
@@ -48,50 +48,6 @@
      * Creates a connectivity intent that matches on the specified selector
      * and applies the specified treatment.
      * <p>
-     * Path will be chosen without any constraints.
-     * </p>
-     *
-     * @param appId     application identifier
-     * @param resources required network resources (optional)
-     * @param selector  traffic selector
-     * @param treatment treatment
-     * @throws NullPointerException if the selector or treatment is null
-     */
-    protected ConnectivityIntent(ApplicationId appId,
-                                 Collection<NetworkResource> resources,
-                                 TrafficSelector selector,
-                                 TrafficTreatment treatment) {
-        this(appId, null, resources, selector, treatment, Collections.emptyList(),
-                DEFAULT_INTENT_PRIORITY);
-    }
-
-    /**
-     * Creates a connectivity intent that matches on the specified selector
-     * and applies the specified treatment.
-     * <p>
-     * Path will be chosen without any constraints.
-     * </p>
-     *
-     * @param appId     application identifier
-     * @param key       intent key
-     * @param resources required network resources (optional)
-     * @param selector  traffic selector
-     * @param treatment treatment
-     * @throws NullPointerException if the selector or treatment is null
-     */
-    protected ConnectivityIntent(ApplicationId appId,
-                                 Key key,
-                                 Collection<NetworkResource> resources,
-                                 TrafficSelector selector,
-                                 TrafficTreatment treatment) {
-        this(appId, key, resources, selector, treatment, Collections.emptyList(),
-                DEFAULT_INTENT_PRIORITY);
-    }
-
-    /**
-     * Creates a connectivity intent that matches on the specified selector
-     * and applies the specified treatment.
-     * <p>
      * Path will be optimized based on the first constraint if one is given.
      * </p>
      *
@@ -104,7 +60,6 @@
      * @param priority    priority to use for flows generated by this intent
      * @throws NullPointerException if the selector or treatment is null
      */
-
     protected ConnectivityIntent(ApplicationId appId,
                                  Key key,
                                  Collection<NetworkResource> resources,
