diff --git a/TODO.md b/TODO.md
index bcf4e2ea0d..c61dc80a6b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,14 +2,9 @@
 
 # Urgent
 
-* Check whether reset is not async
-
 * Add the subnet checks / keep checksum offloading for the plugin
 * Test with the plugin
 
-* Simplify / get rid of some tests
-* Document ipam/tracker/awsvpc.go
-
 * Test with multiple addr from the default subnet
 
 * Create new SSH keys or reuse the same for each test run
diff --git a/plugin/net/cni.go b/plugin/net/cni.go
index eddd7dc700..7ca2b9beab 100644
--- a/plugin/net/cni.go
+++ b/plugin/net/cni.go
@@ -58,6 +58,7 @@ func (c *CNIPlugin) CmdAdd(args *skel.CmdArgs) error {
 	if conf.IPAM.Type == "" {
 		result, err = ipamplugin.NewIpam(c.weave).Allocate(args)
 	} else {
+		// TODO(mp) check isAWSVPC !
 		result, err = ipam.ExecAdd(conf.IPAM.Type, args.StdinData)
 	}
 	if err != nil {
diff --git a/plugin/net/driver.go b/plugin/net/driver.go
index 52102cc763..642b002232 100644
--- a/plugin/net/driver.go
+++ b/plugin/net/driver.go
@@ -63,6 +63,7 @@ func (driver *driver) GetCapabilities() (*api.GetCapabilityResponse, error) {
 }
 
 func (driver *driver) CreateNetwork(create *api.CreateNetworkRequest) error {
+	// TODO(mp) shall we / how can we check that the network is using weave's IPAM?
 	// TODO(mp) DRY
 	// In a case of an error, we skip applying necessary steps for AWSVPC, because
 	// "attach" should work without the weave router running.
@@ -83,7 +84,6 @@ func (driver *driver) CreateNetwork(create *api.CreateNetworkRequest) error {
 		}
 	}
 
-	// TODO(mp) create contains IPAM, check that is belongs to the same subnet
 	driver.logReq("CreateNetwork", create, create.NetworkID)
 	_, err := driver.setupNetworkInfo(create.NetworkID, stringOptions(create))
 	return err