diff --git a/src/App.js b/src/App.js
index 00c07fd19..70d3232a3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -54,7 +54,7 @@ store.dispatch({
 });
 store.dispatch({
   type: 'ADD_ACTIVE_CONTEXT',
-  item: 'VIEWER::CORNERSTONE',
+  item: 'ACTIVE_VIEWPORT::CORNERSTONE',
 });
 
 // ~~~~ END APP SETUP
diff --git a/src/appCommands/index.js b/src/appCommands/index.js
index 66ab50fa6..e7c263eef 100644
--- a/src/appCommands/index.js
+++ b/src/appCommands/index.js
@@ -1,4 +1,3 @@
-import cornerstoneCommandDefinitions from './cornerstone.js';
 import viewerCommandDefinitions from './viewer.js';
 
 const CONTEXTS = {
@@ -12,7 +11,6 @@ const CONTEXTS = {
  */
 function init(commandsManager) {
   _registerViewerCommands(commandsManager);
-  _registerCornerstoneCommands(commandsManager);
 }
 
 /**
@@ -35,26 +33,6 @@ function _registerViewerCommands(commandsManager) {
   });
 }
 
-/**
- * Register all Cornerstone commands
- *
- * @private
- */
-function _registerCornerstoneCommands(commandsManager) {
-  const commandContext = CONTEXTS.cornerstone;
-
-  commandsManager.createContext(commandContext);
-  Object.keys(cornerstoneCommandDefinitions).forEach(commandName => {
-    const commandDefinition = cornerstoneCommandDefinitions[commandName];
-
-    commandsManager.registerCommand(
-      commandContext,
-      commandName,
-      commandDefinition
-    );
-  });
-}
-
 export default {
   init,
 };