diff --git a/examples/Components/Routes/Basic/index.vue b/examples/Components/Routes/Basic/index.vue
index 411d76d1..ffefdac8 100644
--- a/examples/Components/Routes/Basic/index.vue
+++ b/examples/Components/Routes/Basic/index.vue
@@ -1,36 +1,36 @@
 <template>
 	<div class="editor">
 		<menu-bar class="menubar" :editor="editor">
-			<template slot-scope="{ nodes, marks, newCommands }">
+			<template slot-scope="{ nodes, marks, commands }">
 
 				<button
 					class="menubar__button"
-					@click="newCommands.history"
-					v-if="newCommands.history"
+					@click="commands.history"
+					v-if="commands.history"
 				>
 					⬅
 				</button>
 
 				<button
 					class="menubar__button"
-					@click="newCommands.undo"
-					v-if="newCommands.undo"
+					@click="commands.undo"
+					v-if="commands.undo"
 				>
 					⬅
 				</button>
 
 				<button
 					class="menubar__button"
-					@click="newCommands.redo"
-					v-if="newCommands.redo"
+					@click="commands.redo"
+					v-if="commands.redo"
 				>
 					➡
 				</button>
 
 				<button
 					class="menubar__button"
-					@click="newCommands.undoRedo"
-					v-if="newCommands.undoRedo"
+					@click="commands.undoRedo"
+					v-if="commands.undoRedo"
 				>
 					undoredo
 				</button>
diff --git a/packages/tiptap/src/Components/MenuBar.js b/packages/tiptap/src/Components/MenuBar.js
index c9b910e8..3d4233fe 100644
--- a/packages/tiptap/src/Components/MenuBar.js
+++ b/packages/tiptap/src/Components/MenuBar.js
@@ -12,7 +12,7 @@ export default {
 				marks: this.editor.menuActions.marks,
 				focused: this.editor.view.focused,
 				focus: this.editor.focus,
-				newCommands: this.editor.newCommands,
+				commands: this.editor.commands,
 			}))
 		}
 	},
diff --git a/packages/tiptap/src/utils/Editor.js b/packages/tiptap/src/utils/Editor.js
index 208910dd..0ee3ee76 100644
--- a/packages/tiptap/src/utils/Editor.js
+++ b/packages/tiptap/src/utils/Editor.js
@@ -53,13 +53,6 @@ export default class Editor {
 		this.view = this.createView()
 		this.commands = this.createCommands()
 
-		this.newCommands = this.extensions.newCommands({
-			schema: this.schema,
-			view: this.view,
-		})
-
-		console.log(this.newCommands)
-
 		this.updateMenuActions()
 
 		this.emit('init')
diff --git a/packages/tiptap/src/utils/ExtensionManager.js b/packages/tiptap/src/utils/ExtensionManager.js
index a3f9013a..13dfb04a 100644
--- a/packages/tiptap/src/utils/ExtensionManager.js
+++ b/packages/tiptap/src/utils/ExtensionManager.js
@@ -87,31 +87,13 @@ export default class ExtensionManager {
 	}
 
 	commands({ schema, view }) {
-		return this.extensions
-			.filter(extension => ['node', 'mark'].includes(extension.type))
-			.filter(extension => extension.command)
-			.reduce((commands, { name, type, command }) => ({
-				...commands,
-				[name]: attrs => {
-					view.focus()
-
-					const provider = command({
-						type: schema[`${type}s`][name],
-						attrs,
-						schema,
-					})
-					const callbacks = Array.isArray(provider) ? provider : [provider]
-
-					callbacks.forEach(callback => callback(view.state, view.dispatch, view))
-				},
-			}), {})
-	}
-
-	newCommands({ schema, view }) {
 		return this.extensions
 			.filter(extension => extension.commands)
 			.reduce((allCommands, { name, type, commands: provider }) => {
 
+				// TODO
+				// view.focus()
+
 				const commands = {}
 				const value = provider({
 					schema,