diff --git a/extensions/cornerstone/src/index.js b/extensions/cornerstone/src/index.js
index 985663238..4885d0591 100644
--- a/extensions/cornerstone/src/index.js
+++ b/extensions/cornerstone/src/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import init from './init.js';
 import commandsModule from './commandsModule.js';
-import toolbarModule from './toolbarModule.js';
 import CornerstoneViewportDownloadForm from './CornerstoneViewportDownloadForm';
 
 const Component = React.lazy(() => {
@@ -48,9 +47,6 @@ export default {
       { name: 'cornerstone', component: ExtendedOHIFCornerstoneViewport },
     ];
   },
-  getToolbarModule() {
-    return toolbarModule;
-  },
   getCommandsModule({ servicesManager }) {
     return commandsModule({ servicesManager });
   },
diff --git a/extensions/cornerstone/src/toolbarModule.js b/extensions/cornerstone/src/toolbarModule.js
index 72cd0194d..40ba576eb 100644
--- a/extensions/cornerstone/src/toolbarModule.js
+++ b/extensions/cornerstone/src/toolbarModule.js
@@ -1,14 +1,3 @@
-// TODO: A way to add Icons that don't already exist?
-// - Register them and add
-// - Include SVG Source/Inline?
-// - By URL, or own component?
-
-// What KINDS of toolbar buttons do we have...
-// - One's that dispatch commands
-// - One's that set tool's active
-// - More custom, like CINE
-//    - Built in for one's like this, or custom components?
-
 // Visible?
 // Disabled?
 // Based on contexts or misc. criteria?
@@ -17,241 +6,118 @@
 // setToolActive commands should receive the button event that triggered
 // so we can do the "bind to this button" magic
 
-const TOOLBAR_BUTTON_TYPES = {
-  COMMAND: 'command',
-  SET_TOOL_ACTIVE: 'setToolActive',
-  BUILT_IN: 'builtIn',
-};
+// const definitions = [
+//   // OLD
+//   {
+//     id: 'StackScroll',
+//     label: 'Stack Scroll',
+//     icon: 'bars',
+//     //
+//     type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
+//     commandName: 'setToolActive',
+//     commandOptions: { toolName: 'StackScroll' },
+//   },
+//   {
+//     id: 'Reset',
+//     label: 'Reset',
+//     icon: 'reset',
+//     //
+//     type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//     commandName: 'resetViewport',
+//   },
+//   {
+//     id: 'Cine',
+//     label: 'CINE',
+//     icon: 'youtube',
+//     //
+//     type: TOOLBAR_BUTTON_TYPES.BUILT_IN,
+//     options: {
+//       behavior: TOOLBAR_BUTTON_BEHAVIORS.CINE,
+//     },
+//   },
+//   {
+//     id: 'More',
+//     label: 'More',
+//     icon: 'ellipse-circle',
+//     buttons: [
+//       {
+//         id: 'Magnify',
+//         label: 'Magnify',
+//         icon: 'circle',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
+//         commandName: 'setToolActive',
+//         commandOptions: { toolName: 'Magnify' },
+//       },
+//       {
+//         id: 'WwwcRegion',
+//         label: 'ROI Window',
+//         icon: 'stop',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
+//         commandName: 'setToolActive',
+//         commandOptions: { toolName: 'WwwcRegion' },
+//       },
+//       {
+//         id: 'Invert',
+//         label: 'Invert',
+//         icon: 'adjust',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//         commandName: 'invertViewport',
+//       },
+//       {
+//         id: 'RotateRight',
+//         label: 'Rotate Right',
+//         icon: 'rotate-right',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//         commandName: 'rotateViewportCW',
+//       },
+//       {
+//         id: 'FlipH',
+//         label: 'Flip H',
+//         icon: 'ellipse-h',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//         commandName: 'flipViewportHorizontal',
+//       },
+//       {
+//         id: 'FlipV',
+//         label: 'Flip V',
+//         icon: 'ellipse-v',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//         commandName: 'flipViewportVertical',
+//       },
+//       {
+//         id: 'Clear',
+//         label: 'Clear',
+//         icon: 'trash',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//         commandName: 'clearAnnotations',
+//       },
+//       {
+//         id: 'Eraser',
+//         label: 'Eraser',
+//         icon: 'eraser',
+//         //
+//         type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
+//         commandName: 'setToolActive',
+//         commandOptions: { toolName: 'Eraser' },
+//       },
+//     ],
+//   },
+//   {
+//     id: 'Exit2DMPR',
+//     label: 'Exit 2D MPR',
+//     icon: 'times',
+//     //
+//     type: TOOLBAR_BUTTON_TYPES.COMMAND,
+//     commandName: 'setCornerstoneLayout',
+//     context: 'ACTIVE_VIEWPORT::VTK',
+//   },
+// ];
 
-const TOOLBAR_BUTTON_BEHAVIORS = {
-  CINE: 'CINE',
-  DOWNLOAD_SCREEN_SHOT: 'DOWNLOAD_SCREEN_SHOT',
-};
-
-/* TODO: Export enums through a extension manager. */
-const enums = {
-  TOOLBAR_BUTTON_TYPES,
-  TOOLBAR_BUTTON_BEHAVIORS,
-};
-
-const definitions = [
-  // UPDATED
-  {
-    id: 'Zoom',
-    label: 'Zoom',
-    icon: 'tool-zoom',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Zoom' },
-  },
-  {
-    id: 'Wwwc',
-    label: 'Levels',
-    icon: 'tool-window-level',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Wwwc' },
-  },
-  {
-    id: 'Pan',
-    label: 'Pan',
-    icon: 'tool-move',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Pan' },
-  },
-  {
-    id: 'Capture',
-    label: 'Capture',
-    icon: 'tool-capture',
-    //
-    type: TOOLBAR_BUTTON_TYPES.BUILT_IN,
-    options: {
-      behavior: TOOLBAR_BUTTON_BEHAVIORS.DOWNLOAD_SCREEN_SHOT,
-      togglable: true,
-    },
-  },
-  {
-    id: 'Annotate',
-    label: 'Annotate',
-    icon: 'tool-annotate',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'ArrowAnnotate' },
-  },
-  {
-    id: 'Bidirectional',
-    label: 'Bidirectional',
-    icon: 'tool-bidirectional',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Bidirectional' },
-  },
-  {
-    id: 'Ellipse',
-    label: 'Ellipse',
-    icon: 'tool-elipse',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'EllipticalRoi' },
-  },
-  {
-    id: 'Length',
-    label: 'Length',
-    icon: 'tool-length',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Length' },
-  },
-  // OLD
-  {
-    id: 'StackScroll',
-    label: 'Stack Scroll',
-    icon: 'bars',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'StackScroll' },
-  },
-
-  {
-    id: 'Angle',
-    label: 'Angle',
-    icon: 'angle-left',
-    //
-    type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-    commandName: 'setToolActive',
-    commandOptions: { toolName: 'Angle' },
-  },
-  {
-    id: 'Reset',
-    label: 'Reset',
-    icon: 'reset',
-    //
-    type: TOOLBAR_BUTTON_TYPES.COMMAND,
-    commandName: 'resetViewport',
-  },
-  {
-    id: 'Cine',
-    label: 'CINE',
-    icon: 'youtube',
-    //
-    type: TOOLBAR_BUTTON_TYPES.BUILT_IN,
-    options: {
-      behavior: TOOLBAR_BUTTON_BEHAVIORS.CINE,
-    },
-  },
-  {
-    id: 'More',
-    label: 'More',
-    icon: 'ellipse-circle',
-    buttons: [
-      {
-        id: 'Magnify',
-        label: 'Magnify',
-        icon: 'circle',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Magnify' },
-      },
-      {
-        id: 'WwwcRegion',
-        label: 'ROI Window',
-        icon: 'stop',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'WwwcRegion' },
-      },
-      {
-        id: 'DragProbe',
-        label: 'Probe',
-        icon: 'dot-circle',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'DragProbe' },
-      },
-      {
-        id: 'RectangleRoi',
-        label: 'Rectangle',
-        icon: 'square-o',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'RectangleRoi' },
-      },
-      {
-        id: 'Invert',
-        label: 'Invert',
-        icon: 'adjust',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'invertViewport',
-      },
-      {
-        id: 'RotateRight',
-        label: 'Rotate Right',
-        icon: 'rotate-right',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'rotateViewportCW',
-      },
-      {
-        id: 'FlipH',
-        label: 'Flip H',
-        icon: 'ellipse-h',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'flipViewportHorizontal',
-      },
-      {
-        id: 'FlipV',
-        label: 'Flip V',
-        icon: 'ellipse-v',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'flipViewportVertical',
-      },
-      {
-        id: 'Clear',
-        label: 'Clear',
-        icon: 'trash',
-        //
-        type: TOOLBAR_BUTTON_TYPES.COMMAND,
-        commandName: 'clearAnnotations',
-      },
-      {
-        id: 'Eraser',
-        label: 'Eraser',
-        icon: 'eraser',
-        //
-        type: TOOLBAR_BUTTON_TYPES.SET_TOOL_ACTIVE,
-        commandName: 'setToolActive',
-        commandOptions: { toolName: 'Eraser' },
-      },
-    ],
-  },
-  {
-    id: 'Exit2DMPR',
-    label: 'Exit 2D MPR',
-    icon: 'times',
-    //
-    type: TOOLBAR_BUTTON_TYPES.COMMAND,
-    commandName: 'setCornerstoneLayout',
-    context: 'ACTIVE_VIEWPORT::VTK',
-  },
-];
-
-export default {
-  definitions,
-  defaultContext: 'ACTIVE_VIEWPORT::CORNERSTONE',
-};
+export default [];