diff --git a/app/Models/Labels.php b/app/Models/Labels.php
index adddbbb..d346e5b 100644
--- a/app/Models/Labels.php
+++ b/app/Models/Labels.php
@@ -21,12 +21,12 @@ class Labels extends Model
 
     public static function deleteLabelsAssignedTo($service_id): void
     {
-        DB::table('labels_assigned')->where('service_id', $service_id)->delete();
+        LabelsAssigned::where('service_id', $service_id)->delete();
     }
 
     public static function deleteLabelAssignedAs($label_id): void
     {
-        DB::table('labels_assigned')->where('label_id', $label_id)->delete();
+        LabelsAssigned::where('label_id', $label_id)->delete();
     }
 
     public static function insertLabelsAssigned(array $labels_array, string $service_id): void
diff --git a/app/Models/Locations.php b/app/Models/Locations.php
index 34adb3f..706e14a 100644
--- a/app/Models/Locations.php
+++ b/app/Models/Locations.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 
 class Locations extends Model
 {
@@ -20,7 +19,7 @@ class Locations extends Model
     public static function allLocations(): array
     {
         return Cache::remember("locations", now()->addMonth(1), function () {
-            return DB::table('locations')->orderBy('name')->get()->toArray();
+            return self::orderBy('name')->get()->toArray();
         });
     }
 }
diff --git a/app/Models/OS.php b/app/Models/OS.php
index d5e9e77..01cd59b 100644
--- a/app/Models/OS.php
+++ b/app/Models/OS.php
@@ -5,7 +5,6 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 
 class OS extends Model
 {
@@ -20,7 +19,7 @@ class OS extends Model
     public static function allOS(): array
     {
         return Cache::remember("operating_systems", now()->addMonth(1), function () {
-            return DB::table('os')->orderBy('name')->get()->toArray();
+            return self::orderBy('name')->get()->toArray();
         });
     }
 }
diff --git a/app/Models/Providers.php b/app/Models/Providers.php
index c38a309..06ace39 100644
--- a/app/Models/Providers.php
+++ b/app/Models/Providers.php
@@ -20,7 +20,7 @@ class Providers extends Model
     public static function allProviders(): array
     {
         return Cache::remember("providers", now()->addMonth(1), function () {
-            return DB::table('providers')->orderBy('name')->get()->toArray();
+            return self::orderBy('name')->get()->toArray();
         });
     }