--- a/TODO.txt	Mon Sep 02 20:38:14 2013 -0700
+++ b/TODO.txt	Mon Sep 02 20:38:57 2013 -0700
@@ -4,8 +4,6 @@
 Review all these *Client receiver methods. They should probably either
 all be receivers, or none.
 
-Get rid of Client.Uid.
-
 Maybe put auth-related stuff into its own structure inside Client,
 instead of at Client's top level.
 

--- a/xmpp.go	Mon Sep 02 20:38:14 2013 -0700
+++ b/xmpp.go	Mon Sep 02 20:38:57 2013 -0700
@@ -65,10 +65,6 @@
 
 // The client in a client-server XMPP connection.
 type Client struct {
-	// This client's unique ID. It's unique within the context of
-	// this process, so if multiple Client objects exist, each
-	// will be distinguishable by its Uid.
-	Uid string
 	// This client's JID. This will be updated asynchronously by
 	// the time StartSession() returns.
 	Jid          JID
@@ -139,7 +135,6 @@
 
 	cl := new(Client)
 	cl.Roster = *roster
-	cl.Uid = NextId()
 	cl.password = password
 	cl.Jid = *jid
 	cl.socket = tcp