diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
index 9f381cf..dea2731 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
@@ -26,8 +26,6 @@
  */
 public interface OpenFlowPacketContext {
 
-    //TODO: may want to support sending packet out other switches than
-    // the one it came in on.
     /**
      * Blocks further responses (ie. send() calls) on this
      * packet in event.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
index f08c411..b066298 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
@@ -275,8 +275,8 @@
                 this.transitionToEqualSwitch();
             }
         }  else {
+            log.warn("Failed to set role for {}", this.getStringId());
             return;
-            //TODO: tell people that we failed.
         }
     }
 
diff --git a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
index 580fbdc..f4fe490 100644
--- a/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
+++ b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
@@ -81,13 +81,9 @@
 
     @Override
     public void addEventListener(OpenFlowEventListener listener) {
-        // TODO Auto-generated method stub
-
     }
 
     @Override
     public void removeEventListener(OpenFlowEventListener listener) {
-        // TODO Auto-generated method stub
-
     }
 }