diff --git a/app/components/SimpleEditor/elements/dialogue/Dialogue.js b/app/components/SimpleEditor/elements/dialogue/Dialogue.js
deleted file mode 100644
index 0f76ced02530529b8b5a69ac6e87f66900c1ba56..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/Dialogue.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// 'use strict'
-//
-// var TextBlock = require('substance/model/TextBlock')
-//
-// function Dialogue () {
-//   Dialogue.super.apply(this, arguments)
-// }
-//
-// TextBlock.extend(Dialogue)
-//
-// Dialogue.static.name = 'dialogue'
-//
-// module.exports = Dialogue
diff --git a/app/components/SimpleEditor/elements/dialogue/DialogueComponent.js b/app/components/SimpleEditor/elements/dialogue/DialogueComponent.js
deleted file mode 100644
index 07ce279d75693d169b76637115479e9bd63a95da..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialogueComponent.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// 'use strict'
-//
-// var ListComponent = require('substance/packages/list/ListComponent')
-// var DialogueHtmlConverter = require('./DialogueHTMLConverter')
-// var DialogueItemComponent = require('./DialogueItemComponent')
-//
-// function DialogueComponent () {
-//   DialogueComponent.super.apply(this, arguments)
-// }
-//
-// DialogueComponent.Prototype = function () {
-//   this.render = function ($$) {
-//     return DialogueHtmlConverter.render(this.props.node, {
-//       createListElement: function (list) {
-//         var tagName = 'dl'
-//         return $$(tagName)
-//           .attr('data-id', list.id)
-//           .addClass('sc-dialogue')
-//       },
-//       renderListItem: function (item) {
-//         return $$(DialogueItemComponent, { node: item })
-//       }
-//     })
-//   }
-//
-//   this.onItemsChanged = function () {
-//     this.rerender()
-//   }
-// }
-//
-// ListComponent.extend(DialogueComponent)
-//
-// module.exports = DialogueComponent
diff --git a/app/components/SimpleEditor/elements/dialogue/DialogueEditing.js b/app/components/SimpleEditor/elements/dialogue/DialogueEditing.js
deleted file mode 100644
index 9c22cf9f20903c8fc8de6d359be112ff0e72dfd0..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialogueEditing.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// var breakList = require('substance/packages/list/breakList')
-//
-// module.exports = {
-//   register: function (behavior) {
-//     behavior.defineBreak('dialogue-item', breakList)
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/dialogue/DialogueHTMLConverter.js b/app/components/SimpleEditor/elements/dialogue/DialogueHTMLConverter.js
deleted file mode 100644
index fd54f1e3138f23d14da028d5ded3063613095edb..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialogueHTMLConverter.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// module.exports = {
-//   type: 'codeblock',
-//   tagName: 'pre',
-//
-//   import: function (el, node, converter) {
-//   },
-//
-//   export: function (node, el, converter) {
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/dialogue/DialogueItem.js b/app/components/SimpleEditor/elements/dialogue/DialogueItem.js
deleted file mode 100644
index feefd29358e575bab3a18b072772152a97e6e3df..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialogueItem.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// var TextBlock = require('substance/model/TextBlock')
-//
-// function DialogueItem () {
-//   DialogueItem.super.apply(this, arguments)
-// }
-//
-// TextBlock.extend(DialogueItem)
-//
-// DialogueItem.static.name = 'dialogue-item'
-//
-// DialogueItem.static.defineSchema({
-//   listType: { type: 'string', default: 'definition' },
-//   level: { type: 'number', default: 1 }
-// })
-//
-// module.exports = DialogueItem
diff --git a/app/components/SimpleEditor/elements/dialogue/DialogueItemComponent.js b/app/components/SimpleEditor/elements/dialogue/DialogueItemComponent.js
deleted file mode 100644
index 9694b4c38449f84008efa30493e35a8c46fe15e1..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialogueItemComponent.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// import { includes } from 'lodash'
-//
-// var Component = require('substance/ui/Component')
-// var TextProperty = require('substance/ui/TextPropertyComponent')
-//
-// function DialogueItemComponent () {
-//   DialogueItemComponent.super.apply(this, arguments)
-// }
-//
-// DialogueItemComponent.Prototype = function () {
-//   this.render = function ($$) {
-//     var node = this.props.node
-//
-//     var el = $$('div')
-//       .addClass('sc-dialogue-item')
-//       .addClass('sm-' + node.listType)
-//       .attr('data-id', this.props.node.id)
-//       .append($$(TextProperty, {
-//         path: [this.props.node.id, 'content']
-//       })
-//     )
-//
-//     return el
-//   }
-//
-//   this.didMount = function () {
-//     // HACK if the items were wrapped in a dl list then I could maybe
-//     // achieve the same thing with css rules only
-//     var el = this.el
-//     var previous = el.el.previousSibling
-//
-//     var className = 'sc-dialogue-item-q'
-//
-//     if (previous && includes(previous.classList, 'sc-dialogue-item-q')) {
-//       className = 'sc-dialogue-item-a'
-//     }
-//
-//     el.addClass(className)
-//   }
-// }
-//
-// Component.extend(DialogueItemComponent)
-//
-// module.exports = DialogueItemComponent
diff --git a/app/components/SimpleEditor/elements/dialogue/DialoguePackage.js b/app/components/SimpleEditor/elements/dialogue/DialoguePackage.js
deleted file mode 100644
index c46f60f47d7c0d476984735acc4f4bee2fb9292c..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/DialoguePackage.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// var DialogueItem = require('./DialogueItem')
-// var DialogueItemComponent = require('./DialogueItemComponent')
-// var DialogueEditing = require('./DialogueEditing')
-//
-// var ListMacro = require('substance/packages/list/ListMacro')
-//
-// module.exports = {
-//   name: 'dialogue-item',
-//   configure: function (config, options) {
-//     config.addNode(DialogueItem)
-//     config.addComponent(DialogueItem.static.name, DialogueItemComponent)
-//
-//     config.addTextType({
-//       name: 'dialogue-item',
-//       data: { type: 'dialogue-item' }
-//     })
-//
-//     config.addStyle(__dirname, '_dialogue.scss')
-//     config.addEditingBehavior(DialogueEditing)
-//
-//     if (options.enableMacro) {
-//       config.addMacro(ListMacro)
-//     }
-//
-//     config.addLabel('dialogue', {
-//       en: 'Dialogue'
-//     })
-//
-//     config.addLabel('dialogue-item', {
-//       en: 'Dialogue'
-//     })
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/dialogue/dialogue.scss b/app/components/SimpleEditor/elements/dialogue/dialogue.scss
deleted file mode 100644
index 6dd30bb65b492b264096c08cf36d0e5c7d46b906..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/dialogue/dialogue.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-// .sc-dialogue {
-// }
-
-.sc-dialogue-item {
-  margin: 0 0 0 25px;
-  padding-top: 5px !important;
-  position: relative;
-}
-
-.sc-dialogue-item::before {
-  font-style: italic;
-  font-weight: bold;
-  left: -25px;
-  position: absolute;
-}
-
-.sc-dialogue-item-q::before {
-  content: 'Q: ';
-}
-
-.sc-dialogue-item-a::before {
-  content: 'A: ';
-}
diff --git a/app/components/SimpleEditor/elements/elements.scss b/app/components/SimpleEditor/elements/elements.scss
index f7b1616133c70a8f612df3ac17a6fed491a44e24..3b0a54b17ba0ea81c8bada98034650134952fba3 100644
--- a/app/components/SimpleEditor/elements/elements.scss
+++ b/app/components/SimpleEditor/elements/elements.scss
@@ -1,10 +1,7 @@
 @import './comment/comment';
