diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index bec9d60c..f644252f 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -191,54 +191,6 @@ export default {
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
 
-      // //id 0 means create a new record don't load one
-      // if (vm.$route.params.recordid != 0) {
-      //   //is there already an obj from a prior operation?
-      //   if (vm.$route.params.obj) {
-      //     //yes, no need to fetch it
-      //     vm.name = vm.$route.params.name;
-      //     vm.obj = vm.$route.params.obj;
-      //     window.$gz.form.setFormState({
-      //       vm: vm,
-      //       loading: false
-      //     });
-      //   } else {
-      //     await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
-      //   }
-      // } else {
-      //   //New record so there has to be a object type and objectId in route
-      //   // path: "/home-reviews/:recordid/:aType?/:objectId?",
-      //   vm.obj.objectId = window.$gz.util.stringToIntOrNull(
-      //     vm.$route.params.objectId
-      //   );
-      //   vm.obj.aType = window.$gz.util.stringToIntOrNull(
-      //     vm.$route.params.aType
-      //   );
-
-      //   if (!vm.obj.objectId || !vm.obj.aType) {
-      //     throw "AType and ObjectId are required to create a review";
-      //   }
-      //   vm.name = vm.$route.params.name;
-
-      //   window.$gz.form.setFormState({
-      //     vm: vm,
-      //     loading: false
-      //   });
-      // }
-
-      // if (!vm.name) {
-      //   vm.name = await window.$gz.api.fetchBizObjectName(
-      //     vm.obj.aType,
-      //     vm.obj.objectId
-      //   );
-      // }
-
-      // window.$gz.form.setFormState({
-      //   vm: vm,
-      //   dirty: false,
-      //   valid: true
-      // });
-
       let setDirty = false;
       let setValid = true;
 
@@ -594,42 +546,6 @@ export default {
         }
       });
     }
-    // async duplicate() {
-    //   let vm = this;
-    //   if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-    //     return;
-    //   }
-    //   window.$gz.form.setFormState({
-    //     vm: vm,
-    //     loading: true
-    //   });
-    //   let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
-    //   try {
-    //     window.$gz.form.deleteAllErrorBoxErrors(vm);
-    //     let res = await window.$gz.api.upsert(url);
-    //     if (res.error) {
-    //       vm.formState.serverError = res.error;
-    //       window.$gz.form.setErrorBoxErrors(vm);
-    //     } else {
-    //       //Navigate to new record
-    //       this.$router.push({
-    //         name: "review-edit",
-    //         params: {
-    //           recordid: res.data.id,
-    //           obj: res.data // Pass data object to new form
-    //         }
-    //       });
-    //     }
-    //   } catch (ex) {
-    //     window.$gz.errorHandler.handleFormError(ex, vm);
-    //   } finally {
-    //     window.$gz.form.setFormState({
-    //       vm: vm,
-    //       loading: false
-    //     });
-    //   }
-    // }
 
     //end methods
   }
diff --git a/ayanova/src/views/inv-part-assembly.vue b/ayanova/src/views/inv-part-assembly.vue
index fdc5e18b..827a5aa3 100644
--- a/ayanova/src/views/inv-part-assembly.vue
+++ b/ayanova/src/views/inv-part-assembly.vue
@@ -289,29 +289,34 @@ export default {
       vm.formState.readOnly = !vm.rights.change;
       window.$gz.eventBus.$on("menu-click", clickHandler);
 
+      let setDirty = false;
+      let setValid = true;
+
       //id 0 means create a new record don't load one
       if (vm.$route.params.recordid != 0) {
         //is there already an obj from a prior operation?
         if (this.$route.params.obj) {
           //yes, no need to fetch it
           this.obj = this.$route.params.obj;
-          window.$gz.form.setFormState({
-            vm: vm,
-            loading: false
-          });
         } else {
           await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
         }
       } else {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
+        //Might be a duplicate and contain another record
+        if (this.$route.params.obj) {
+          this.obj = this.$route.params.obj;
+          this.obj.concurrency = undefined;
+          this.obj.id = 0;
+          this.obj.items.forEach(z => (z.id = 0));
+          setDirty = true;
+        }
       }
+
       window.$gz.form.setFormState({
         vm: vm,
-        dirty: false,
-        valid: true
+        loading: false,
+        dirty: setDirty,
+        valid: setValid
       });
 
       generateMenu(vm);
@@ -615,41 +620,16 @@ export default {
       }
     },
     async duplicate() {
-      let vm = this;
-      if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
-        return;
-      }
-      window.$gz.form.setFormState({
-        vm: vm,
-        loading: true
-      });
-      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
-
-      try {
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        let res = await window.$gz.api.upsert(url);
-        if (res.error) {
-          vm.formState.serverError = res.error;
-          window.$gz.form.setErrorBoxErrors(vm);
-        } else {
-          //Navigate to new record
-          this.$router.push({
-            name: "part-assembly-edit",
-            params: {
-              recordid: res.data.id,
-              obj: res.data // Pass data object to new form
-            }
-          });
+      //Navigate to new record
+      this.$router.push({
+        name: "part-assembly-edit",
+        params: {
+          recordid: 0,
+          obj: this.obj
         }
-      } catch (ex) {
-        window.$gz.errorHandler.handleFormError(ex, vm);
-      } finally {
-        window.$gz.form.setFormState({
-          vm: vm,
-          loading: false
-        });
-      }
+      });
     }
+
     //end methods
   }
 };