diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 83a05f1e7..87897b21b 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -117,7 +117,7 @@ define([
             if (state !== STATE.READY) { return; }
 
             var oldContent = normalize(contentGetter());
-            var newContentStr = cpNfInner.realtime.getUserDoc();
+            var newContentStr = cpNfInner.chainpad.getUserDoc();
 
             var newContent = normalize(JSON.parse(newContentStr));
             var meta = extractMetadata(newContent);
@@ -346,7 +346,6 @@ define([
                 title: title.getTitleConfig(),
                 metadataMgr: cpNfInner.metadataMgr,
                 readOnly: readOnly,
-                ifrw: window,
                 realtime: cpNfInner.chainpad,
                 common: Cryptpad,
                 sfCommon: common,
diff --git a/www/common/sframe-chainpad-netflux-outer.js b/www/common/sframe-chainpad-netflux-outer.js
index 54688c2e3..51a986a08 100644
--- a/www/common/sframe-chainpad-netflux-outer.js
+++ b/www/common/sframe-chainpad-netflux-outer.js
@@ -38,6 +38,7 @@ define([], function () {
         var queue = [];
         var messageFromInner = function (m, cb) { queue.push([ m, cb ]); };
         sframeChan.on('Q_RT_MESSAGE', function (message, cb) {
+            console.log(message);
             messageFromInner(message, cb);
         });        
 
diff --git a/www/pad/inner.js b/www/pad/inner.js
index 887cb7997..8fb286921 100644
--- a/www/pad/inner.js
+++ b/www/pad/inner.js
@@ -321,9 +321,7 @@ define([
         };
 
         if (!framework.isReadOnly()) {
-            console.log('\n\n\n\n\nREGISTER\n\n\n\n\n');
             framework.onEditableChange(function () {
-                console.log("Editable change");
                 var locked = framework.isLocked();
                 $(inner).css({ 'background-color': ((locked) ? '#aaa' : '') });
                 inner.setAttribute('contenteditable', !locked);
@@ -350,9 +348,6 @@ define([
                 };
                 framework._.sfCommon.openFilePicker(pickerCfg);
             }).appendTo(framework._.toolbar.$rightside);
-
-            var $tags = framework._.sfCommon.createButton('hashtag', true);
-            framework._.toolbar.$rightside.append($tags);
         }
 
         framework.setTitleRecommender(function () {