diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index c2c14f2..95c0cf4 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -395,7 +395,7 @@
     // Create models of the data to return, that overlays can adjust / augment
 
     // Returns property panel model for summary response.
-    protected PropertyPanel summmaryMessage(long sid) {
+    protected PropertyPanel summmaryMessage() {
         Topology topology = topologyService.currentTopology();
 
         return new PropertyPanel("ONOS Summary", "node")
@@ -412,7 +412,7 @@
     }
 
     // Returns property panel model for device details response.
-    protected PropertyPanel deviceDetails(DeviceId deviceId, long sid) {
+    protected PropertyPanel deviceDetails(DeviceId deviceId) {
         Device device = deviceService.getDevice(deviceId);
         Annotations annot = device.annotations();
         String name = annot.value(AnnotationKeys.NAME);
@@ -525,7 +525,7 @@
     }
 
     // Returns host details response.
-    protected PropertyPanel hostDetails(HostId hostId, long sid) {
+    protected PropertyPanel hostDetails(HostId hostId) {
         Host host = hostService.getHost(hostId);
         Annotations annot = host.annotations();
         String type = annot.value(AnnotationKeys.TYPE);
