diff --git a/extensions/cornerstone/src/init.js b/extensions/cornerstone/src/init.js
index a3fdf065c..e7b321935 100644
--- a/extensions/cornerstone/src/init.js
+++ b/extensions/cornerstone/src/init.js
@@ -65,7 +65,6 @@ export default function init({ servicesManager, configuration }) {
   const handleOhifCornerstoneEnabledElementEvent = function(evt) {
     const { viewportIndex, enabledElement } = evt.detail;
 
-    console.log(evt, viewportIndex, enabledElement);
     setEnabledElement(viewportIndex, enabledElement);
   };
 
diff --git a/platform/ui/src/contextProviders/ViewportGridProvider.jsx b/platform/ui/src/contextProviders/ViewportGridProvider.jsx
index 0dadaaa0c..fe77ef0a0 100644
--- a/platform/ui/src/contextProviders/ViewportGridProvider.jsx
+++ b/platform/ui/src/contextProviders/ViewportGridProvider.jsx
@@ -16,14 +16,6 @@ const DEFAULT_STATE = {
 
 export const ViewportGridContext = createContext(DEFAULT_STATE);
 
-// export function ViewportGridProvider({ reducer, initialState, children }) {
-//   return (
-//     <ViewportGridContext.Provider value={useReducer(reducer, initialState)}>
-//       {children}
-//     </ViewportGridContext.Provider>
-//   );
-// }
-
 export function ViewportGridProvider({ children, service }) {
   const viewportGridReducer = (state, action) => {
     switch (action.type) {
@@ -139,8 +131,3 @@ ViewportGridProvider.propTypes = {
 };
 
 export const useViewportGrid = () => useContext(ViewportGridContext);
-
-// TODO:
-// - Update dependents of `useViewportGrid` to use new API instead of generic `dispatch`
-// - Update `@ohif/core` interface `setServiceImplementation` to accomodate defined API methods
-// - Update `@ohif/ext-cornerstone` commands to use new service to get the activeViewportIndex and restore command functionality