diff --git a/app/components/SimpleEditor/ContainerEditor.js b/app/components/SimpleEditor/ContainerEditor.js
index 839349470b292811ac059ca2cd7f6773b2aa13ce..11409854a02bba1d11046f7e15ecbb408a290d02 100644
--- a/app/components/SimpleEditor/ContainerEditor.js
+++ b/app/components/SimpleEditor/ContainerEditor.js
@@ -30,12 +30,12 @@ class ContainerEditor extends SubstanceContainerEditor {
     if (this.isEmpty()) this.createText()
     this.el.focus() // TODO notworking
 
-    // if (this.isReadOnlyMode()) {
-    //   const documentSession = this.getDocumentSession()
-    //   documentSession.on('didUpdate', this.disableToolbar, this)
-    //
-    //   this.addTargetToLinks()
-    // }
+    if (this.isReadOnlyMode()) {
+      const documentSession = this.getDocumentSession()
+      documentSession.on('didUpdate', this.disableToolbar, this)
+
+      this.addTargetToLinks()
+    }
   }
 
   onTextInput (event) {
diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index 043f64e3ea763edd91a44911e4cd387b14683382..a0c326529ba8200846f6f12e6bcbe01b7a134560 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -27,42 +27,25 @@ class Editor extends ProseEditor {
   }
 
   trackChangesViewToggle () {
-    // TODO what to handle here????
     this.extendState({
       trackChangesView: !this.state.trackChangesView
     })
   }
 
   updateTrackChange () {
-    this.extendProps({
-      trackChanges: !this.props.trackChanges
-    })
-    //
+    this.extendProps({trackChanges: !this.props.trackChanges})
+
     this.props.updateTrackChangesStatus(!this.props.trackChanges)
 
-    this.refs.toolbar.extendProps({
-      trackChanges: this.props.trackChanges
-    })
+    this.refs.toolbar.extendProps({trackChanges: this.props.trackChanges})
   }
 
   willUpdateState () {}
 
   didMount () {
-    // this.documentSession.on('didUpdate', this.documentSessionUpdated, this)
-    // this.editorSession.on('fileUploadTrigger', this.handleUpload, this)
     this.extendState({ editorReady: true })
   }
 
-  // handleUpload (file, callback) {
-  //   const { fileUpload } = this.props
-  //
-  //   // TODO -- then / catch
-  //   // fileUpload(file).then((res, err) => {
-  //   //   if (err != null) callback(null, err)
-  //   //   return callback(res.file, null)
-  //   // })
-  // }
-
   render ($$) {
     const { trackChangesView } = this.state
     const canToggleTrackChanges = this.canToggleTrackChanges()
diff --git a/app/components/SimpleEditor/elements/note/EditNoteTool.js b/app/components/SimpleEditor/elements/note/EditNoteTool.js
index 7aeae8ab8b2f7ae2a571bda22ebdb3f71010905f..3e5e7ece23993dba906ddddf30b08413563d4eb1 100644
--- a/app/components/SimpleEditor/elements/note/EditNoteTool.js
+++ b/app/components/SimpleEditor/elements/note/EditNoteTool.js
@@ -82,13 +82,6 @@ class EditNoteTool extends Tool {
     const selectionLength = (sel.end.offset - sel.start.offset === 1)
 
     if (typeof note[0] !== 'undefined' && selectionLength) {
-      // disable commands that don't make sense on a note
-      console.log('commandStates', commandStates)
-      // each(keys(commandStates), (key) => {
-      //   const allowed = ['comment', 'redo', 'save', 'switch-text-type', 'undo']
-      //   if (!includes(allowed, key)) commandStates['link'].disabled = true
-      // })
-
       return {
         node: note[0]
       }