diff --git a/src/commons/assessment/Assessment.tsx b/src/commons/assessment/Assessment.tsx
index fc674c05c5..35cbc962d6 100644
--- a/src/commons/assessment/Assessment.tsx
+++ b/src/commons/assessment/Assessment.tsx
@@ -1,5 +1,5 @@
 import {
-  Button,
+	Button,
   Collapse,
   Dialog,
   DialogBody,
@@ -79,7 +79,8 @@ const Assessment: React.FC = () => {
 
   const sortAssessments = (assessments: AssessmentOverview[]) => sortBy(assessments, [a => -a.id]);
 
-  const makeSubmissionButton = (overview: AssessmentOverview) => (
+
+const makeSubmissionButton = (overview: AssessmentOverview) => (
     <Tooltip
       disabled={overview.status === AssessmentStatuses.attempted}
       content={'You can finalize after saving an answer for each question!'}
@@ -160,7 +161,6 @@ const Assessment: React.FC = () => {
           overview={overview}
           renderAttemptButton={role !== Role.Student}
           renderGradingTooltip={false}
-          makeSubmissionButton={makeSubmissionButton}
         />
       )
     );
@@ -178,7 +178,6 @@ const Assessment: React.FC = () => {
         overview={overview}
         renderAttemptButton
         renderGradingTooltip={false}
-        makeSubmissionButton={makeSubmissionButton}
       />
     ));
 
@@ -193,7 +192,6 @@ const Assessment: React.FC = () => {
         overview={overview}
         renderAttemptButton
         renderGradingTooltip
-        makeSubmissionButton={makeSubmissionButton}
       />
     ));
 
@@ -228,6 +226,8 @@ const Assessment: React.FC = () => {
     );
   }
 
