diff --git a/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java b/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
index 4868ea0..f745565 100644
--- a/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
+++ b/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
@@ -60,15 +60,6 @@
     void removeDevice(DeviceId deviceId);
 
     /**
-     * Add a device with a specific DeviceId.
-     * @param deviceId deviceId of the device
-     * @param device   device to add to this controller
-     * @deprecated 1.10.0 moved to single parameter method with boolean return
-     */
-    @Deprecated
-    void addDevice(DeviceId deviceId, SnmpDevice device);
-
-    /**
      * Add a snmp device.
      *
      * @param device device to add to this controller
diff --git a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
index c02218e..6cc18af 100644
--- a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
+++ b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
@@ -128,12 +128,6 @@
     }
 
     @Override
-    @Deprecated // in 1.14.0
-    public void addDevice(DeviceId did, SnmpDevice device) {
-        snmpDeviceMap.put(did, device);
-    }
-
-    @Override
     public void addDevice(SnmpDevice device) {
         log.info("Adding device {}", device.deviceId());
         snmpDeviceMap.put(device.deviceId(), device);
diff --git a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
index e5a630a..27cd34f 100644
--- a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
+++ b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
@@ -70,7 +70,7 @@
 
     @Test
     public void addDevice() {
-        snmpController.addDevice(device.deviceId(), device);
+        snmpController.addDevice(device);
         assertEquals("Controller should contain device", device, snmpController.getDevice(device.deviceId()));
     }
 
diff --git a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
index c81ba59..66ee7c5 100644
--- a/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
+++ b/providers/snmp/device/src/main/java/org/onosproject/provider/snmp/device/impl/SnmpDeviceProvider.java
@@ -275,7 +275,7 @@
 
                 log.debug("Persisting Device " + did.uri().toString());
 
-                controller.addDevice(did, device);
+                controller.addDevice(device);
                 providerService.deviceConnected(did, desc);
                 log.info("Added device to ONOS core. Device Info: "
                                  + device.deviceInfo() + " " + did.uri().toString());
diff --git a/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java b/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
index a3534ec..aab7818 100644
--- a/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
+++ b/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
@@ -55,11 +55,6 @@
     }
 
     @Override
-    public void addDevice(DeviceId deviceId, SnmpDevice snmpDevice) {
-        devices.put(deviceId, snmpDevice);
-    }
-
-    @Override
     public void addDevice(SnmpDevice device) {
         devices.put(device.deviceId(), device);
     }
