diff --git a/app/Http/Controllers/Api/V1/Filters/FilterController.php b/app/Http/Controllers/Api/V1/Filters/FilterController.php
index 7000ab7..d326d85 100644
--- a/app/Http/Controllers/Api/V1/Filters/FilterController.php
+++ b/app/Http/Controllers/Api/V1/Filters/FilterController.php
@@ -102,11 +102,13 @@ class FilterController extends Controller
             ->distinct('products.id')
             ->pluck('products.id');
 
-        return Category::where('is_visible', true)->ordered()->join('product_has_relations', 'categories.id', '=', 'product_has_relations.productable_id')
-            ->where('product_has_relations.productable_type', '=', 'category')
-            ->whereIntegerInRaw('product_has_relations.product_id', $products)
-            ->get(['id', 'parent_id', 'name'])
-            ->unique('categories.id');
+        return Category::where('is_visible', true)
+                ->ordered()
+                ->join('product_has_relations', 'categories.id', '=', 'product_has_relations.productable_id')
+                ->where('product_has_relations.productable_type', '=', 'category')
+                ->whereIntegerInRaw('product_has_relations.product_id', $products)
+                ->get(['categories.id', 'categories.parent_id', 'categories.name'])
+                ->unique('categories.id');
     }
 
     /**
diff --git a/app/Http/Controllers/Api/V1/Order/OrderPaymentController.php b/app/Http/Controllers/Api/V1/Order/OrderPaymentController.php
index 3becc94..8f74b05 100644
--- a/app/Http/Controllers/Api/V1/Order/OrderPaymentController.php
+++ b/app/Http/Controllers/Api/V1/Order/OrderPaymentController.php
@@ -14,7 +14,9 @@ class OrderPaymentController extends Controller
     public function index(): JsonResponse
     {
         return response()->rest(
-            PaymentType::all(['id', 'name'])
+            PaymentType::query()
+                ->where('is_enabled', true)
+                ->get(['id', 'name', 'is_enabled'])
                 ->map(fn ($paymentType) => [
                     'id' => $paymentType->id,
                     'name' => $paymentType->name,
diff --git a/app/Models/User.php b/app/Models/User.php
index f92a996..b9c4f33 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -13,24 +13,20 @@ use App\Models\Ecommerce\Product\Review\Review;
 use App\Models\Post\User\UserDoc;
 use App\Models\System\Settings\Location\UserAddress;
 use App\Repositories\System\Cache\CacheRepository;
-use BasementChat\Basement\Contracts\User as BasementUserContract;
-use BasementChat\Basement\Traits\HasPrivateMessages;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\DeletedModels\Models\Concerns\KeepsDeletedModels;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Authenticatable implements BasementUserContract
+class User
 {
     use HasApiTokens;
     use HasEcommerceChannels;
     use HasFactory;
-    use HasPrivateMessages;
     use HasRoles;
     use HasSchemalessAttributes;
     use InteractsWithNova;
diff --git a/routes/api/v1/v1-api.php b/routes/api/v1/v1-api.php
index d6e1d73..adb646e 100644
--- a/routes/api/v1/v1-api.php
+++ b/routes/api/v1/v1-api.php
@@ -101,12 +101,12 @@ Route::get('filters', [FilterController::class, 'index']);
 // Global orders...
 Route::post('global-order', [GlobalOrderController::class, 'store']);
 
-Route::middleware('auth:sanctum')->group(function () {
-    Route::get('/chat/contacts', [ChatController::class, 'contacts']);
-    Route::get('/chat/messages/{conversation}', [ChatController::class, 'messages']);
-    Route::post('/chat/start', [ChatController::class, 'start']);
-    Route::post('/chat/send', [ChatController::class, 'send']);
-});
+// Route::middleware('auth:sanctum')->group(function () {
+//     Route::get('/chat/contacts', [ChatController::class, 'contacts']);
+//     Route::get('/chat/messages/{conversation}', [ChatController::class, 'messages']);
+//     Route::post('/chat/start', [ChatController::class, 'start']);
+//     Route::post('/chat/send', [ChatController::class, 'send']);
+// });
 
 Route::middleware(['auth:sanctum', 'banned'])->group(function () {
     // Profile...