diff --git a/irc/server.go b/irc/server.go
index 9d86ad48..5c75a1d4 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -83,20 +83,20 @@ func NewServer(config *Config) *Server {
 	// add RPL_ISUPPORT tokens
 	server.isupport = NewISupportList()
 	server.isupport.Add("CASEMAPPING", "ascii")
-	server.isupport.Add("CHANMODES", "")  //TODO(dan): Channel mode list here
-	server.isupport.Add("CHANNELLEN", "") //TODO(dan): Support channel length
+	// server.isupport.Add("CHANMODES", "")  //TODO(dan): Channel mode list here
+	// server.isupport.Add("CHANNELLEN", "") //TODO(dan): Support channel length
 	server.isupport.Add("CHANTYPES", "#")
 	server.isupport.Add("EXCEPTS", "")
 	server.isupport.Add("INVEX", "")
-	server.isupport.Add("KICKLEN", "") //TODO(dan): Support kick length?
-	server.isupport.Add("MAXLIST", "") //TODO(dan): Support max list length?
-	server.isupport.Add("MODES", "")   //TODO(dan): Support max modes?
+	// server.isupport.Add("KICKLEN", "") //TODO(dan): Support kick length?
+	// server.isupport.Add("MAXLIST", "") //TODO(dan): Support max list length?
+	// server.isupport.Add("MODES", "")   //TODO(dan): Support max modes?
 	server.isupport.Add("NETWORK", config.Network.Name)
-	server.isupport.Add("NICKLEN", "") //TODO(dan): Support nick length
+	// server.isupport.Add("NICKLEN", "") //TODO(dan): Support nick length
 	server.isupport.Add("PREFIX", "(ov)@+")
 	// server.isupport.Add("STATUSMSG", "@+") //TODO(dan): Autogenerate based on PREFIXes, support STATUSMSG
-	server.isupport.Add("TARGMAX", "")  //TODO(dan): Support this
-	server.isupport.Add("TOPICLEN", "") //TODO(dan): Support topic length
+	// server.isupport.Add("TARGMAX", "")  //TODO(dan): Support this
+	// server.isupport.Add("TOPICLEN", "") //TODO(dan): Support topic length
 	server.isupport.RegenerateCachedReply()
 
 	return server