diff --git a/apps/election/src/main/java/org/onosproject/election/ElectionTest.java b/apps/election/src/main/java/org/onosproject/election/ElectionTest.java
index 3e47cc1..7631759 100644
--- a/apps/election/src/main/java/org/onosproject/election/ElectionTest.java
+++ b/apps/election/src/main/java/org/onosproject/election/ElectionTest.java
@@ -58,7 +58,6 @@
 
     private ControllerNode localControllerNode;
 
-    // TODO write cli command to get leader
 
     @Activate
     protected void activate() {
diff --git a/apps/foo/src/main/java/org/onosproject/foo/FooComponent.java b/apps/foo/src/main/java/org/onosproject/foo/FooComponent.java
index 766c1a2..649d080 100644
--- a/apps/foo/src/main/java/org/onosproject/foo/FooComponent.java
+++ b/apps/foo/src/main/java/org/onosproject/foo/FooComponent.java
@@ -174,7 +174,6 @@
             //try {
                 //Thread.sleep(5000);
             //} catch (InterruptedException e) {
-                // TODO Auto-generated catch block
                 //e.printStackTrace();
             //}
             log.info("Acquired Lock");
diff --git a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
index 63f22ff..ef43602 100644
--- a/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
+++ b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
@@ -129,10 +129,6 @@
     @Override
     public void event(IntentEvent event) {
         synchronized (lastEvents) {
-            //
-            // TODO: The processing below is incomplete: we don't have
-            // an event equivalent of "Withdraw Requested"
-            //
             switch (event.type()) {
             case INSTALL_REQ:
                 intentSubmittedEventMetric.eventReceived();
@@ -141,7 +137,7 @@
                 intentInstalledEventMetric.eventReceived();
                 break;
             case FAILED:
-                // TODO: Just ignore?
+                // ignore
                 break;
             case WITHDRAW_REQ:
                 intentWithdrawRequestedEventMetric.eventReceived();
diff --git a/apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java b/apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
index 0aec81f..a28afdf 100644
--- a/apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
+++ b/apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
@@ -129,7 +129,7 @@
                     }
                 }
             }
-            //TODO: handle ip cleanup
+
             return flowRules;
         }
 
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
index 416159c..f23b5f2 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
@@ -364,7 +364,6 @@
 
     @Override
     public void roleChanged(DeviceId device, MastershipRole newRole) {
-        // TODO Auto-generated method stub.
     }
 
     @Override
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java
index a003a0e..b3d0dae 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java
@@ -36,7 +36,6 @@
     }
 
     public PktOptLink() {
-        // TODO Auto-generated constructor stub
     }
 
     public void setSrcNodeName(String name) {
diff --git a/apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java
index dc7654b..d3e7ba0 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java
@@ -37,7 +37,6 @@
     }
 
     public WdmLink() {
-        // TODO Auto-generated constructor stub
     }
 
     public void setSrcNodeName(String name) {
diff --git a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
index cb2b365..71704ad 100644
--- a/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
@@ -49,13 +49,11 @@
     protected void execute() {
         MetricsService metricsService = get(MetricsService.class);
 
-        // TODO support filter condition
         MetricFilter filter = MetricFilter.ALL;
 
         TreeMultimap<String, Metric> matched = listMetrics(metricsService, filter);
         matched.asMap().forEach((name, metrics) -> {
             for (Metric metric : metrics) {
-                // TODO JSON version
                 printMetric(name, metric);
             }
         });
diff --git a/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java b/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
index 9b89802..81440d0 100644
--- a/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
@@ -17,11 +17,11 @@
 
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
+import org.onlab.packet.IpAddress;
 import org.onosproject.cluster.ControllerNode;
 import org.onosproject.cluster.DefaultControllerNode;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.service.DatabaseAdminService;
-import org.onlab.packet.IpAddress;
 
 /**
  * Adds a new controller cluster node.
@@ -34,7 +34,6 @@
               required = true, multiValued = false)
     String nodeId = null;
 
-    // TODO context aware completer to get IP from ClusterService?
     @Argument(index = 1, name = "ip", description = "Node IP address",
               required = true, multiValued = false)
     String ip = null;
diff --git a/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
index 5754438..0160e3c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
@@ -30,7 +30,6 @@
          description = "Lists summary of the current topology")
 public class TopologyCommand extends AbstractShellCommand {
 
-    // TODO: format the time-stamp
     private static final String FMT =
             "time=%s, devices=%d, links=%d, clusters=%d, paths=%d";
 
diff --git a/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java b/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
index 755c92b..734d9b5 100644
--- a/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
+++ b/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
@@ -51,7 +51,6 @@
     @Override
     @SuppressWarnings("unchecked")
     public <E extends Event> EventSink<E> getSink(Class<E> eventClass) {
-        // TODO: add implicit registration of descendant classes
         return (EventSink<E>) sinks.get(eventClass);
     }
 
diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index 1aa86c7..17647ac 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -296,7 +296,6 @@
         @Override
         public void event(ClusterEvent event) {
             switch (event.type()) {
-                //FIXME: worry about addition when the time comes
                 case INSTANCE_ADDED:
                 case INSTANCE_ACTIVATED:
                     clusterSize.incrementAndGet();
@@ -341,14 +340,9 @@
             if (clusterService.getNodes().size() > (clusterSize.intValue() / 2)) {
                 return true;
             }
-//            else {
-                //FIXME: break tie for equal-sized clusters, by number of
-                //       connected switches, then masters, then nodeId hash
-                //       problem is, how do we get at channel info cleanly here?
-                //       Also, what's the time hit for a distributed store look-up
-                //       versus channel re-negotiation? bet on the latter being worse.
 
-//            }
+             //FIXME: break tie for equal-sized clusters,
+
             return false;
         }
 
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 7879062..9805082 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -81,7 +81,6 @@
 
     @Override
     public IdGenerator getIdGenerator(String topic) {
-        // FIXME this should be created lazily (once per topic)
         IdBlockAllocator allocator = new StoreBasedIdBlockAllocator(topic, idBlockStore);
         return new BlockAllocatorBasedIdGenerator(allocator);
     }
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
-
     }
 }
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
index d2631a0..75f2726 100644
--- a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
+++ b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
@@ -137,7 +137,6 @@
         }
     }
 
-    //Todo
     public void processOFPortStatus(OFCircuitPortStatus ps) {
         log.debug("LINC-OE ..OF Port Status :", ps);
 
diff --git a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
index 0046a02..276395a 100644
--- a/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
+++ b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
@@ -672,9 +672,7 @@
             subnetIps.add("10.0.3.0");
             subnetIps.add("10.0.1.0");
         }
-        // TODO needed?
-        //if (getId() == 0x2) {
-        //}
+
         if (getId() == 0x3) {
             subnetIps.add("7.7.7.0");
         }
@@ -740,9 +738,6 @@
             hostNextHopIps.add(new RouteEntry("10.0.2.1", 4, "00:00:00:00:02:01"));
             hostNextHopIps.add(new RouteEntry("10.0.3.1", 5, "00:00:00:00:03:01"));
         }
-        // TODO needed?
-        //if (getId() == 0x2) {
-        //}
         if (getId() == 0x3) {
             hostNextHopIps.add(new RouteEntry("7.7.7.7", 1, "00:00:07:07:07:07"));
         }
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
index 044dbc8..ba56d73 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
@@ -152,7 +152,7 @@
             }
             synchronized (discoverers) {
                 if (!discoverers.containsKey(deviceId)) {
-                    // TODO: ideally, should never reach here
+                    // ideally, should never reach here
                     log.debug("Device mastership changed ({}) {}",
                             event.type(), deviceId);
                     discoverers.put(deviceId, new LinkDiscovery(device,
@@ -220,7 +220,7 @@
                     ConnectPoint point = new ConnectPoint(deviceId,
                                                           port.number());
                     providerService.linksVanished(point);
-                    // TODO: Don't we need to removePort from ld?
+
                     break;
                 case DEVICE_REMOVED:
                 case DEVICE_SUSPENDED:
diff --git a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
index df90b72..875ef6a 100644
--- a/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
+++ b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
@@ -344,7 +344,6 @@
     }
 
     private void sendProbes(Long portNumber) {
-        // TODO: should have suppression port configuration, not by type
         if (device.type() != Device.Type.ROADM) {
             log.trace("Sending probes out to {}@{}", portNumber, device.id());
             OutboundPacket pkt = this.createOutBoundLLDP(portNumber);
diff --git a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
index 938ecdf..b37ee00 100644
--- a/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
+++ b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
@@ -271,8 +271,6 @@
 
         @Override
         public void linkVanished(LinkDescription linkDescription) {
-            // TODO Auto-generated method stub
-
         }
 
         @Override
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 99a9650..1841a50 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -137,18 +137,6 @@
             providerService.deviceDisconnected(deviceId);
         } else {
             LOG.trace("Confirmed device {} connection", deviceId);
-            // FIXME require something like below to match javadoc description
-            // but this starts infinite loop with current DeviceManager
-//            final ChassisId cId = new ChassisId(dpid.value());
-//            final Type deviceType = device.type();
-//            DeviceDescription description =
-//                    new DefaultDeviceDescription(deviceId.uri(), deviceType,
-//                                                 sw.manfacturerDescription(),
-//                                                 sw.hardwareDescription(),
-//                                                 sw.softwareDescription(),
-//                                                 sw.serialNumber(),
-//                                                 cId);
-//            providerService.deviceConnected(deviceId, description);
         }
 
         // Prompt an update of port information. We can use any XID for this.
@@ -165,16 +153,6 @@
         }
     }
 
-    // Checks if the OF channel is connected.
-    //private boolean checkChannel(Device device, OpenFlowSwitch sw) {
-    // FIXME if possible, we might want this to be part of
-    // OpenFlowSwitch interface so the driver interface isn't misused.
-    //    if (sw == null || !((OpenFlowSwitchDriver) sw).isConnected()) {
-    //      return false;
-    //      }
-    //    return true;
-    // }
-
     @Override
     public void roleChanged(DeviceId deviceId, MastershipRole newRole) {
         switch (newRole) {
diff --git a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
index 8fb5b79..ec27084 100644
--- a/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
+++ b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
@@ -114,7 +114,7 @@
 
     @Test
     public void triggerProbe() {
-        // TODO
+
     }
 
     @Test
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
index b67abf3..e2b3478 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
@@ -186,7 +186,6 @@
                 }
                 break;
             case SET_FIELD:
-                // TODO handle 1.3 set field actions correctly
                 break;
             case SET_TP_DST:
             case SET_TP_SRC:
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
index 587fde0..4df3e83 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
@@ -78,7 +78,7 @@
 
         long cookie = flowRule().id().value();
 
-        //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
         OFFlowAdd fm = factory().buildFlowAdd()
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
@@ -99,7 +99,7 @@
 
         long cookie = flowRule().id().value();
 
-        //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
         OFFlowMod fm = factory().buildFlowModify()
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index c50e6a0..9a90388 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -93,7 +93,7 @@
 
         long cookie = flowRule().id().value();
 
-        //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
         OFFlowAdd fm = factory().buildFlowAdd()
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
@@ -117,7 +117,7 @@
 
         long cookie = flowRule().id().value();
 
-        //TODO: what to do without bufferid? do we assume that there will be a pktout as well?
+
         OFFlowMod fm = factory().buildFlowModify()
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
@@ -145,8 +145,6 @@
                 .setXid(xid)
                 .setCookie(U64.of(cookie))
                 .setBufferId(OFBufferId.NO_BUFFER)
-                //.setActions(actions) //FIXME do we want to send actions in flowdel?
-                //.setInstructions(Collections.singletonList(writeActions))
                 .setMatch(match)
                 .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM))
                 .setPriority(flowRule().priority())
diff --git a/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
index 047fb3f..4dfcf17 100644
--- a/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
+++ b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
@@ -142,7 +142,6 @@
 
             }
 
-            // TODO: Use DHCP packets as well later...
         }
 
     }
diff --git a/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java b/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
index 94abe80..f947e60 100644
--- a/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
+++ b/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
@@ -258,8 +258,6 @@
 
         @Override
         public void linkVanished(LinkDescription linkDescription) {
-            // TODO Auto-generated method stub
-
         }
 
         @Override
diff --git a/utils/misc/src/main/java/org/onlab/graph/MutableAdjacencyListsGraph.java b/utils/misc/src/main/java/org/onlab/graph/MutableAdjacencyListsGraph.java
index 044a60d..336c1d6 100644
--- a/utils/misc/src/main/java/org/onlab/graph/MutableAdjacencyListsGraph.java
+++ b/utils/misc/src/main/java/org/onlab/graph/MutableAdjacencyListsGraph.java
@@ -111,7 +111,6 @@
 
     @Override
     public void removeVertex(V vertex) {
-        // TODO Auto-generated method stub
         if (vertexes != null && edges != null) {
             if (vertexes.contains(vertex)) {
                 vertexes.remove(vertex);
@@ -149,7 +148,6 @@
 
     @Override
     public Graph<V, E> toImmutable() {
-        // TODO Auto-generated method stub
         return null;
     }
 
diff --git a/utils/misc/src/main/java/org/onlab/packet/BasePacket.java b/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
index 46e3c7e..4aece66 100644
--- a/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
+++ b/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
@@ -118,9 +118,7 @@
         } catch (final Exception e) {
             throw new RuntimeException("Could not clone packet");
         }
-        // TODO: we are using serialize()/deserialize() to perform the
-        // cloning. Not the most efficient way but simple. We can revisit
-        // if we hit performance problems.
+
         final byte[] data = this.serialize();
         pkt.deserialize(this.serialize(), 0, data.length);
         pkt.setParent(this.parent);
diff --git a/utils/misc/src/main/java/org/onlab/packet/ChassisId.java b/utils/misc/src/main/java/org/onlab/packet/ChassisId.java
index 85a3746..0d9f955 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ChassisId.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ChassisId.java
@@ -19,7 +19,6 @@
  * The class representing a network device chassisId.
  * This class is immutable.
  */
-// TODO: Move this to a reasonable place.
 public final class ChassisId {
 
     private static final long UNKNOWN = 0;
diff --git a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
index 10850b0..cd3a92f 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IpAddress.java
@@ -262,7 +262,6 @@
      */
     public static IpAddress makeMaskedAddress(final IpAddress address,
                                               int prefixLength) {
-        // TODO: The code below should go away and replaced with generics
         if (address instanceof Ip4Address) {
             Ip4Address ip4a = (Ip4Address) address;
             return Ip4Address.makeMaskedAddress(ip4a, prefixLength);
diff --git a/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java b/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
index 771300f..52fa4d6 100644
--- a/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
+++ b/utils/netty/src/main/java/org/onlab/netty/NettyMessagingService.java
@@ -86,7 +86,6 @@
 
     private void initEventLoopGroup() {
         // try Epoll first and if that does work, use nio.
-        // TODO: make this configurable.
         try {
             clientGroup = new EpollEventLoopGroup();
             serverGroup = new EpollEventLoopGroup();
@@ -107,11 +106,9 @@
     }
 
     public NettyMessagingService() {
-        // TODO: Default port should be configurable.
         this(8080);
     }
 
-    // FIXME: Constructor should not throw exceptions.
     public NettyMessagingService(int port) {
         try {
             localEp = new Endpoint(java.net.InetAddress.getLocalHost().getHostName(), port);
@@ -193,7 +190,6 @@
 
     @Override
     public void registerHandler(String type, MessageHandler handler) {
-        // TODO: Is this the right semantics for handler registration?
         handlers.putIfAbsent(type, handler);
     }
 
@@ -210,7 +206,6 @@
         ServerBootstrap b = new ServerBootstrap();
         b.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024);
         b.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 8 * 1024);
-        // TODO: Need JVM options to configure PooledByteBufAllocator.
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         b.group(serverGroup, clientGroup)
             .channel(serverChannelClass)
diff --git a/utils/thirdparty/src/main/java/org/onlab/thirdparty/OnlabThirdparty.java b/utils/thirdparty/src/main/java/org/onlab/thirdparty/OnlabThirdparty.java
index 7405558..217ee02 100644
--- a/utils/thirdparty/src/main/java/org/onlab/thirdparty/OnlabThirdparty.java
+++ b/utils/thirdparty/src/main/java/org/onlab/thirdparty/OnlabThirdparty.java
@@ -19,7 +19,7 @@
 /**
  * Empty class required to get the onlab-thirdparty module to build properly.
  *
- * TODO Figure out how to remove this.
+ * NOTE Required for shade plugin to operate.
  */
 public class OnlabThirdparty {
 
diff --git a/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java b/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
index bf2a2ef..0caf6a0 100644
--- a/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
+++ b/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
@@ -54,7 +54,6 @@
 import org.onosproject.net.link.LinkEvent;
 import org.onosproject.net.link.LinkListener;
 import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.Ethernet;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -369,7 +368,6 @@
 
         // FIXME: clearly, this is not enough
         TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4)
                 .matchEthDst(dstHost.mac()).build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();