diff --git a/extensions/cornerstone/src/ConnectedCornerstoneViewport.js b/extensions/cornerstone/src/ConnectedCornerstoneViewport.js
deleted file mode 100644
index 2ea40f70a..000000000
--- a/extensions/cornerstone/src/ConnectedCornerstoneViewport.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import CornerstoneViewport from 'react-cornerstone-viewport';
-import OHIF from '@ohif/core';
-import { connect } from 'react-redux';
-import throttle from 'lodash.throttle';
-import { setEnabledElement } from './state';
-
-const { setViewportActive, setViewportSpecificData } = OHIF.redux.actions;
-const {
-  onAdded,
-  onRemoved,
-  onModified,
-} = OHIF.measurements.MeasurementHandlers;
-
-// TODO: Transition to enums for the action names so that we can ensure they stay up to date
-// everywhere they're used.
-const MEASUREMENT_ACTION_MAP = {
-  added: onAdded,
-  removed: onRemoved,
-  modified: throttle(event => {
-    return onModified(event);
-  }, 300),
-};
-
-const mapStateToProps = (state, ownProps) => {
-  let dataFromStore;
-
-  // TODO: This may not be updated anymore :thinking:
-  if (state.extensions && state.extensions.cornerstone) {
-    dataFromStore = state.extensions.cornerstone;
-  }
-
-  // If this is the active viewport, enable prefetching.
-  const { viewportIndex } = ownProps; //.viewportData;
-  const isActive = viewportIndex === state.viewports.activeViewportIndex;
-  const viewportSpecificData =
-    state.viewports.viewportSpecificData[viewportIndex] || {};
-
-  // CINE
-  let isPlaying = false;
-  let frameRate = 24;
-
-  if (viewportSpecificData && viewportSpecificData.cine) {
-    const cine = viewportSpecificData.cine;
-
-    isPlaying = cine.isPlaying === true;
-    frameRate = cine.cineFrameRate || frameRate;
-  }
-
-  return {
-    // layout: state.viewports.layout,
-    isActive,
-    // TODO: Need a cleaner and more versatile way.
-    // Currently justing using escape hatch + commands
-    // activeTool: activeButton && activeButton.command,
-    ...dataFromStore,
-    isStackPrefetchEnabled: isActive,
-    isPlaying,
-    frameRate,
-    //stack: viewportSpecificData.stack,
-    // viewport: viewportSpecificData.viewport,
-  };
-};
-
-const mapDispatchToProps = (dispatch, ownProps) => {
-  const { viewportIndex } = ownProps;
-
-  return {
-    setViewportActive: () => {
-      dispatch(setViewportActive(viewportIndex));
-    },
-
-    setViewportSpecificData: data => {
-      dispatch(setViewportSpecificData(viewportIndex, data));
-    },
-
-    /**
-     * Our component "enables" the underlying dom element on "componentDidMount"
-     * It listens for that event, and then emits the enabledElement. We can grab
-     * a reference to it here, to make playing with cornerstone's native methods
-     * easier.
-     */
-    onElementEnabled: event => {
-      const enabledElement = event.detail.element;
-      setEnabledElement(viewportIndex, enabledElement);
-      dispatch(
-        setViewportSpecificData(viewportIndex, {
-          // TODO: Hack to make sure our plugin info is available from the outset
-          plugin: 'cornerstone',
-        })
-      );
-    },
-
-    onMeasurementsChanged: (event, action) => {
-      return MEASUREMENT_ACTION_MAP[action](event);
-    },
-  };
-};
-
-const ConnectedCornerstoneViewport = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(CornerstoneViewport);
-
-export default ConnectedCornerstoneViewport;
diff --git a/extensions/cornerstone/src/OHIFCornerstoneViewport.js b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
index 8e567e89c..cade68ce1 100644
--- a/extensions/cornerstone/src/OHIFCornerstoneViewport.js
+++ b/extensions/cornerstone/src/OHIFCornerstoneViewport.js
@@ -5,6 +5,29 @@ import OHIF from '@ohif/core';
 import PropTypes from 'prop-types';
 import cornerstone from 'cornerstone-core';
 import debounce from 'lodash.debounce';
+import throttle from 'lodash.throttle';
+
+
+// const {
+//   onAdded,
+//   onRemoved,
+//   onModified,
+// } = OHIF.measurements.MeasurementHandlers;
+
+// // TODO: Transition to enums for the action names so that we can ensure they stay up to date
+// // everywhere they're used.
+// const MEASUREMENT_ACTION_MAP = {
+//   added: onAdded,
+//   removed: onRemoved,
+//   modified: throttle(event => {
+//     return onModified(event);
+//   }, 300),
+// };
+
+// const cine = viewportSpecificData.cine;
+
+// isPlaying = cine.isPlaying === true;
+// frameRate = cine.cineFrameRate || frameRate;
 
 const { StackManager } = OHIF.utils;
 
@@ -187,24 +210,12 @@ class OHIFCornerstoneViewport extends Component {
 
     return (
       <>
-        {/* <ConnectedCornerstoneViewport
-          viewportIndex={viewportIndex}
-          imageIds={imageIds}
-          imageIdIndex={currentImageIdIndex}
-          onNewImage={debouncedNewImageHandler}
-          // ~~ Connected (From REDUX)
-          // frameRate={frameRate}
-          // isPlaying={false}
-          // isStackPrefetchEnabled={true}
-          // onElementEnabled={() => {}}
-          // setViewportActive{() => {}}
-          {...this.props.customProps}
-        /> */}
         <CornerstoneViewport
           viewportIndex={viewportIndex}
           imageIds={imageIds}
           imageIdIndex={currentImageIdIndex}
           onNewImage={debouncedNewImageHandler}
+          // TODO: ViewportGrid Context?
           isActive={true} // todo
           isStackPrefetchEnabled={true} // todo
           isPlaying={false}