diff --git a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
index 963e01ce2..cdc82b5e9 100644
--- a/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
+++ b/extensions/ohif-vtk-extension/src/ConnectedToolbarSection.js
@@ -2,8 +2,6 @@ import { connect } from 'react-redux';
 import { ToolbarSection } from 'react-viewerbase';
 import OHIF from 'ohif-core';
 
-const { setToolActive } = OHIF.redux.actions;
-
 const mapStateToProps = state => {
   const activeButton = state.tools.buttons.find(tool => tool.active === true);
 
@@ -23,9 +21,7 @@ const mapStateToProps = state => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    setToolActive: tool => {
-      //dispatch(setToolActive(tool.command))
-    }
+    setToolActive: tool => {}
   };
 };
 
diff --git a/src/App.js b/src/App.js
index dfc7bdb6c..fb36b1521 100644
--- a/src/App.js
+++ b/src/App.js
@@ -101,12 +101,6 @@ class App extends Component {
   constructor(props) {
     super(props);
 
-    //
-    const defaultButtons = getDefaultToolbarButtons(this.props.routerBasename);
-    const buttonsAction = redux.actions.setAvailableButtons(defaultButtons);
-
-    store.dispatch(buttonsAction);
-
     if (this.props.oidc.length) {
       const firstOpenIdClient = this.props.oidc[0];
 
diff --git a/src/connectedComponents/ConnectedToolbarSection.js b/src/connectedComponents/ConnectedToolbarSection.js
deleted file mode 100644
index dc0f73bbc..000000000
--- a/src/connectedComponents/ConnectedToolbarSection.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { connect } from 'react-redux';
-import { ToolbarSection } from 'react-viewerbase';
-import OHIF from 'ohif-core';
-
-const { setToolActive } = OHIF.redux.actions;
-
-const mapStateToProps = state => {
-  const activeButton = state.tools.buttons.find(tool => tool.active === true);
-
-  return {
-    buttons: state.tools.buttons,
-    activeCommand: activeButton && activeButton.command,
-  };
-};
-
-const mapDispatchToProps = dispatch => {
-  return {
-    setToolActive: tool => {
-      dispatch(setToolActive(tool.command));
-    },
-  };
-};
-
-const ConnectedToolbarSection = connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(ToolbarSection);
-
-export default ConnectedToolbarSection;
diff --git a/src/connectedComponents/ConnectedViewerMain.js b/src/connectedComponents/ConnectedViewerMain.js
index c51e307f9..53a6dc8cf 100644
--- a/src/connectedComponents/ConnectedViewerMain.js
+++ b/src/connectedComponents/ConnectedViewerMain.js
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 const {
   setViewportSpecificData,
   clearViewportSpecificData,
-  // setToolActive,
   // setActiveViewportSpecificData,
 } = OHIF.redux.actions;
 
@@ -28,9 +27,6 @@ const mapDispatchToProps = dispatch => {
     clearViewportSpecificData: () => {
       dispatch(clearViewportSpecificData());
     },
-    // setToolActive: tool => {
-    //   dispatch(setToolActive(tool));
-    // },
     // setActiveViewportSpecificData: viewport => {
     //   dispatch(setActiveViewportSpecificData(viewport));
     // },
diff --git a/src/connectedComponents/ViewerMain.js b/src/connectedComponents/ViewerMain.js
index 9c3c1dda7..5b68e210f 100644
--- a/src/connectedComponents/ViewerMain.js
+++ b/src/connectedComponents/ViewerMain.js
@@ -19,15 +19,6 @@ class ViewerMain extends Component {
   constructor(props) {
     super(props);
 
-    // Initialize hotkeys
-    // new OHIF.HotkeysUtil('viewer', {
-    //   setViewportSpecificData: props.setViewportSpecificData,
-    //   clearViewportSpecificData: props.clearViewportSpecificData,
-    //   setToolActive: props.setToolActive,
-    //   setActiveViewportSpecificData: props.setActiveViewportSpecificData,
-    // });
-    // hotkeys.init();
-
     this.state = {
       displaySets: [],
     };