diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 8dbf2a33..8af292aa 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -320,23 +320,24 @@ namespace AyaNova.Util
                 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("apm", conn);
                 await EraseTableAsync("apmtemplateitem", conn);
+                await EraseTableAsync("apmtemplate", conn);
                 await EraseTableAsync("aproject", conn);
                 await EraseTableAsync("apurchaseorder", conn);
-                await EraseTableAsync("aquote", conn);
                 await EraseTableAsync("aquoteitem", conn);
-                await EraseTableAsync("aquotetemplate", conn);
+                await EraseTableAsync("aquote", conn);
                 await EraseTableAsync("aquotetemplateitem", conn);
+                await EraseTableAsync("aquotetemplate", 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("aworkorder", conn);
                 await EraseTableAsync("aworkordertemplateitem", conn);
+                await EraseTableAsync("aworkordertemplate", conn);
+
                 await conn.CloseAsync();
             }
 
@@ -386,6 +387,9 @@ namespace AyaNova.Util
             if (await ct.User.LongCountAsync() > 1) return false;
             if (await ct.Customer.AnyAsync()) return false;
             if (await ct.Vendor.AnyAsync()) return false;
+            if (await ct.WorkOrder.AnyAsync()) return false;
+            if (await ct.Quote.AnyAsync()) return false;
+            if (await ct.PM.AnyAsync()) return false;
 
             return true;
         }