diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am
index 94b3d609..cf5fde4a 100644
--- a/sugar/chat/Makefile.am
+++ b/sugar/chat/Makefile.am
@@ -10,7 +10,6 @@ sugar_PYTHON =		\
 	ChatToolbar.py	\
 	Emoticons.py	\
 	GroupChat.py	\
-	MeshChat.py	\
 	richtext.py
 
 EXTRA_DIST = \
diff --git a/sugar/chat/MeshChat.py b/sugar/chat/MeshChat.py
deleted file mode 100644
index a9cb635a..00000000
--- a/sugar/chat/MeshChat.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from sugar.chat.GroupChat import GroupChat
-from sugar.presence.Service import Service
-import sugar.env
-
-class MeshChat(GroupChat):
-	SERVICE_TYPE = "_olpc_mesh_chat._udp"
-	SERVICE_ADDRESS = "232.5.5.5"
-	SERVICE_PORT = 6301
-
-	def __init__(self):
-		GroupChat.__init__(self)
-
-		service = Service(sugar.env.get_nick_name(), MeshChat.SERVICE_TYPE,
-						  'local', MeshChat.SERVICE_ADDRESS, MeshChat.SERVICE_PORT)
-		self._setup_stream(service)