diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs
index 8adb0f5f..69432513 100644
--- a/server/AyaNova/models/WorkOrderItemLabor.cs
+++ b/server/AyaNova/models/WorkOrderItemLabor.cs
@@ -1,43 +1,23 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
 
 namespace AyaNova.Models
 {
-    //NOTE: Any non required field (nullable in DB) sb nullable here, i.e. decimal? not decimal, 
-    //otherwise the server will call it an invalid record if the field isn't sent from client
-
     public class WorkOrderItemLabor
     {
-        public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
-
-       
-        public string Notes { get; set; }
-       // public string Wiki { get; set; }
-        public string CustomFields { get; set; }
-        public List<string> Tags { get; set; }
-
-        //Principle
-        [Required]
-        public long WorkOrderItemId { get; set; }//fk  
-        
-        [JsonIgnore]//Avoid circular reference when serializing
-        public WorkOrderItem WorkOrderItem { get; set; }
-
-
-        public WorkOrderItemLabor()
+         public WorkOrderItemLabor()
         {
             Tags = new List<string>();
         }
-
-        //Not persisted business properties
-        //NOTE: this could be a common class applied to everything for common biz rule stuff
-        //i.e. specific rights in situations based on rules, like candelete, canedit etc
-        // [NotMapped]
-        // public bool OP { get; set; }//Patch operation value
-
+        public long Id { get; set; }
+        public uint ConcurrencyToken { get; set; }
+        public string Notes { get; set; }
+        public string CustomFields { get; set; }
+        public List<string> Tags { get; set; }
+        [Required]
+        public long WorkOrderItemId { get; set; }  
+        [JsonIgnore]
+        public WorkOrderItem WorkOrderItem { get; set; }
     }//eoc
-
 }//eons
diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs
index 071f992a..344105f1 100644
--- a/server/AyaNova/models/WorkOrderItemPart.cs
+++ b/server/AyaNova/models/WorkOrderItemPart.cs
@@ -1,43 +1,23 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using Newtonsoft.Json;
 
 namespace AyaNova.Models
 {
-    //NOTE: Any non required field (nullable in DB) sb nullable here, i.e. decimal? not decimal, 
-    //otherwise the server will call it an invalid record if the field isn't sent from client
-
     public class WorkOrderItemPart
     {
-        public long Id { get; set; }
-        public uint ConcurrencyToken { get; set; }
-
-       
-        public string Notes { get; set; }
-       // public string Wiki { get; set; }
-        public string CustomFields { get; set; }
-        public List<string> Tags { get; set; }
-
-        //Principle
-        [Required]
-        public long WorkOrderItemId { get; set; }//fk  
-        
-        [JsonIgnore]//Avoid circular reference when serializing
-        public WorkOrderItem WorkOrderItem { get; set; }
-
-
-        public WorkOrderItemPart()
+         public WorkOrderItemPart()
         {
             Tags = new List<string>();
         }
-
-        //Not persisted business properties
-        //NOTE: this could be a common class applied to everything for common biz rule stuff
-        //i.e. specific rights in situations based on rules, like candelete, canedit etc
-        // [NotMapped]
-        // public bool OP { get; set; }//Patch operation value
-
+        public long Id { get; set; }
+        public uint ConcurrencyToken { get; set; }       
+        public string Notes { get; set; }
+        public string CustomFields { get; set; }
+        public List<string> Tags { get; set; }        
+        [Required]
+        public long WorkOrderItemId { get; set; }         
+        [JsonIgnore]
+        public WorkOrderItem WorkOrderItem { get; set; }
     }//eoc
-
 }//eons