diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index a029056be74a..5796512f4be2 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -388,20 +388,20 @@ class DemoMode extends Command
         $invoice->line_items = $this->buildLineItems(rand(1, 10));
         $invoice->uses_inclusive_taxes = false;
 
-        if (rand(0, 1)) {
-            $invoice->tax_name1 = 'GST';
-            $invoice->tax_rate1 = 10.00;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name1 = 'GST';
+        //     $invoice->tax_rate1 = 10.00;
+        // }
 
-        if (rand(0, 1)) {
-            $invoice->tax_name2 = 'VAT';
-            $invoice->tax_rate2 = 17.50;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name2 = 'VAT';
+        //     $invoice->tax_rate2 = 17.50;
+        // }
 
-        if (rand(0, 1)) {
-            $invoice->tax_name3 = 'CA Sales Tax';
-            $invoice->tax_rate3 = 5;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name3 = 'CA Sales Tax';
+        //     $invoice->tax_rate3 = 5;
+        // }
 
         // $invoice->custom_value1 = $faker->date;
         // $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
@@ -455,20 +455,20 @@ class DemoMode extends Command
         $invoice->line_items = $this->buildLineItems(rand(1, 10));
         $invoice->uses_inclusive_taxes = false;
 
-        if (rand(0, 1)) {
-            $invoice->tax_name1 = 'GST';
-            $invoice->tax_rate1 = 10.00;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name1 = 'GST';
+        //     $invoice->tax_rate1 = 10.00;
+        // }
 
-        if (rand(0, 1)) {
-            $invoice->tax_name2 = 'VAT';
-            $invoice->tax_rate2 = 17.50;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name2 = 'VAT';
+        //     $invoice->tax_rate2 = 17.50;
+        // }
 
-        if (rand(0, 1)) {
-            $invoice->tax_name3 = 'CA Sales Tax';
-            $invoice->tax_rate3 = 5;
-        }
+        // if (rand(0, 1)) {
+        //     $invoice->tax_name3 = 'CA Sales Tax';
+        //     $invoice->tax_rate3 = 5;
+        // }
 
         // $invoice->custom_value1 = $faker->date;
         // $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
@@ -504,20 +504,20 @@ class DemoMode extends Command
         $credit->line_items = $this->buildLineItems(rand(1, 10));
         $credit->uses_inclusive_taxes = false;
 
-        if (rand(0, 1)) {
-            $credit->tax_name1 = 'GST';
-            $credit->tax_rate1 = 10.00;
-        }
+        // if (rand(0, 1)) {
+        //     $credit->tax_name1 = 'GST';
+        //     $credit->tax_rate1 = 10.00;
+        // }
 
-        if (rand(0, 1)) {
-            $credit->tax_name2 = 'VAT';
-            $credit->tax_rate2 = 17.50;
-        }
+        // if (rand(0, 1)) {
+        //     $credit->tax_name2 = 'VAT';
+        //     $credit->tax_rate2 = 17.50;
+        // }
 
-        if (rand(0, 1)) {
-            $credit->tax_name3 = 'CA Sales Tax';
-            $credit->tax_rate3 = 5;
-        }
+        // if (rand(0, 1)) {
+        //     $credit->tax_name3 = 'CA Sales Tax';
+        //     $credit->tax_rate3 = 5;
+        // }
 
         $credit->save();
 
@@ -559,20 +559,20 @@ class DemoMode extends Command
         $quote->line_items = $this->buildLineItems(rand(1, 10));
         $quote->uses_inclusive_taxes = false;
 
-        if (rand(0, 1)) {
-            $quote->tax_name1 = 'GST';
-            $quote->tax_rate1 = 10.00;
-        }
+        // if (rand(0, 1)) {
+        //     $quote->tax_name1 = 'GST';
+        //     $quote->tax_rate1 = 10.00;
+        // }
 
-        if (rand(0, 1)) {
-            $quote->tax_name2 = 'VAT';
-            $quote->tax_rate2 = 17.50;
-        }
+        // if (rand(0, 1)) {
+        //     $quote->tax_name2 = 'VAT';
+        //     $quote->tax_rate2 = 17.50;
+        // }
 
-        if (rand(0, 1)) {
-            $quote->tax_name3 = 'CA Sales Tax';
-            $quote->tax_rate3 = 5;
-        }
+        // if (rand(0, 1)) {
+        //     $quote->tax_name3 = 'CA Sales Tax';
+        //     $quote->tax_rate3 = 5;
+        // }
 
         $quote->save();
 
@@ -600,20 +600,20 @@ class DemoMode extends Command
             $item->quantity = 1;
             //$item->cost = 10;
 
-            if (rand(0, 1)) {
-                $item->tax_name1 = 'GST';
-                $item->tax_rate1 = 10.00;
-            }
+            // if (rand(0, 1)) {
+            //     $item->tax_name1 = 'GST';
+            //     $item->tax_rate1 = 10.00;
+            // }
 
-            if (rand(0, 1)) {
-                $item->tax_name1 = 'VAT';
-                $item->tax_rate1 = 17.50;
-            }
+            // if (rand(0, 1)) {
+            //     $item->tax_name1 = 'VAT';
+            //     $item->tax_rate1 = 17.50;
+            // }
 
-            if (rand(0, 1)) {
-                $item->tax_name1 = 'Sales Tax';
-                $item->tax_rate1 = 5;
-            }
+            // if (rand(0, 1)) {
+            //     $item->tax_name1 = 'Sales Tax';
+            //     $item->tax_rate1 = 5;
+            // }
 
             $product = Product::all()->random();
 
diff --git a/app/Factory/TaskStatusFactory.php b/app/Factory/TaskStatusFactory.php
index ffcff72af0dd..a9bd6ab7b404 100644
--- a/app/Factory/TaskStatusFactory.php
+++ b/app/Factory/TaskStatusFactory.php
@@ -22,6 +22,7 @@ class TaskStatusFactory
         $task_status->company_id = $company_id;
         $task_status->name = '';
         $task_status->color = '#fff';
+        $task_status->status_order = 9999;
         
         return $task_status;
     }