diff --git a/packages/hoppscotch-common/src/components/collections/Properties.vue b/packages/hoppscotch-common/src/components/collections/Properties.vue
index 090325710f0..3c80decf305 100644
--- a/packages/hoppscotch-common/src/components/collections/Properties.vue
+++ b/packages/hoppscotch-common/src/components/collections/Properties.vue
@@ -130,11 +130,9 @@ watch(
   (show) => {
     if (show && props.editingProperties?.collection) {
       editableCollection.value.auth = clone(
-        // AM-REMINDER: errors from previous feature
         props.editingProperties.collection.auth
       )
       editableCollection.value.headers = clone(
-        // AM-REMINDER: errors from previous feature
         props.editingProperties.collection.headers
       )
     } else {
diff --git a/packages/hoppscotch-common/src/components/collections/graphql/Folder.vue b/packages/hoppscotch-common/src/components/collections/graphql/Folder.vue
index 1b995762f7f..5852daddc88 100644
--- a/packages/hoppscotch-common/src/components/collections/graphql/Folder.vue
+++ b/packages/hoppscotch-common/src/components/collections/graphql/Folder.vue
@@ -128,10 +128,8 @@
                   :shortcut="['P']"
                   @click="
                     () => {
-                      debugger
                       emit('edit-properties', {
                         collectionIndex: collectionIndex,
-                        // AM-REMINDER: check this line, because collection is not defined anywhere
                         collection: collection,
                       })
                       hide()
diff --git a/packages/hoppscotch-common/src/components/graphql/Headers.vue b/packages/hoppscotch-common/src/components/graphql/Headers.vue
index 4f4aab29f22..5472ac42334 100644
--- a/packages/hoppscotch-common/src/components/graphql/Headers.vue
+++ b/packages/hoppscotch-common/src/components/graphql/Headers.vue
@@ -667,7 +667,6 @@ const inheritedProperties = computed(() => {
 
   const computedAuthHeader = getComputedAuthHeaders(
     request.value,
-    // AM-COMMENT: look into this, GQLAuth not yet updated yet issue
     props.inheritedProperties.auth.inheritedAuth
   )[0]
 
diff --git a/packages/hoppscotch-common/src/components/http/Headers.vue b/packages/hoppscotch-common/src/components/http/Headers.vue
index 57b809a0014..13d949e51d0 100644
--- a/packages/hoppscotch-common/src/components/http/Headers.vue
+++ b/packages/hoppscotch-common/src/components/http/Headers.vue
@@ -619,7 +619,6 @@ const inheritedProperties = computed(() => {
   const computedAuthHeader = getComputedAuthHeaders(
     aggregateEnvs.value,
     request.value,
-    // AM-COMMENT: check this line, this is because the GqlAuth is not updated yet to use the updated auth type
     props.inheritedProperties.auth.inheritedAuth,
     false
   )[0]
diff --git a/packages/hoppscotch-common/src/helpers/RequestRunner.ts b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
index f221ba52828..22ed93468d5 100644
--- a/packages/hoppscotch-common/src/helpers/RequestRunner.ts
+++ b/packages/hoppscotch-common/src/helpers/RequestRunner.ts
@@ -247,7 +247,6 @@ export function runRESTRequest$(
       combineEnvVariables(finalEnvs)
     )
 
-    // AM-COMMENT: check this, this is due to the GqlAuth not updated yet, revist after GqlAuth is updated
     const effectiveRequest = getEffectiveRESTRequest(finalRequest, {
       id: "env-id",
       v: 1,
diff --git a/packages/hoppscotch-common/src/pages/import.vue b/packages/hoppscotch-common/src/pages/import.vue
index 7b41dcfdaeb..c0ceb667dcb 100644
--- a/packages/hoppscotch-common/src/pages/import.vue
+++ b/packages/hoppscotch-common/src/pages/import.vue
@@ -79,7 +79,6 @@ const importCollections = (url: unknown, type: unknown) =>
         content.data,
         TO.fromPredicate(isOfType("string")),
         TE.fromTaskOption(() => IMPORTER_INVALID_FILE_FORMAT),
-        // AM-COMMENT: ask james if this got introduced in any of the multiple import PRs
         TE.chain((data) => importer.importer(data))
       )
     )
diff --git a/packages/hoppscotch-common/src/services/persistence/__tests__/__mocks__/index.ts b/packages/hoppscotch-common/src/services/persistence/__tests__/__mocks__/index.ts
index 6d1522b32f9..01958ab09a8 100644
--- a/packages/hoppscotch-common/src/services/persistence/__tests__/__mocks__/index.ts
+++ b/packages/hoppscotch-common/src/services/persistence/__tests__/__mocks__/index.ts
@@ -25,7 +25,6 @@ export const REST_COLLECTIONS_MOCK: HoppCollection[] = [
     folders: [],
     requests: [
       {
-        // AM-COMMENT: check this
         v: "3",
         endpoint: "https://echo.hoppscotch.io",
         name: "Echo test",
@@ -51,7 +50,7 @@ export const GQL_COLLECTIONS_MOCK: HoppCollection[] = [
     folders: [],
     requests: [
       {
-        v: 2,
+        v: 3,
         name: "Echo test",
         url: "https://echo.hoppscotch.io/graphql",
         headers: [],
@@ -139,7 +138,6 @@ export const REST_HISTORY_MOCK: RESTHistoryEntry[] = [
       preRequestScript: "",
       testScript: "",
       requestVariables: [],
-      // AM-COMMENT: check this
       v: "3",
     },
     responseMeta: { duration: 807, statusCode: 200 },
@@ -173,7 +171,7 @@ export const GQL_TAB_STATE_MOCK: PersistableTabState<HoppGQLDocument> = {
       tabID: "5edbe8d4-65c9-4381-9354-5f1bf05d8ccc",
       doc: {
         request: {
-          v: 2,
+          v: 3,
           name: "Untitled",
           url: "https://echo.hoppscotch.io/graphql",
           headers: [],
@@ -196,7 +194,6 @@ export const REST_TAB_STATE_MOCK: PersistableTabState<HoppRESTDocument> = {
       tabID: "e6e8d800-caa8-44a2-a6a6-b4765a3167aa",
       doc: {
         request: {
-          // AM-COMMENT: check this
           v: "3",
           endpoint: "https://echo.hoppscotch.io",
           name: "Echo test",