diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index ab25843e..9f5f2dcc 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -300,12 +300,16 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  menuOptions.menuItems.push({
-    title: "stub: Last report used",
-    icon: "$ayiFileAlt",
-    key: FORM_KEY + ":report:STUBlastusedreportid",
-    vm: vm
-  });
+  //get last report selected
+  let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      icon: "$ayiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
 
   if (vm.rights.change) {
     menuOptions.menuItems.push({
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index 4b3c6b2f..4166a966 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -84,30 +84,6 @@ function generateMenu(vm) {
     menuItems: []
   };
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "stub: Last report used",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report:STUBlastusedreportid",
-  //   vm: vm
-  // });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
-
-// //////////////////////////////////////////////////////////
-// //
-// // Ensures UI translated text is available
-// //
-// async function fetchTranslatedText(vm) {
-//   await window.$gz.translation.cacheTranslations(["ReadOnly"]);
-// }
 </script>
diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue
index 92cef2ea..00357bc5 100644
--- a/ayanova/src/views/adm-report-templates.vue
+++ b/ayanova/src/views/adm-report-templates.vue
@@ -132,22 +132,6 @@ function generateMenu(vm) {
     }
   };
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "stub: Last report used",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report:STUBlastusedreportid",
-  //   vm: vm
-  // });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue
index 19dee260..d8e227bd 100644
--- a/ayanova/src/views/adm-translations.vue
+++ b/ayanova/src/views/adm-translations.vue
@@ -128,22 +128,6 @@ function generateMenu(vm) {
     }
   };
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "stub: Last report used",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report:STUBlastusedreportid",
-  //   vm: vm
-  // });
-
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }
 
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 77c22670..0802c78d 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -1051,26 +1051,6 @@ function generateMenu(vm) {
     });
   }
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // //get last report selected
-  // let lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  // if (lastReport != null) {
-  //   menuOptions.menuItems.push({
-  //     title: lastReport.name,
-  //     icon: "$ayiFileAlt",
-  //     key: FORM_KEY + ":report:" + lastReport.id,
-  //     vm: vm
-  //   });
-  // }
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index c6ddfec3..1d5b61bc 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -278,22 +278,6 @@ function generateMenu(vm) {
     vm: vm
   });
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "stub: Last report used",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report:STUBlastusedreportid",
-  //   vm: vm
-  // });
-
   menuOptions.menuItems.push({
     title: "DirectNotification",
     icon: "$ayiCommentAlt",
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 89f18691..3b97d157 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -659,26 +659,6 @@ function generateMenu(vm) {
     });
   }
 
-  //   //STUB REPORTS
-  //   //Report not Print, print is a further option
-  //   menuOptions.menuItems.push({
-  //     title: "Report",
-  //     icon: "$ayiFileAlt",
-  //     key: FORM_KEY + ":report",
-  //     vm: vm
-  //   });
-
-  //   //get last report selected
-  //   let lastReport = window.$gz.form.getLastReport(FORM_KEY);
-  //   if (lastReport != null) {
-  //     menuOptions.menuItems.push({
-  //       title: lastReport.name,
-  //       icon: "$ayiFileAlt",
-  //       key: FORM_KEY + ":report:" + lastReport.id,
-  //       vm: vm
-  //     });
-  //   }
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: "New",
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index a98600a9..ed2925c7 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -172,28 +172,6 @@ function generateMenu(vm) {
     });
   }
 
-  // //STUB REPORTS
-  // //Report not Print, print is a further option
-  // menuOptions.menuItems.push({
-  //   title: "Report",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "stub: Last report used",
-  //   icon: "$ayiFileAlt",
-  //   key: FORM_KEY + ":report:STUBlastusedreportid",
-  //   vm: vm
-  // });
-
-  // menuOptions.menuItems.push({
-  //   title: "Extensions",
-  //   icon: "fa - puzzle-piece",
-  //   key: FORM_KEY + ":extensions",
-  //   vm: vm
-  // });
   window.$gz.eventBus.$emit("menu-change", menuOptions);
 }