diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 8c3f7c40..18726244 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -496,9 +496,12 @@ namespace AyaNova.Biz
                 }
             }
 
-            TODO: Build the return object in a clean format
-            //THIS FORMAT IS INCORRECT I THINK
-            //IT SHOULD BE A FULLER OBJECT WITH THE PROPERTYNAME ?!
+            //TODO: Build the return object in a clean format
+            //I could just use a actual object class to return (object v {get;set;})
+            //with a optional ID that is set to json not serialize if null?
+            //https://www.newtonsoft.com/json/help/html/JsonPropertyPropertyLevelSetting.htm
+
+            
 
             //rows:{[ {},{v:"Green mechanics",id:32},{v:"...notes..."},{v:"42",id:42}, ...thousands more etc.... ]}
           
diff --git a/server/AyaNova/models/DataFilter.cs b/server/AyaNova/models/DataFilter.cs
index e5bea333..abb580bb 100644
--- a/server/AyaNova/models/DataFilter.cs
+++ b/server/AyaNova/models/DataFilter.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/server/AyaNova/models/FileAttachment.cs b/server/AyaNova/models/FileAttachment.cs
index 4435067f..975de2e7 100644
--- a/server/AyaNova/models/FileAttachment.cs
+++ b/server/AyaNova/models/FileAttachment.cs
@@ -1,4 +1,3 @@
-using System;
 using AyaNova.Biz;
 using System.ComponentModel.DataAnnotations;
 
diff --git a/server/AyaNova/models/FormCustom.cs b/server/AyaNova/models/FormCustom.cs
index 24e7ffdf..69535555 100644
--- a/server/AyaNova/models/FormCustom.cs
+++ b/server/AyaNova/models/FormCustom.cs
@@ -1,23 +1,19 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
-
 using System.ComponentModel.DataAnnotations;
 
 namespace AyaNova.Models
 {
 
-/*
+    /*
 
- - Like DataFilter, holds a JSON fragment in one field and the form key in another field
-            - JSON FRAGMENT holds items that differ from stock, Hide not valid for non hideable core fields           
-                - FieldKey "fld"
-                - Hide "hide"
-                - Required "required"
-                - Type One of values from AyDataType but not tags or enum (bool, date, date time, decimal, number, picklist(FUTURE), and text)
-             - e.g.: [{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"bool"},{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"text"]
+     - Like DataFilter, holds a JSON fragment in one field and the form key in another field
+                - JSON FRAGMENT holds items that differ from stock, Hide not valid for non hideable core fields           
+                    - FieldKey "fld"
+                    - Hide "hide"
+                    - Required "required"
+                    - Type One of values from AyDataType but not tags or enum (bool, date, date time, decimal, number, picklist(FUTURE), and text)
+                 - e.g.: [{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"bool"},{fld:"ltkeyfieldname",hide:"true/false",required:"true/false", type:"text"]
 
- */
+     */
     public partial class FormCustom
     {
         public long Id { get; set; }
diff --git a/server/AyaNova/models/License.cs b/server/AyaNova/models/License.cs
index 12be024b..f2af1c93 100644
--- a/server/AyaNova/models/License.cs
+++ b/server/AyaNova/models/License.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
 
 namespace AyaNova.Models
 {
diff --git a/server/AyaNova/models/Locale.cs b/server/AyaNova/models/Locale.cs
index f000c310..742b15de 100644
--- a/server/AyaNova/models/Locale.cs
+++ b/server/AyaNova/models/Locale.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using AyaNova.Biz;
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/server/AyaNova/models/OpsJob.cs b/server/AyaNova/models/OpsJob.cs
index 56669f62..32d61258 100644
--- a/server/AyaNova/models/OpsJob.cs
+++ b/server/AyaNova/models/OpsJob.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using AyaNova.Biz;
-
 using System.ComponentModel.DataAnnotations;
 
 namespace AyaNova.Models
diff --git a/server/AyaNova/models/OpsJobLog.cs b/server/AyaNova/models/OpsJobLog.cs
index 5da1cd57..eaebd9b0 100644
--- a/server/AyaNova/models/OpsJobLog.cs
+++ b/server/AyaNova/models/OpsJobLog.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
 
 using System.ComponentModel.DataAnnotations;
 
diff --git a/server/AyaNova/models/SearchDictionary.cs b/server/AyaNova/models/SearchDictionary.cs
index d84e84a2..597be82f 100644
--- a/server/AyaNova/models/SearchDictionary.cs
+++ b/server/AyaNova/models/SearchDictionary.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
-
 using System.ComponentModel.DataAnnotations;
 
 namespace AyaNova.Models
diff --git a/server/AyaNova/models/SearchKey.cs b/server/AyaNova/models/SearchKey.cs
index 052da113..394eff6c 100644
--- a/server/AyaNova/models/SearchKey.cs
+++ b/server/AyaNova/models/SearchKey.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using AyaNova.Biz;
 
 using System.ComponentModel.DataAnnotations;
diff --git a/server/AyaNova/models/Tag.cs b/server/AyaNova/models/Tag.cs
index 6ad4307a..ca60df5a 100644
--- a/server/AyaNova/models/Tag.cs
+++ b/server/AyaNova/models/Tag.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
-
 using System.ComponentModel.DataAnnotations;
 
 namespace AyaNova.Models
diff --git a/server/AyaNova/models/UserOptions.cs b/server/AyaNova/models/UserOptions.cs
index 7875dd5d..fcc0e2f4 100644
--- a/server/AyaNova/models/UserOptions.cs
+++ b/server/AyaNova/models/UserOptions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using AyaNova.Biz;
 using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
 namespace AyaNova.Models