diff --git a/client/src/templates/Challenges/classic/mobile-layout.tsx b/client/src/templates/Challenges/classic/mobile-layout.tsx
index 04965a795e1..4aac57f271f 100644
--- a/client/src/templates/Challenges/classic/mobile-layout.tsx
+++ b/client/src/templates/Challenges/classic/mobile-layout.tsx
@@ -2,7 +2,7 @@ import { TabPane, Tabs } from '@freecodecamp/react-bootstrap';
 import i18next from 'i18next';
 import React, { Component, ReactElement } from 'react';
 
-import ToolPanel from '../components/tool-panel';
+// import ToolPanel from '../components/tool-panel';
 import EditorTabs from './editor-tabs';
 
 interface MobileLayoutProps {
@@ -60,8 +60,8 @@ class MobileLayout extends Component<MobileLayoutProps, MobileLayoutState> {
       hasPreview,
       notes,
       preview,
-      guideUrl,
-      videoUrl,
+      // guideUrl,
+      // videoUrl,
       usesMultifileEditor
     } = this.props;
 
@@ -124,7 +124,7 @@ class MobileLayout extends Component<MobileLayoutProps, MobileLayoutState> {
               {preview}
             </TabPane>
           )}
-          <ToolPanel guideUrl={guideUrl} isMobile={true} videoUrl={videoUrl} />
+          {/* <ToolPanel guideUrl={guideUrl} isMobile={true} videoUrl={videoUrl} /> */}
         </Tabs>
       </>
     );
diff --git a/client/src/templates/Challenges/components/side-panel.tsx b/client/src/templates/Challenges/components/side-panel.tsx
index 006b463bc36..c009d5afe8e 100644
--- a/client/src/templates/Challenges/components/side-panel.tsx
+++ b/client/src/templates/Challenges/components/side-panel.tsx
@@ -6,7 +6,7 @@ import { Test } from '../../../redux/prop-types';
 import { mathJaxScriptLoader } from '../../../utils/script-loaders';
 import { challengeTestsSelector } from '../redux/selectors';
 import TestSuite from './test-suite';
-import ToolPanel from './tool-panel';
+// import ToolPanel from './tool-panel';
 
 import './side-panel.css';
 
@@ -31,12 +31,12 @@ export function SidePanel({
   block,
   challengeDescription,
   challengeTitle,
-  guideUrl,
+  // guideUrl,
   instructionsPanelRef,
-  showToolPanel = false,
-  tests,
-  videoUrl
-}: SidePanelProps): JSX.Element {
+  // showToolPanel = false,
+  tests
+}: // videoUrl
+SidePanelProps): JSX.Element {
   useEffect(() => {
     const MathJax = global.MathJax;
     const mathJaxMountPoint = document.querySelector('#mathjax');
@@ -78,7 +78,7 @@ export function SidePanel({
     >
       {challengeTitle}
       {challengeDescription}
-      {showToolPanel && <ToolPanel guideUrl={guideUrl} videoUrl={videoUrl} />}
+      {/* {showToolPanel && <ToolPanel guideUrl={guideUrl} videoUrl={videoUrl} />} */}
       <TestSuite tests={tests} />
     </div>
   );