diff --git a/server/AyaNova/PickList/PickListFactory.cs b/server/AyaNova/PickList/PickListFactory.cs
index 4c9292fd..a4003834 100644
--- a/server/AyaNova/PickList/PickListFactory.cs
+++ b/server/AyaNova/PickList/PickListFactory.cs
@@ -18,10 +18,11 @@ namespace AyaNova.PickList
                     return new WidgetPickList() as IAyaPickList;
                 case AyaType.User:
                     return new UserPickList() as IAyaPickList;
-                case AyaType.Customer:
+                default:
                     throw new System.NotImplementedException("PICKLIST NOT IMPLEMENTED");
+
             }
-            return null;
+            //return null;
         }
 
         //List all the PickList-able object types available
diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 9fec6ece..24e4ab05 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -311,6 +311,29 @@ namespace AyaNova.Util
                 //CUSTOMER
                 await EraseTableAsync("acustomer", conn);
 
+                await EraseTableAsync("acontract", conn);
+                await EraseTableAsync("aheadoffice", conn);
+                await EraseTableAsync("aloanunit", conn);
+                await EraseTableAsync("apart", conn);
+                await EraseTableAsync("apm", conn);
+                await EraseTableAsync("apmitem", conn);
+                await EraseTableAsync("apmtemplate", conn);
+                await EraseTableAsync("apmtemplateitem", conn);
+                await EraseTableAsync("aproject", conn);
+                await EraseTableAsync("apurchaseorder", conn);
+                await EraseTableAsync("aquote", conn);
+                await EraseTableAsync("aquoteitem", conn);
+                await EraseTableAsync("aquotetemplate", conn);
+                await EraseTableAsync("aquotetemplateitem", conn);
+                await EraseTableAsync("aunit", conn);
+                await EraseTableAsync("aunitmodel", conn);
+                await EraseTableAsync("avendor", conn);
+                await EraseTableAsync("aworkorder", conn);
+                await EraseTableAsync("aworkorderitem", conn);
+                await EraseTableAsync("aworkordertemplate", conn);
+                await EraseTableAsync("aworkordertemplateitem", conn);
+
+
                 await conn.CloseAsync();
             }