diff --git a/etcdserver/cluster.go b/etcdserver/cluster.go
index 6e78bb3e8..d3cf940bb 100644
--- a/etcdserver/cluster.go
+++ b/etcdserver/cluster.go
@@ -424,7 +424,6 @@ func ValidateClusterAndAssignIDs(local *cluster, existing *cluster) error {
 	sort.Sort(MembersByPeerURLs(lms))
 
 	for i := range ems {
-		// TODO: Remove URLStringsEqual after improvement of using hostnames #2150 #2123
 		if !netutil.URLStringsEqual(ems[i].PeerURLs, lms[i].PeerURLs) {
 			return fmt.Errorf("unmatched member while checking PeerURLs")
 		}
diff --git a/etcdserver/config.go b/etcdserver/config.go
index 294ee34b2..c32495b9e 100644
--- a/etcdserver/config.go
+++ b/etcdserver/config.go
@@ -92,7 +92,6 @@ func (c *ServerConfig) verifyLocalMember(strict bool) error {
 	}
 
 	// Advertised peer URLs must match those in the cluster peer list
-	// TODO: Remove URLStringsEqual after improvement of using hostnames #2150 #2123
 	apurls := c.PeerURLs.StringSlice()
 	sort.Strings(apurls)
 	urls.Sort()