diff --git a/Modules/M3/Console/DeleteOldLabels.php b/Modules/M3/Console/DeleteOldLabels.php
index 2f2b239d..f63cf1a0 100644
--- a/Modules/M3/Console/DeleteOldLabels.php
+++ b/Modules/M3/Console/DeleteOldLabels.php
@@ -80,8 +80,6 @@ class DeleteOldLabels extends Command
                 }
             }
 
-            // dump($filesToDeleteArr);
-
             // Delete Old Files
             File::delete($filesToDeleteArr);
 
diff --git a/Modules/M3/Console/GenerateGS1Cmd.php b/Modules/M3/Console/GenerateGS1Cmd.php
index 7552b0ef..58db915e 100644
--- a/Modules/M3/Console/GenerateGS1Cmd.php
+++ b/Modules/M3/Console/GenerateGS1Cmd.php
@@ -2,7 +2,6 @@
 
 namespace Modules\M3\Console;
 
-use App;
 use Ayeo\Barcode;
 use Cache;
 use Config;
@@ -228,7 +227,6 @@ class GenerateGS1Cmd extends Command
                 }
 
                 $html .= '</body> </html>';
-                // App::call('App\Http\Controllers\utilitiesContoller@generateGS128');
 
                 ob_start();
 
diff --git a/Modules/M3/Helpers/Helper.php b/Modules/M3/Helpers/Helper.php
index 199a4266..2bc4cc9a 100644
--- a/Modules/M3/Helpers/Helper.php
+++ b/Modules/M3/Helpers/Helper.php
@@ -232,7 +232,6 @@ class Helper
         ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
 
         $insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('ICM699M')->insert($data);
-        // dump($insertSQL);
     }
 
     // Get Substring in string between 2 Substrings
diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php
index eb44daa7..511e73ac 100644
--- a/Modules/M3/Http/Controllers/API/M3Controller.php
+++ b/Modules/M3/Http/Controllers/API/M3Controller.php
@@ -19,7 +19,6 @@ class M3Controller extends Controller
     // Split Data and Write to ICM666M2
     public function insertToICM666M2($dataSplit, $commentData)
     {
-        // dump($dataSplit);
 
         $commentDataSS = explode("\n", $dataSplit);
         $aXLINENO = 1;
@@ -410,7 +409,6 @@ class M3Controller extends Controller
                     $hazMat = isset($iCM709MSEL->AT9WRN) ? $iCM709MSEL->AT9WRN : '';
                     $insertArray['A1MATWRN'] = $hazMat;
 
-                    //     $insertArray['A1USRN01']=$palletQty;
                     // }
 
                     // SQL Insert to ICM666M
diff --git a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
index 0353a083..1a8fce1c 100644
--- a/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
+++ b/Modules/M3/Http/Controllers/M3GetPDFFromCacheController.php
@@ -75,7 +75,6 @@ class M3GetPDFFromCacheController extends Controller
 
                     $aggmsg = "This delivery note is part of aggregation $aggno ";
                     $iCM688M1 = DB::connection(config('m3.connection', 'pgsql'))->select("select A4MACPKR from ICM688M1 where A4SHPAGGCD='$aggno'");
-                    // foreach($iCM688M1 as $key => $ICM688M1R) {
                     //     $aggmsg.=' <a href="M3GetPDFFromCache?MACPKR='.$ICM688M1R->A4MACPKR.'&COMPANY='.$cOMPANY.'&PLANT='.$pLANT.'&WHS='.$wHS.'">'.$ICM688M1R->A4MACPKR.'</a>';
                     // }
                     // $aggmsg.=" )";
@@ -184,7 +183,6 @@ class M3GetPDFFromCacheController extends Controller
             }
         } catch (\Throwable $th) {
         }
-        // dump($aYMACPKR);
         // dump($iC670M);
         // dump($iCM695M1);
 