+
+
   // Define the warning text when finalising submissions
   const hasBonusXp = (betchaAssessment?.earlySubmissionXp as number) > 0;
   const warningText = hasBonusXp ? (
diff --git a/src/commons/assessment/AssessmentOverviewCard.tsx b/src/commons/assessment/AssessmentOverviewCard.tsx
index 7da503df85..5999a08a8b 100644
--- a/src/commons/assessment/AssessmentOverviewCard.tsx
+++ b/src/commons/assessment/AssessmentOverviewCard.tsx
@@ -1,8 +1,11 @@
 import { Card, Elevation, H4, H6, Icon, Intent, Position, Text, Tooltip } from '@blueprintjs/core';
 import { IconName, IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
+
+import classes from 'src/styles/Academy.module.scss';
 import { JSX } from 'react';
 
+
 import defaultCoverImage from '../../assets/default_cover_image.jpg';
 import Markdown from '../Markdown';
 import NotificationBadge from '../notificationBadge/NotificationBadge';
@@ -18,7 +21,6 @@ type AssessmentOverviewCardProps = {
   /** Will only render the attempt button if true, regardless of attempt status. */
   renderAttemptButton: boolean;
   renderGradingTooltip: boolean;
-  makeSubmissionButton: (overview: AssessmentOverview) => JSX.Element;
 };
 
 /** A card to display `AssessmentOverview`s. */
@@ -26,7 +28,6 @@ const AssessmentOverviewCard: React.FC<AssessmentOverviewCardProps> = ({
   overview,
   renderAttemptButton,
   renderGradingTooltip,
-  makeSubmissionButton
 }) => {
   const { isMobileBreakpoint } = useResponsive();
   return (
@@ -48,7 +49,6 @@ const AssessmentOverviewCard: React.FC<AssessmentOverviewCardProps> = ({
           <AssessmentOverviewCardTitle
             overview={overview}
             renderProgressStatus={renderGradingTooltip}
-            makeSubmissionButton={makeSubmissionButton}
           />
           <div className="listing-description">
             <Markdown content={overview.shortSummary} />
@@ -90,13 +90,11 @@ const AssessmentOverviewCard: React.FC<AssessmentOverviewCardProps> = ({
 type AssessmentOverviewCardTitleProps = {
   overview: AssessmentOverview;
   renderProgressStatus: boolean;
-  makeSubmissionButton: (overview: AssessmentOverview) => JSX.Element;
 };
 
 const AssessmentOverviewCardTitle: React.FC<AssessmentOverviewCardTitleProps> = ({
   overview,
   renderProgressStatus,
-  makeSubmissionButton
 }) => (
   <div className="listing-header">
     <Text ellipsize={true}>
@@ -113,7 +111,6 @@ const AssessmentOverviewCardTitle: React.FC<AssessmentOverviewCardTitleProps> =
         {renderProgressStatus ? showGradingTooltip(overview.isGradingPublished) : null}
       </H4>
     </Text>
-    <div className="listing-button">{makeSubmissionButton(overview)}</div>
   </div>
 );
 
diff --git a/src/commons/assessment/__tests__/__snapshots__/Assessment.test.tsx.snap b/src/commons/assessment/__tests__/__snapshots__/Assessment.test.tsx.snap
index 86e431d5f2..629536c599 100644
--- a/src/commons/assessment/__tests__/__snapshots__/Assessment.test.tsx.snap
+++ b/src/commons/assessment/__tests__/__snapshots__/Assessment.test.tsx.snap
@@ -144,50 +144,6 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
                           An Odessey to Runes (Duplicate)
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-disabled bp6-minimal"
-                            disabled=""
-                            tabindex="-1"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
@@ -306,50 +262,6 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
                           The Secret to Streams
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-disabled bp6-minimal"
-                            disabled=""
-                            tabindex="-1"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
@@ -496,48 +408,6 @@ exports[`Assessment page does not show attempt Button for upcoming assessments f
                           An Odessey to Runes
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-intent-danger bp6-minimal"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
@@ -869,50 +739,6 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
                           An Odessey to Runes (Duplicate)
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-disabled bp6-minimal"
-                            disabled=""
-                            tabindex="-1"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
@@ -1069,50 +895,6 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
                           The Secret to Streams
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-disabled bp6-minimal"
-                            disabled=""
-                            tabindex="-1"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
@@ -1259,48 +1041,6 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
                           An Odessey to Runes
                         </h4>
                       </div>
-                      <div
-                        class="listing-button"
-                      >
-                        <span
-                          class="bp6-popover-target"
-                        >
-                          <button
-                            class="bp6-button bp6-intent-danger bp6-minimal"
-                            type="button"
-                          >
-                            <span
-                              aria-hidden="true"
-                              class="bp6-icon bp6-icon-confirm"
-                            >
-                              <svg
-                                data-icon="confirm"
-                                height="16"
-                                role="img"
-                                viewBox="0 0 16 16"
-                                width="16"
-                              >
-                                <path
-                                  d="M8.7 4.29a.97.97 0 00-.71-.3 1.003 1.003 0 00-.71 1.71l2 2c.18.18.43.29.71.29s.53-.11.71-.29l5-5a1.003 1.003 0 00-1.42-1.42l-4.29 4.3zm5.22 3.01c.03.23.07.45.07.69 0 3.31-2.69 6-6 6s-6-2.69-6-6 2.69-6 6-6c.81 0 1.59.17 2.3.46l1.5-1.5A7.998 7.998 0 00-.01 7.99c0 4.42 3.58 8 8 8s8-3.58 8-8c0-.83-.13-1.64-.36-2.39z"
-                                  fill-rule="evenodd"
-                                />
-                              </svg>
-                            </span>
-                            <span
-                              class="bp6-button-text"
-                            >
-                              <span>
-                                Finalize
-                              </span>
-                              <span
-                                class="custom-hidden-xxs"
-                              >
-                                 Submission
-                              </span>
-                            </span>
-                          </button>
-                        </span>
-                      </div>
                     </div>
                     <div
                       class="listing-description"
diff --git a/src/pages/playground/Playground.tsx b/src/pages/playground/Playground.tsx
index d0aee7984a..05ce486e95 100644
--- a/src/pages/playground/Playground.tsx
+++ b/src/pages/playground/Playground.tsx
@@ -590,26 +590,13 @@ const Playground: React.FC<PlaygroundProps> = props => {
   );
 
   // Compute this here to avoid re-rendering the button every keystroke
+  
+ 
   const persistenceIsDirty =
     persistenceFile && (!persistenceFile.lastSaved || persistenceFile.lastSaved < lastEdit);
   const persistenceButtons = useMemo(() => {
     return (
-      <ControlBarGoogleDriveButtons
-        isFolderModeEnabled={isFolderModeEnabled}
-        currentFile={persistenceFile}
-        loggedInAs={persistenceUser}
-        isDirty={persistenceIsDirty}
-        key="googledrive"
-        onClickSaveAs={() => dispatch(PersistenceActions.persistenceSaveFileAs())}
-        onClickOpen={() => dispatch(PersistenceActions.persistenceOpenPicker())}
-        onClickSave={
-          persistenceFile
-            ? () => dispatch(PersistenceActions.persistenceSaveFile(persistenceFile))
-            : undefined
-        }
-        onClickLogOut={() => dispatch(SessionActions.logoutGoogle())}
-        onPopoverOpening={() => dispatch(PersistenceActions.persistenceInitialise())}
-      />
+		null // Google Drive Button used to be here
     );
   }, [isFolderModeEnabled, persistenceFile, persistenceUser, persistenceIsDirty, dispatch]);
 
diff --git a/src/pages/playground/__tests__/__snapshots__/Playground.test.tsx.snap b/src/pages/playground/__tests__/__snapshots__/Playground.test.tsx.snap
index 4eb55233a4..363f51986f 100644
--- a/src/pages/playground/__tests__/__snapshots__/Playground.test.tsx.snap
+++ b/src/pages/playground/__tests__/__snapshots__/Playground.test.tsx.snap
@@ -193,40 +193,6 @@ exports[`Playground tests > Playground renders correctly 1`] = `
               </span>
             </button>
           </span>
-          <span
-            class="bp6-popover-target"
-          >
-            <span
-              class="bp6-popover-target"
-            >
-              <button
-                class="bp6-button bp6-minimal"
-              >
-                <span
-                  aria-hidden="true"
-                  class="bp6-icon bp6-icon-cloud"
-                >
-                  <svg
-                    data-icon="cloud"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M12 6c-.03 0-.07 0-.1.01A5 5 0 002 7c0 .11.01.22.02.33A3.51 3.51 0 000 10.5C0 12.43 1.57 14 3.5 14H12c2.21 0 4-1.79 4-4s-1.79-4-4-4"
-                      fill-rule="evenodd"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="bp6-button-text"
-                >
-                  Google Drive
-                </span>
-              </button>
-            </span>
-          </span>
           <span
             class="bp6-popover-target"
           >
@@ -1794,40 +1760,6 @@ exports[`Playground tests > Playground with link renders correctly 1`] = `
               </span>
             </button>
           </span>
-          <span
-            class="bp6-popover-target"
-          >
-            <span
-              class="bp6-popover-target"
-            >
-              <button
-                class="bp6-button bp6-minimal"
-              >
-                <span
-                  aria-hidden="true"
-                  class="bp6-icon bp6-icon-cloud"
-                >
-                  <svg
-                    data-icon="cloud"
-                    height="16"
-                    role="img"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M12 6c-.03 0-.07 0-.1.01A5 5 0 002 7c0 .11.01.22.02.33A3.51 3.51 0 000 10.5C0 12.43 1.57 14 3.5 14H12c2.21 0 4-1.79 4-4s-1.79-4-4-4"
-                      fill-rule="evenodd"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="bp6-button-text"
-                >
-                  Google Drive
-                </span>
-              </button>
-            </span>
-          </span>
           <span
             class="bp6-popover-target"
           >