diff --git a/common/events.go b/common/events.go
index 2cca8c2fa..f347cea49 100644
--- a/common/events.go
+++ b/common/events.go
@@ -47,16 +47,17 @@ func BuildEvent(
 		return nil, err
 	}
 
-	fmt.Println("BUILDING EVENT FOR ROOM", builder.RoomID)
 	roomVersion := 2
-
 	vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: builder.RoomID}
 	vQueryRes := api.QueryRoomVersionForRoomIDResponse{}
-	if e := queryAPI.QueryRoomVersionForRoomID(ctx, &vQueryReq, &vQueryRes); e != nil {
-		fmt.Println("Eaux neaux, an error occured:", e)
+	if e := queryAPI.QueryRoomVersionForRoomID(ctx, &vQueryReq, &vQueryRes); e == nil {
+		roomVersion = vQueryRes.RoomVersion
 	}
+	fmt.Println("Building event for", roomVersion)
 
-	fmt.Println("ROOM VERSION IS", roomVersion)
+	// FIXME: Why don't we delegate to the BuildEvent function from
+	// gomatrixserverlib here?
+	// TODO: Room versions affect the below
 
 	eventID := fmt.Sprintf("$%s:%s", util.RandomString(16), cfg.Matrix.ServerName)
 	event, err := builder.Build(eventID, evTime, cfg.Matrix.ServerName, cfg.Matrix.KeyID, cfg.Matrix.PrivateKey)