-// @import './dialogue/dialogue';
 @import './extract/extract';
 @import './link/link';
 @import './note/note';
-// @import './no_style_list/noStyleList';
-// @import './numbered_list/numberedList';
 @import './source_note/sourceNote';
 
 @import './track_change/trackChange';
diff --git a/app/components/SimpleEditor/elements/no_style_list/NoStyleListEditing.js b/app/components/SimpleEditor/elements/no_style_list/NoStyleListEditing.js
deleted file mode 100644
index d5a76ed0c1c12154dd3a407c27de66d7bdcef8e1..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/NoStyleListEditing.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// var breakList = require('substance/packages/list/breakList')
-//
-// module.exports = {
-//   register: function (behavior) {
-//     behavior.defineBreak('no-style-list-item', breakList)
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/no_style_list/NoStyleListHTMLConverter.js b/app/components/SimpleEditor/elements/no_style_list/NoStyleListHTMLConverter.js
deleted file mode 100644
index fd54f1e3138f23d14da028d5ded3063613095edb..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/NoStyleListHTMLConverter.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// module.exports = {
-//   type: 'codeblock',
-//   tagName: 'pre',
-//
-//   import: function (el, node, converter) {
-//   },
-//
-//   export: function (node, el, converter) {
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/no_style_list/NoStyleListItem.js b/app/components/SimpleEditor/elements/no_style_list/NoStyleListItem.js
deleted file mode 100644
index 4661dc35125c8ce12a1f2f80a0ce228eb37c5a81..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/NoStyleListItem.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// var TextBlock = require('substance/model/TextBlock')
-//
-// function NoStyleListItem () {
-//   NoStyleListItem.super.apply(this, arguments)
-// }
-//
-// TextBlock.extend(NoStyleListItem)
-//
-// NoStyleListItem.static.name = 'no-style-list-item'
-//
-// NoStyleListItem.static.defineSchema({
-//   listType: { type: 'string', default: '' },
-//   level: { type: 'number', default: 1 }
-// })
-//
-// module.exports = NoStyleListItem
diff --git a/app/components/SimpleEditor/elements/no_style_list/NoStyleListItemComponent.js b/app/components/SimpleEditor/elements/no_style_list/NoStyleListItemComponent.js
deleted file mode 100644
index 18962f55a2815dceb1d3bf5c67b4c1844ab783a6..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/NoStyleListItemComponent.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// var Component = require('substance/ui/Component')
-// var TextProperty = require('substance/ui/TextPropertyComponent')
-//
-// function NoStyleListItemComponent () {
-//   NoStyleListItemComponent.super.apply(this, arguments)
-// }
-//
-// NoStyleListItemComponent.Prototype = function () {
-//   this.render = function ($$) {
-//    // var node = this.props.node
-//     var el = $$('div')
-//         .addClass('sc-no-style-list-item')
-//       // .addClass('sm-' + node.listType)
-//       .attr('data-id', this.props.node.id)
-//       .append($$(TextProperty, {
-//         path: [this.props.node.id, 'content']
-//       })
-//     )
-//
-//     return el
-//   }
-// }
-//
-// Component.extend(NoStyleListItemComponent)
-//
-// module.exports = NoStyleListItemComponent
diff --git a/app/components/SimpleEditor/elements/no_style_list/NoStyleListPackage.js b/app/components/SimpleEditor/elements/no_style_list/NoStyleListPackage.js
deleted file mode 100644
index ad6ffa4be7db96645c9dff3377515db2c7c02909..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/NoStyleListPackage.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// var NoStyleListItem = require('./NoStyleListItem')
-// var NoStyleListItemComponent = require('./NoStyleListItemComponent')
-// var NoStyleListEditing = require('./NoStyleListEditing')
-//
-// var ListMacro = require('substance/packages/list/ListMacro')
-//
-// module.exports = {
-//   name: 'no-style-list-item',
-//   configure: function (config, options) {
-//     config.addNode(NoStyleListItem)
-//     config.addComponent(NoStyleListItem.static.name, NoStyleListItemComponent)
-//
-//     config.addTextType({
-//       name: 'no-style-list-item',
-//       data: { type: 'no-style-list-item' }
-//     })
-//
-//     config.addStyle(__dirname, '_noStyleList.scss')
-//     config.addEditingBehavior(NoStyleListEditing)
-//
-//     if (options.enableMacro) {
-//       config.addMacro(ListMacro)
-//     }
-//
-//     config.addLabel('no-style-list', {
-//       en: 'No Style List'
-//     })
-//
-//     config.addLabel('no-style-list-item', {
-//       en: 'Undecorated List'
-//     })
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/no_style_list/noStyleList.scss b/app/components/SimpleEditor/elements/no_style_list/noStyleList.scss
deleted file mode 100644
index 59de95e799b93b859fffe8d2c1f19615449c917a..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/no_style_list/noStyleList.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.sc-no-style-list-item {
-  margin: 0 0 0 25px;
-  padding-top: 5px !important;
-  position: relative;
-}
diff --git a/app/components/SimpleEditor/elements/numbered_list/NumberedListEditing.js b/app/components/SimpleEditor/elements/numbered_list/NumberedListEditing.js
deleted file mode 100644
index 83fb61c19368817ffc8ecf67f0b33a5a26d35b32..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/NumberedListEditing.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// var breakList = require('substance/packages/list/breakList')
-//
-// module.exports = {
-//   register: function (behavior) {
-//     behavior.defineBreak('numbered-list-item', breakList)
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/numbered_list/NumberedListHTMLConverter.js b/app/components/SimpleEditor/elements/numbered_list/NumberedListHTMLConverter.js
deleted file mode 100644
index fd54f1e3138f23d14da028d5ded3063613095edb..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/NumberedListHTMLConverter.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// module.exports = {
-//   type: 'codeblock',
-//   tagName: 'pre',
-//
-//   import: function (el, node, converter) {
-//   },
-//
-//   export: function (node, el, converter) {
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/numbered_list/NumberedListItem.js b/app/components/SimpleEditor/elements/numbered_list/NumberedListItem.js
deleted file mode 100644
index 708b604208f87d4352a33ef2f0cf7eff5281838d..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/NumberedListItem.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// var TextBlock = require('substance/model/TextBlock')
-//
-// function NumberedListItem () {
-//   NumberedListItem.super.apply(this, arguments)
-// }
-//
-// TextBlock.extend(NumberedListItem)
-//
-// NumberedListItem.static.name = 'numbered-list-item'
-//
-// NumberedListItem.static.defineSchema({
-//   listType: { type: 'string', default: '' },
-//   level: { type: 'number', default: 1 }
-// })
-//
-// module.exports = NumberedListItem
diff --git a/app/components/SimpleEditor/elements/numbered_list/NumberedListItemComponent.js b/app/components/SimpleEditor/elements/numbered_list/NumberedListItemComponent.js
deleted file mode 100644
index b89467cce008cc37c607aa91b7581564afa7f9e8..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/NumberedListItemComponent.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// import { includes } from 'lodash'
-//
-// var Component = require('substance/ui/Component')
-// var TextProperty = require('substance/ui/TextPropertyComponent')
-//
-// function NumberedListItemComponent () {
-//   NumberedListItemComponent.super.apply(this, arguments)
-// }
-//
-// NumberedListItemComponent.Prototype = function () {
-//   this.render = function ($$) {
-//    // var node = this.props.node
-//     var el = $$('div')
-//         .addClass('sc-numbered-list-item')
-//       // .addClass('sm-' + node.listType)
-//       .attr('data-id', this.props.node.id)
-//       .append($$(TextProperty, {
-//         path: [this.props.node.id, 'content']
-//       })
-//     )
-//
-//     return el
-//   }
-//
-//   this.didMount = function () {
-//     var el = this.el
-//     var previous = el.el.previousSibling
-//
-//     if (previous && !includes(previous.classList, 'sc-numbered-list-item')) {
-//       el.el.style.counterReset = 'item'
-//     }
-//   }
-// }
-//
-// Component.extend(NumberedListItemComponent)
-//
-// module.exports = NumberedListItemComponent
diff --git a/app/components/SimpleEditor/elements/numbered_list/NumberedListPackage.js b/app/components/SimpleEditor/elements/numbered_list/NumberedListPackage.js
deleted file mode 100644
index 95374a2f481e87b7c39c9d236c4e90eea6797e03..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/NumberedListPackage.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// var NumberedListItem = require('./NumberedListItem')
-// var NumberedListItemComponent = require('./NumberedListItemComponent')
-// var NumberedListEditing = require('./NumberedListEditing')
-//
-// var ListMacro = require('substance/packages/list/ListMacro')
-//
-// module.exports = {
-//   name: 'numbered-list-item',
-//   configure: function (config, options) {
-//     config.addNode(NumberedListItem)
-//     config.addComponent(NumberedListItem.static.name, NumberedListItemComponent)
-//
-//     config.addTextType({
-//       name: 'numbered-list-item',
-//       data: { type: 'numbered-list-item' }
-//     })
-//
-//     config.addStyle(__dirname, '_numberedList.scss')
-//     config.addEditingBehavior(NumberedListEditing)
-//
-//     if (options.enableMacro) {
-//       config.addMacro(ListMacro)
-//     }
-//
-//     config.addLabel('numbered-list', {
-//       en: 'Numbered List'
-//     })
-//
-//     config.addLabel('numbered-list-item', {
-//       en: 'Numbered List'
-//     })
-//   }
-// }
diff --git a/app/components/SimpleEditor/elements/numbered_list/numberedList.scss b/app/components/SimpleEditor/elements/numbered_list/numberedList.scss
deleted file mode 100644
index 0733558d5a601895489dc11826b9909c0d5c4ec7..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/numbered_list/numberedList.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.sc-container-editor {
-  counter-reset: item;
-}
-
-.sc-numbered-list-item {
-  margin: 0 0 0 25px;
-  padding-top: 5px !important;
-  position: relative;
-
-  span::before {
-    content: '' counter(item) '. ';
-    counter-increment: item;
-    font-size: 14px;
-    font-style: italic;
-    left: -25px;
-    position: absolute;
-    top: 7px;
-  }
-}