diff --git a/quirks.go b/quirks.go
index 7f60f49..ccf1f46 100644
--- a/quirks.go
+++ b/quirks.go
@@ -5,17 +5,11 @@ import (
 )
 
 type Quirks struct {
-	SendNamesOnWho                bool
 	RequireNickForGeneralMessages bool
 }
 
 func GetQuirksForClient(ver string) Quirks {
-	if strings.Contains(ver, "HexChat") {
-		return Quirks{
-			SendNamesOnWho: true,
-		}
-
-	} else if strings.Contains(ver, "mIRC") || /*strings.Contains(ver, "Revolution") ||*/ strings.Contains(ver, "Atomic") {
+	if strings.Contains(ver, "mIRC") || strings.Contains(ver, "Atomic") || strings.Contains(ver, "Yaaic") {
 		return Quirks{
 			RequireNickForGeneralMessages: true,
 		}
diff --git a/server.go b/server.go
index c80f009..08542f4 100644
--- a/server.go
+++ b/server.go
@@ -594,12 +594,7 @@ func (s *Server) handleJoinedCommand(command string, args []string) {
 			return
 		}
 
-		// s.sendWho(args[0])
-		// s.sendNames() // fixes hexchat, but andchat always sends WHO /immediately/ after NAMES end, causing an infinite loop
-
-		if s.quirks.SendNamesOnWho {
-			s.sendNames()
-		}
+		// Ignore this command
 
 	case "MODE":
 		if len(args) < 1 {