diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs
index 71aa7949..6c4d4820 100644
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -965,7 +965,6 @@ namespace AyaNova.Biz
                     //WORKORDER ITEM LABOR
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", ModelProperty = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", ModelProperty = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" });
-                    //l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", ModelProperty = "ServiceDetails", TKeySection = "WorkOrderItemLabor" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" });
@@ -999,8 +998,7 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "TravelTaxBViz", TKeySection = "WorkOrderItemTravel", Requireable = false });
                     l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravel", Requireable = false });
 
-                    //WORKORDER ITEM EXPENSES
-                    //l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false });
+                    //WORKORDER ITEM EXPENSES                   
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense", ModelProperty = "ChargeTaxCodeId" });
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense", ModelProperty = "TaxPaid", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense", Requireable = false });
@@ -1024,7 +1022,6 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "ListPrice", FieldKey = "LoanListPrice", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "Price", FieldKey = "LoanPriceViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LoanPriceOverride", TKeySection = "WorkOrderItemLoan", ModelProperty = "PriceOverride" });
-                    //l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LoanUnitOfMeasureViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "NetPrice", FieldKey = "LoanNetViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LoanTaxAViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LoanTaxBViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
@@ -1179,7 +1176,6 @@ namespace AyaNova.Biz
                     //QUOTE ITEM PART
                     l.Add(new FormField { TKey = "WorkOrderItemPartDescription", ModelProperty = "Description", TKeySection = "WorkOrderItemPart" });
                     l.Add(new FormField { TKey = "PurchaseOrderItemSerialNumbers", ModelProperty = "Serials", TKeySection = "WorkOrderItemPart" });
-                    //l.Add(new FormField { TKey = "WorkOrderItemPartSuggestedQuantity", TKeySection = "WorkOrderItemPart", Requireable = false });//requires at least a zero so effectively can't be required
                     l.Add(new FormField { TKey = "WorkOrderItemPartTaxPartSaleID", ModelProperty = "TaxPartSaleId", TKeySection = "WorkOrderItemPart" });
                     l.Add(new FormField { TKey = "PartDescription", TKeySection = "WorkOrderItemPart", Requireable = false });
                     l.Add(new FormField { TKey = "PartUPC", TKeySection = "WorkOrderItemPart", Requireable = false });
@@ -1196,7 +1192,6 @@ namespace AyaNova.Biz
                     //QUOTE ITEM LABOR
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", ModelProperty = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", ModelProperty = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" });
-                   // l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", ModelProperty = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", ModelProperty = "ServiceDetails", TKeySection = "WorkOrderItemLabor" });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" });
@@ -1231,7 +1226,6 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravel", Requireable = false });
 
                     //QUOTE ITEM EXPENSES
-                    //l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense", ModelProperty = "ChargeTaxCodeId" });
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense", ModelProperty = "TaxPaid", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense", Requireable = false });
@@ -1255,7 +1249,6 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "ListPrice", FieldKey = "LoanListPrice", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "Price", FieldKey = "LoanPriceViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LoanPriceOverride", TKeySection = "WorkOrderItemLoan", ModelProperty = "PriceOverride" });
-                    //l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LoanUnitOfMeasureViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "NetPrice", FieldKey = "LoanNetViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LoanTaxAViz", TKeySection = "WorkOrderItemLoan", Requireable = false });
                     l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LoanTaxBViz", TKeySection = "WorkOrderItemLoan", Requireable = false });