diff --git a/examples/chat2/main.go b/examples/chat2/main.go
index 82406c9..0352139 100644
--- a/examples/chat2/main.go
+++ b/examples/chat2/main.go
@@ -114,14 +114,16 @@ func main() {
 		staticnode := *staticNodeFlag
 		storenode := *storeNodeFlag
 
-		var fleetData []byte
+		//var fleetData []byte
 		if len(staticnode) == 0 || len(storenode) == 0 {
-			fleetData = getFleetData()
+			// XXX Context timeouts
+			//fleetData = getFleetData()
 		}
 
 		if len(staticnode) == 0 {
 			ui.displayMessage(fmt.Sprintf("No static peers configured. Choosing one at random from %s fleet...", *fleetFlag))
-			staticnode = getRandomFleetNode(fleetData, *fleetFlag)
+			// XXX Disable for now
+			//staticnode = getRandomFleetNode(fleetData, *fleetFlag)
 		}
 
 		// TODO Call with JSON RPC
diff --git a/go-waku/examples/chat2/main.go b/go-waku/examples/chat2/main.go
index 9a2eb36..2e0ad95 100644
--- a/go-waku/examples/chat2/main.go
+++ b/go-waku/examples/chat2/main.go
@@ -104,7 +104,8 @@ func main() {
 
 		if len(staticnode) == 0 {
 			ui.displayMessage(fmt.Sprintf("No static peers configured. Choosing one at random from %s fleet...", *fleetFlag))
-			staticnode = getRandomFleetNode(fleetData, *fleetFlag)
+			// XXX Do via RPC
+			//staticnode = getRandomFleetNode(fleetData, *fleetFlag)
 		}
 
 		err = wakuNode.DialPeer(staticnode)
@@ -118,7 +119,8 @@ func main() {
 
 		if len(storenode) == 0 {
 			ui.displayMessage(fmt.Sprintf("No store node configured. Choosing one at random from %s fleet...", *fleetFlag))
-			storenode = getRandomFleetNode(fleetData, *fleetFlag)
+			// XXX Do via RPC
+			// storenode = getRandomFleetNode(fleetData, *fleetFlag)
 		}
 
 		storeNodeId, err := wakuNode.AddStorePeer(storenode)