diff --git a/dist/lib/xmpp-chat-component b/dist/lib/xmpp-chat-component
index ffed7b6c77ff46ee93f5d2de185e4984d1988d47..3c6fe0b63a6d311610bcf53cb84b552ef382f17e 160000
--- a/dist/lib/xmpp-chat-component
+++ b/dist/lib/xmpp-chat-component
@@ -1 +1 @@
-Subproject commit ffed7b6c77ff46ee93f5d2de185e4984d1988d47
+Subproject commit 3c6fe0b63a6d311610bcf53cb84b552ef382f17e
diff --git a/index.php b/index.php
index b92e1d69c7d17e758a0af3907175c35c8e5e087d..6abe39729ab393c5c99f6a1f239c4adf2a1aeff2 100644
--- a/index.php
+++ b/index.php
@@ -21,7 +21,6 @@
     <script type="text/javascript" src="<?php echo $dn; ?>/node_modules/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="<?php echo $dn; ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="<?php echo $dn; ?>/dist/lib/webcomponentsjs/webcomponents-loader.js"></script>
-    <script type="text/javascript" src="<?php echo $dn; ?>/dist/lib/xmpp-chat-component/node_modules/webcomponentsjs/full.js"></script>
 
     <!-- Web components -->
     <link rel="import" href="<?php echo $dn; ?>/dist/lib/ldp-display/ldp-display.html?v=<?php echo $v ?>" />
diff --git a/src/html/channel.html b/src/html/channel.html
index fe2c431d39dcc21c1f8b857c97322953a7db3e5e..4958f4943c72afc02da9854a645a1576dffc205d 100644
--- a/src/html/channel.html
+++ b/src/html/channel.html
@@ -29,16 +29,6 @@
     </ldp-route>
   </ldp-router>
 
-  <hd-chat-window
-    id="channel-chat" 
-    data-authentication="anonymous"
-    data-auto-login="true"
-    data-bosh-service-url="https://conversejs.org/http-bind/"
-    data-debug="false"
-    data-jid="nomnom.im"
-    data-locales-url="http://hd-app.local/dist/lib/xmpp-chat-component/node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json",
-    data-room-jid="anonymous@conference.nomnom.im">
-  </hd-chat-window>
 
   <div id="channel-detail" style="display: none">
     <ldp-display 
diff --git a/src/html/member.html b/src/html/member.html
index 7979a91424b1fbc3f4caa99952988da846ae6e98..7991cb628ac00e68da74fdccb9f71cda699965ef 100644
--- a/src/html/member.html
+++ b/src/html/member.html
@@ -9,14 +9,13 @@
   </ldp-router>
 
   <hd-chat-window
-    id="member-chat" 
-    data-authentication="anonymous"
-    data-auto-login="true"
-    data-bosh-service-url="https://conversejs.org/http-bind/"
-    data-debug="false"
-    data-jid="nomnom.im"
-    data-locales-url="http://hd-app.local/dist/lib/xmpp-chat-component/node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json",
-    data-room-jid="anonymous@conference.nomnom.im">
+      data-authentication="anonymous"
+      data-auto-login="true"
+      data-bosh-service-url="https://conversejs.org/http-bind/"
+      data-debug="true"
+      data-jid="nomnom.im"
+      data-locales-url="http://hd-app.local/dist/lib/xmpp-chat-component/node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json",
+      data-room-jid="anonymous@conference.nomnom.im">
   </hd-chat-window>
 
   <div id="member-detail" style="display: none">
diff --git a/src/html/project.html b/src/html/project.html
index 62deb250b13f86d68d0d0764df2699e8af7cd722..3449555d05e5e699bba96f9636e5e338de574268 100644
--- a/src/html/project.html
+++ b/src/html/project.html
@@ -8,16 +8,6 @@
     </ldp-route>
   </ldp-router>
 
-  <hd-chat-window
-    id="project-chat" 
-    data-authentication="anonymous"
-    data-auto-login="true"
-    data-bosh-service-url="https://conversejs.org/http-bind/"
-    data-debug="false"
-    data-jid="nomnom.im"
-    data-locales-url="http://hd-app.local/dist/lib/xmpp-chat-component/node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json",
-    data-room-jid="anonymous@conference.nomnom.im">
-  </hd-chat-window>
 
   <div id="project-detail" style="display: none">
     <ldp-display