diff --git a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
index 3b2bf5f7..bce26294 100644
--- a/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
+++ b/Modules/M3/Http/Controllers/OrderLinesOfClosedOrder.php
@@ -181,7 +181,6 @@ class OrderLinesOfClosedOrder extends Controller
             $urlParams = count($request->all()) > 0 ? $request->all() : '';
             $reportDate = isset($urlParams['REPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['REPORTDATE']))->format('Ymd') : today()->format('Ymd');
             $toreportDate = isset($urlParams['TOREPORTDATE']) ? \DateTime::createFromFormat('Y-m-d', trim($urlParams['TOREPORTDATE']))->format('Ymd') : today()->format('Ymd');
-            // dd($toreportDate);
             $reportDateWD = isset($urlParams['REPORTDATE']) ? trim($urlParams['REPORTDATE']) : today()->format('Y-m-d');
             $toreportDateWD = isset($urlParams['TOREPORTDATE']) ? trim($urlParams['TOREPORTDATE']) : today()->format('Y-m-d');
 
diff --git a/Modules/M3/Http/Controllers/carrierMaintController.php b/Modules/M3/Http/Controllers/carrierMaintController.php
index 13e90d0a..05c0cce8 100644
--- a/Modules/M3/Http/Controllers/carrierMaintController.php
+++ b/Modules/M3/Http/Controllers/carrierMaintController.php
@@ -37,7 +37,6 @@ class carrierMaintController extends Controller
     {
         $currentUser = Helper::getUserCOWHSPLT();
         $userCO = $currentUser['UserCO'] ?? '';
-        // $UserPL = $currentUser['UserPL'] ?? '';
 
         // Insert record to ICM160M
         // Verify record does not already exist in ICM160M
@@ -65,7 +64,6 @@ class carrierMaintController extends Controller
     {
         $currentUser = Helper::getUserCOWHSPLT();
         $userCO = $currentUser['UserCO'] ?? '';
-        // $UserPL = $currentUser['UserPL'] ?? '';
 
         // Insert record to ICM160M
         if ($request->CANUM == null) {
diff --git a/Modules/M3/Http/Controllers/execSummaryController.php b/Modules/M3/Http/Controllers/execSummaryController.php
index 2c450b5d..a1992175 100644
--- a/Modules/M3/Http/Controllers/execSummaryController.php
+++ b/Modules/M3/Http/Controllers/execSummaryController.php
@@ -128,7 +128,6 @@ class execSummaryController extends Controller
                             break;
                     }
                     // dump($toreportDate);
-                    // dump($selectContent);
 
                     $execSummaryRes = DB::connection(config('m3.connection', 'pgsql'))->select($selectContent);
                 } else {
diff --git a/Modules/M3/Http/Controllers/palletQtyController.php b/Modules/M3/Http/Controllers/palletQtyController.php
index 8a3181bb..46a035da 100644
--- a/Modules/M3/Http/Controllers/palletQtyController.php
+++ b/Modules/M3/Http/Controllers/palletQtyController.php
@@ -86,8 +86,6 @@ class palletQtyController extends Controller
     public static function saveQtyEdit(Request $request)
     {
 
-        // console.log($request);
-
         //    where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
         // var_dump($icm709m);
 
diff --git a/Modules/M3/Http/Controllers/pendingClosureController.php b/Modules/M3/Http/Controllers/pendingClosureController.php
index c211a04a..5cd4dbdb 100644
--- a/Modules/M3/Http/Controllers/pendingClosureController.php
+++ b/Modules/M3/Http/Controllers/pendingClosureController.php
@@ -89,7 +89,6 @@ class pendingClosureController extends Controller
     {
         // Get URL PARAMS
         $urlParams = count($request->all()) > 0 ? $request->all() : '';
-        // $SHUSER      = isset($urlParams["SHUSER"]) ? $urlParams["SHUSER"] : '';
         $mANIFEST = isset($urlParams['MANIFEST']) ? $urlParams['MANIFEST'] : '';
         $aPCO = isset($urlParams['APCO']) ? $urlParams['APCO'] : '';
         $aPWHS = isset($urlParams['APWHS']) ? $urlParams['APWHS'] : '';
diff --git a/Modules/M3/Http/Controllers/userControlController.php b/Modules/M3/Http/Controllers/userControlController.php
index dc0fcd57..2be16497 100644
--- a/Modules/M3/Http/Controllers/userControlController.php
+++ b/Modules/M3/Http/Controllers/userControlController.php
@@ -229,7 +229,6 @@ class userControlController extends Controller
         // Successful Call
         else {
             // $AWREQN =  $result['io_param']["var0"];
-            // return "success";
             if ($request->ACTION == 'P') {
                 echo "<script>alert('The password has been reset to QAZ1WSX2 for '" . $request->USERID . "'. The user will need to enter a new password on next green screen connection.');</script>";
             }
@@ -289,7 +288,6 @@ class userControlController extends Controller
         }
 
         // $params[]   = $conn->AddParameterChar('in', 10, 'userid','USRPRF',$request->USERID);
-        // $params[]   = $conn->AddParameterChar('in', 10, 'pwd','PASSWORD',$request->PASSWORD);
         // $params[]   = $conn->AddParameterChar('in', 9, 'sts','STATUS','*ENABLED');
         // $params[]   = $conn->AddParameterChar('in', 4, 'pwdexp','PWDEXP','*NO');
 
diff --git a/Modules/M3/Http/Controllers/userPickingStats5.php b/Modules/M3/Http/Controllers/userPickingStats5.php
index 0a244ec9..81a36086 100644
--- a/Modules/M3/Http/Controllers/userPickingStats5.php
+++ b/Modules/M3/Http/Controllers/userPickingStats5.php
@@ -103,7 +103,7 @@ class userPickingStats5 extends Controller
     {
         $statistics = [];
         $count = 0;
-        $url = 'http://' . $request->server('HTTP_HOST') . '/userPickingStats4';
+        $url = $request->getSchemeAndHttpHost() . '/userPickingStats4';
 
         for ($day = 0; $day <= $days; $day++) {
             $date = date('Y-m-d', strtotime($starting . "+$day days"));
diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php
index a2e91e37..c8ee050c 100644
--- a/Modules/M3/Http/Controllers/utilitiesContoller.php
+++ b/Modules/M3/Http/Controllers/utilitiesContoller.php
@@ -415,8 +415,6 @@ class utilitiesContoller extends Controller
     {
         print_r('>>> Generate PDF');
 
-        // $image = $builder->output('(10)123456(400)11(3906)333333');
-
         // $builder->setBarcodeType('gs1-128');
         // $builder->setFilename('barcode.png');
         // $builder->setImageFormat('png');
diff --git a/Modules/M3/Providers/M3ServiceProvider.php b/Modules/M3/Providers/M3ServiceProvider.php
index 21e3c706..a90783bc 100644
--- a/Modules/M3/Providers/M3ServiceProvider.php
+++ b/Modules/M3/Providers/M3ServiceProvider.php
@@ -79,9 +79,8 @@ class M3ServiceProvider extends ServiceProvider
         $commandPath = __DIR__ . '/../Console';
         $commands = collect(File::allFiles($commandPath))
             ->map(function ($file) {
-                $class = 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
+                return 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
 
-                return $class;
             })
             ->filter(function ($class) {
                 return class_exists($class);
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
index d78aae49..e5378f39 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3Delivery.blade.php
@@ -38,9 +38,6 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y")
-                        <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    else -->
                         @foreach($ICM664M as $key=>$val)
                             <tr>
                                 <td></td>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php
index 43c8ed77..865471c2 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/MFOrders.blade.php
@@ -19,7 +19,7 @@ Solon Sentinel Portal - Manifest Orders
                 </h6>
             </div>
             <div class="card-body">
-                <table class="table table-striped table-bordered table-hover" id="datatablesSimple5" width="100%">
+                <table class="table table-striped table-bordered table-hover" id="datatablesSimple5">
                     <thead>
                         <tr>
                             <th>Delivery note</th>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php
index 2451c424..c8370074 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/carrierMaint.blade.php
@@ -32,9 +32,6 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y")
-                        <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    else -->
                         @foreach($ICM160M as $key=>$val)
                             <tr>
                                 <td></td>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php
index 1a54f077..0770e46d 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/palletQty.blade.php
@@ -30,9 +30,6 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y")
-                        <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    else -->
                         @foreach($ICM709M as $key=>$val)
                             <tr>
                                 <td></td>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
index f7ef8091..9b6435e8 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/pendingClosure.blade.php
@@ -23,7 +23,7 @@ Solon Sentinel Portal - Trucks pending closure with M3
 
             </div>
             <div class="card-body">
-                <table class="table table-striped table-bordered table-hover" id="datatablesSimple5" width="100%">
+                <table class="table table-striped table-bordered table-hover" id="datatablesSimple5">
                     <thead>
                         <tr>
                             <th> </th>
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php
index 394fc8b4..f6a89ac8 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userControl.blade.php
@@ -51,18 +51,11 @@
                         </tr>
                     </thead>
                     <tbody>
-                    <!-- if($no_data=="Y")
-                        <tr> <td colspan=10 style="text-align:center; background-color:yellow"> <b>No data retrieved for this user</b> <td> <tr>
-                    else -->
                         @foreach($ICM428M as $key=>$val)
                             <tr>
                                 <td></td>
                                 <td>
                                     @if($power_user[0]->R428PWRUSR=="Y" && trim($val->R428US)!="TWOSHIP" && trim($val->R428US)!="TWOSHIP303" && trim($val->R428US)!="TWOSHIP322")
-                                        <!-- <a href="userControl/callCL?ACTION=P&USERID={{trim($val->R428US)}}">
-                                        <button name="userCallCLP{{trim($val->R428US)}}" type="submit" class="btn btn-sm btn-info userCallCL_click"
-                                        title="Reset password for user {{trim($val->R428US)}}"
-                                        ><i class="fas fa-lg fa-key"></i></button></a> -->
 
                                         @foreach($USER_INFO as $key2=>$val2)
                                             @if(trim($val2->USERPRF)==trim($val->R428US))
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
index 153a9c97..2c377581 100644
--- a/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/userPickingStats4.blade.php
@@ -82,11 +82,6 @@ Solon Sentinel Portal - Daily User Efficiency
                                 <td> {{ $val->HOUR }} </td>
                                 <td> {{ str_replace(' ','______',$val->A5PICKCMTS) }} </td>
                                 <td style="text-align:right"> {{ number_format($val->WEIGHT,2) }} </td>
-                                {{-- <!--<td style="text-align:right"> ${{ number_format($val->A5VALUE,2) }} </td>--> --}}
-                                <td style="text-align:right"> {{ number_format($val->A5PICKED,0) }} </td>
-                                <td style="text-align:right"> {{ $val->A5PART }} </td>
-                                <td style="text-align:left">
-                                    <!-- <a href="http://{{$_SERVER['SERVER_NAME']}}:{{ (stristr($_SERVER['DOCUMENT_ROOT'],'liv')?$request->ports['live']:$request->ports['test'])}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">  -->
                                     <a href="http://{{$_SERVER['HTTP_HOST']}}/php/AllSentPkr.php?order={{$val->A5ONO}}&release={{$val->A5RLNO}}&shipment={{$val->A5SHNO}}">
                                     {{ $val->A5ONO }}-{{ $val->A5RLNO }}-{{ $val->A5SHNO }}
                                     </a>