From 83812d98558441f72ae995690ba5eef2289bfd2b Mon Sep 17 00:00:00 2001
From: Alec Ritson <hello@itsalec.co.uk>
Date: Thu, 30 Mar 2023 11:55:16 +0100
Subject: [PATCH] :beer:

---
 .../Pricing/UpdateCustomerGroupPricing.php    |  2 -
 .../src/Actions/Pricing/UpdatePrices.php      |  3 --
 .../Actions/Pricing/UpdateTieredPricing.php   |  3 --
 .../admin/src/AdminHubServiceProvider.php     |  4 +-
 packages/admin/src/Assets/Asset.php           | 16 --------
 packages/admin/src/Assets/Script.php          |  2 -
 packages/admin/src/Assets/Style.php           |  2 -
 packages/admin/src/Auth/Impersonate.php       |  2 -
 packages/admin/src/Auth/Manifest.php          | 10 -----
 packages/admin/src/Auth/Permission.php        |  4 --
 .../admin/src/Base/ActivityLog/Manifest.php   |  2 -
 packages/admin/src/Base/SearchInterface.php   |  1 -
 .../src/DataTransferObjects/TableColumn.php   |  2 -
 .../Http/Controllers/ScriptsController.php    |  1 -
 .../src/Http/Controllers/StylesController.php |  1 -
 .../src/Http/Livewire/Components/Account.php  |  2 -
 .../Livewire/Components/ActivityLogFeed.php   |  4 --
 .../Http/Livewire/Components/BrandSearch.php  |  6 ---
 .../Livewire/Components/Brands/BrandShow.php  |  2 -
 .../Livewire/Components/CollectionSearch.php  |  6 ---
 .../Collections/CollectionGroupShow.php       |  6 ---
 .../Components/Collections/CollectionShow.php |  9 ----
 .../Components/Collections/CollectionTree.php |  3 --
 .../Components/Customers/CustomerShow.php     |  6 ---
 .../Components/Customers/CustomersTable.php   |  2 -
 .../Components/Discounts/AbstractDiscount.php | 12 ------
 .../Components/Discounts/DiscountCreate.php   |  2 -
 .../Components/Discounts/DiscountShow.php     |  4 --
 .../Discounts/Types/AbstractDiscountType.php  |  2 -
 .../Components/Discounts/Types/BuyXGetY.php   |  7 ----
 .../Components/FieldTypes/FileFieldtype.php   |  2 -
 .../Components/Orders/OrderCapture.php        |  2 -
 .../Components/Orders/OrderRefund.php         |  5 ---
 .../Livewire/Components/Orders/OrderShow.php  | 20 ---------
 .../Components/Orders/OrderStatus.php         | 10 -----
 .../Components/Orders/OrdersTable.php         |  2 -
 .../ProductOptions/OptionManager.php          |  5 ---
 .../ProductOptions/OptionValueCreateModal.php |  2 -
 .../Components/Products/AbstractProduct.php   | 14 -------
 .../Products/Options/OptionCreator.php        |  8 ----
 .../Products/Options/OptionSelector.php       |  2 -
 .../ProductTypes/AbstractProductType.php      |  6 ---
 .../Products/Tables/ProductTypesTable.php     |  2 -
 .../Products/Tables/ProductsTable.php         |  2 -
 .../Products/Variants/VariantShow.php         |  6 ---
 .../Settings/Attributes/AbstractAttribute.php |  2 -
 .../Settings/Attributes/AttributeEdit.php     |  6 ---
 .../Settings/Attributes/AttributeShow.php     |  2 -
 .../Settings/Channels/ChannelCreate.php       |  2 -
 .../Settings/Channels/ChannelShow.php         |  2 -
 .../Settings/Currencies/CurrencyCreate.php    |  2 -
 .../Settings/Currencies/CurrencyShow.php      |  2 -
 .../CustomerGroups/CustomerGroupCreate.php    |  4 --
 .../CustomerGroups/CustomerGroupShow.php      |  4 --
 .../Settings/Languages/LanguageCreate.php     |  2 -
 .../Settings/Languages/LanguageShow.php       |  2 -
 .../Settings/Product/Options/OptionEdit.php   |  5 ---
 .../Settings/Product/Options/OptionsIndex.php |  4 --
 .../Settings/Staff/AbstractStaff.php          |  4 --
 .../Components/Settings/Tables/StaffTable.php |  2 -
 .../Settings/Taxes/AbstractTaxZone.php        | 13 ------
 .../Settings/Taxes/TaxClassesIndex.php        |  4 --
 .../Tables/Actions/UpdateStatus.php           |  5 ---
 .../src/Http/Livewire/Components/Tags.php     |  4 --
 .../admin/src/Http/Livewire/Dashboard.php     |  4 --
 .../Http/Livewire/Pages/Brands/BrandShow.php  |  2 -
 .../Pages/Discounts/DiscountCreate.php        |  2 -
 .../Livewire/Pages/Discounts/DiscountShow.php |  2 -
 .../Livewire/Pages/Products/ProductShow.php   |  2 -
 .../Products/ProductTypes/ProductTypeShow.php |  2 -
 .../Pages/Products/Variants/VariantShow.php   |  4 --
 .../Pages/Settings/Channels/ChannelShow.php   |  2 -
 .../Settings/Currencies/CurrencyShow.php      |  2 -
 .../Settings/Product/Options/OptionEdit.php   |  2 -
 .../Livewire/Traits/CanExtendValidation.php   |  6 ---
 .../src/Http/Livewire/Traits/HasImages.php    |  5 ---
 .../src/Http/Livewire/Traits/HasPrices.php    | 10 -----
 .../src/Http/Livewire/Traits/HasTags.php      |  4 --
 .../Http/Livewire/Traits/SearchesProducts.php |  5 ---
 .../Http/Livewire/Traits/WithAttributes.php   |  1 -
 .../src/Http/Middleware/Authenticate.php      |  1 -
 .../Middleware/RedirectIfAuthenticated.php    |  2 -
 .../src/Jobs/Products/GenerateVariants.php    |  4 --
 .../SetStaffAuthMiddlewareListener.php        | 14 -------
 packages/admin/src/LunarHub.php               | 10 -----
 packages/admin/src/Menu/MenuRegistry.php      |  2 -
 packages/admin/src/Menu/MenuSlot.php          |  4 --
 packages/admin/src/Menu/SettingsMenu.php      | 10 -----
 packages/admin/src/Models/Staff.php           |  7 ----
 packages/admin/src/Models/StaffPermission.php |  2 -
 packages/admin/src/Slots/SlotRegistry.php     |  5 ---
 .../Tables/Builders/OrdersTableBuilder.php    |  2 -
 packages/admin/src/Tables/TableBuilder.php    |  3 --
 .../src/Views/Components/Branding/Logo.php    |  4 --
 .../admin/src/Views/Components/Dropdown.php   |  2 -
 .../admin/src/Views/Components/Errors.php     |  2 -
 .../Views/Components/Input/Autocomplete.php   |  2 -
 .../Components/Input/Autocomplete/Item.php    |  2 -
 .../src/Views/Components/Input/Datepicker.php |  4 --
 .../src/Views/Components/Input/Fileupload.php |  2 -
 .../src/Views/Components/Input/Group.php      |  4 --
 .../src/Views/Components/Input/Price.php      |  2 -
 .../src/Views/Components/Input/Richtext.php   |  2 -
 .../src/Views/Components/Input/Select.php     |  2 -
 .../admin/src/Views/Components/Input/Tags.php |  2 -
 .../admin/src/Views/Components/Input/Text.php |  2 -
 .../src/Views/Components/Input/Textarea.php   |  2 -
 .../admin/src/Views/Components/ModelUrl.php   |  4 --
 .../src/Views/Components/Notification.php     |  2 -
 .../src/Views/Components/Orders/Status.php    |  4 --
 .../src/Views/Components/Table/Heading.php    |  5 ---
 packages/admin/src/helpers.php                |  1 -
 packages/core/database/seeders/DemoSeeder.php |  2 -
 .../core/database/seeders/TestingSeeder.php   |  2 -
 .../core/src/Actions/Carts/AssociateUser.php  |  3 --
 .../core/src/Actions/Carts/CalculateLine.php  |  1 -
 .../Actions/Carts/CalculateLineSubtotal.php   |  1 -
 .../core/src/Actions/Carts/CreateOrder.php    |  1 -
 .../src/Actions/Carts/GetExistingCartLine.php |  5 ---
 packages/core/src/Actions/Carts/MergeCart.php |  2 -
 .../src/Actions/Carts/RemovePurchasable.php   |  2 -
 .../src/Actions/Carts/SetShippingOption.php   |  1 -
 .../Actions/Carts/ValidateCartForOrder.php    |  1 -
 .../src/Actions/Collections/SortProducts.php  |  1 -
 .../Collections/SortProductsByPrice.php       |  2 -
 .../Actions/Collections/SortProductsBySku.php |  1 -
 packages/core/src/Addons/Manifest.php         |  2 -
 packages/core/src/Base/AttributeManifest.php  |  2 -
 .../src/Base/AttributeManifestInterface.php   |  2 -
 packages/core/src/Base/BaseModel.php          |  2 -
 packages/core/src/Base/CartLineModifier.php   |  6 ---
 .../core/src/Base/CartSessionInterface.php    |  9 ----
 .../core/src/Base/Casts/AsAttributeData.php   |  1 -
 .../src/Base/DiscountManagerInterface.php     | 14 -------
 .../core/src/Base/DiscountTypeInterface.php   |  2 -
 packages/core/src/Base/FieldType.php          |  6 ---
 packages/core/src/Base/Migration.php          |  2 -
 packages/core/src/Base/ModelManifest.php      | 26 ------------
 .../core/src/Base/ModelManifestInterface.php  | 11 -----
 .../Base/OrderReferenceGeneratorInterface.php |  3 --
 .../core/src/Base/PaymentTypeInterface.php    | 15 -------
 .../core/src/Base/PricingManagerInterface.php |  6 ---
 packages/core/src/Base/Purchasable.php        |  2 -
 packages/core/src/Base/ShippingManifest.php   |  2 -
 .../src/Base/ShippingManifestInterface.php    |  4 --
 packages/core/src/Base/ShippingModifiers.php  |  2 -
 packages/core/src/Base/TaxDriver.php          | 10 -----
 .../Base/Traits/CanScheduleAvailability.php   |  8 ----
 .../core/src/Base/Traits/HasAttributes.php    |  2 -
 .../src/Base/Traits/HasCustomerGroups.php     |  6 ---
 packages/core/src/Base/Traits/HasMedia.php    |  2 -
 .../src/Base/Traits/HasModelExtending.php     |  7 ----
 .../core/src/Base/Traits/HasTranslations.php  |  1 -
 .../core/src/Base/Traits/LogsActivity.php     |  2 -
 packages/core/src/Base/Traits/Searchable.php  |  2 -
 .../Validation/CouponValidatorInterface.php   |  3 --
 .../src/Base/ValueObjects/Cart/FreeItem.php   |  6 ---
 .../src/Base/ValueObjects/Cart/Promotion.php  |  6 ---
 .../Base/ValueObjects/Cart/TaxBreakdown.php   |  1 -
 .../src/Console/Commands/ScoutIndexer.php     |  1 -
 packages/core/src/Console/InstallLunar.php    |  6 ---
 packages/core/src/DataTypes/Price.php         |  2 -
 .../core/src/DataTypes/ShippingOption.php     |  4 --
 .../DiscountTypes/AbstractDiscountType.php    | 11 -----
 packages/core/src/DiscountTypes/AmountOff.php |  9 ----
 packages/core/src/DiscountTypes/BuyXGetY.php  |  2 -
 packages/core/src/Drivers/SystemTaxDriver.php | 13 ------
 .../src/Exceptions/Carts/CartException.php    |  2 -
 packages/core/src/FieldTypes/File.php         |  2 -
 packages/core/src/Generators/UrlGenerator.php |  3 --
 .../Collections/RebuildCollectionTree.php     |  4 --
 .../Collections/UpdateProductPositions.php    |  4 --
 .../Jobs/Products/Associations/Associate.php  |  3 --
 .../Jobs/Products/Associations/Dissociate.php |  3 --
 packages/core/src/Jobs/SyncTags.php           |  6 ---
 .../src/Listeners/CartSessionAuthListener.php |  2 -
 packages/core/src/LunarServiceProvider.php    |  8 ----
 .../core/src/Managers/CartSessionManager.php  |  4 --
 .../core/src/Managers/DiscountManager.php     | 16 --------
 packages/core/src/Managers/PricingManager.php |  6 ---
 packages/core/src/Models/Address.php          |  3 --
 packages/core/src/Models/Attribute.php        |  7 ----
 packages/core/src/Models/AttributeGroup.php   |  2 -
 packages/core/src/Models/Brand.php            |  6 ---
 packages/core/src/Models/Cart.php             | 41 -------------------
 packages/core/src/Models/CartAddress.php      | 10 -----
 packages/core/src/Models/CartLine.php         | 18 --------
 packages/core/src/Models/Channel.php          |  2 -
 packages/core/src/Models/Collection.php       |  4 --
 packages/core/src/Models/CollectionGroup.php  |  2 -
 packages/core/src/Models/Country.php          |  2 -
 packages/core/src/Models/Currency.php         |  2 -
 packages/core/src/Models/Customer.php         |  2 -
 packages/core/src/Models/CustomerGroup.php    |  2 -
 packages/core/src/Models/Discount.php         |  5 ---
 packages/core/src/Models/Language.php         |  2 -
 packages/core/src/Models/Order.php            |  2 -
 packages/core/src/Models/OrderAddress.php     |  2 -
 packages/core/src/Models/OrderLine.php        |  2 -
 packages/core/src/Models/Price.php            |  2 -
 packages/core/src/Models/Product.php          |  4 --
 .../core/src/Models/ProductAssociation.php    |  6 ---
 packages/core/src/Models/ProductOption.php    |  2 -
 .../core/src/Models/ProductOptionValue.php    |  2 -
 packages/core/src/Models/ProductType.php      |  2 -
 packages/core/src/Models/ProductVariant.php   |  4 --
 packages/core/src/Models/State.php            |  2 -
 packages/core/src/Models/Tag.php              |  2 -
 packages/core/src/Models/TaxClass.php         |  2 -
 packages/core/src/Models/TaxRate.php          |  2 -
 packages/core/src/Models/TaxRateAmount.php    |  2 -
 packages/core/src/Models/TaxZone.php          |  2 -
 packages/core/src/Models/TaxZoneCountry.php   |  2 -
 .../core/src/Models/TaxZoneCustomerGroup.php  |  2 -
 packages/core/src/Models/TaxZonePostcode.php  |  2 -
 packages/core/src/Models/TaxZoneState.php     |  2 -
 packages/core/src/Models/Transaction.php      |  2 -
 packages/core/src/Models/Url.php              |  2 -
 packages/core/src/Models/UserDetail.php       |  4 --
 packages/core/src/Models/UserPermission.php   |  2 -
 .../core/src/Observers/AddressObserver.php    |  2 -
 .../core/src/Observers/CartLineObserver.php   |  2 -
 .../core/src/Observers/ChannelObserver.php    |  5 ---
 .../core/src/Observers/CollectionObserver.php |  1 -
 .../core/src/Observers/CurrencyObserver.php   |  5 ---
 .../src/Observers/CustomerGroupObserver.php   |  5 ---
 .../core/src/Observers/LanguageObserver.php   |  5 ---
 .../core/src/Observers/OrderLineObserver.php  |  2 -
 packages/core/src/Observers/UrlObserver.php   |  4 --
 .../core/src/PaymentTypes/AbstractPayment.php |  2 -
 .../core/src/Validation/BaseValidator.php     |  8 ----
 .../core/tests/Stubs/TestDiscountType.php     |  2 -
 packages/core/tests/Stubs/TestTaxDriver.php   | 11 -----
 .../core/tests/Stubs/TestUrlGenerator.php     |  1 -
 .../tests/Unit/DiscountTypes/BuyXGetYTest.php |  1 +
 packages/licensing/src/License.php            |  3 ++
 .../tests/Unit/LicenseManagerTest.php         |  2 +-
 packages/licensing/tests/Unit/LicenseTest.php |  2 -
 .../src/Components/Actions/Action.php         |  1 -
 .../src/Components/Actions/BulkAction.php     |  3 --
 .../src/Components/Columns/AvatarColumn.php   |  2 -
 .../src/Components/Columns/BaseColumn.php     |  4 --
 .../src/Components/Concerns/HasClosure.php    |  3 --
 .../Concerns/HasLivewireComponent.php         |  5 ---
 .../Components/Concerns/HasSavedSearches.php  |  8 ----
 .../Components/Concerns/HasViewComponent.php  |  5 ---
 utils/livewire-tables/src/Components/Head.php |  2 -
 .../livewire-tables/src/Components/Table.php  | 12 ------
 .../src/Support/TableBuilder.php              | 22 ----------
 .../src/Support/TableBuilderInterface.php     | 31 --------------
 .../src/DatabaseEngine.php                    |  6 ---
 .../src/ScoutDatabaseServiceProvider.php      |  2 -
 .../tests/TestServiceProvider.php             |  2 -
 253 files changed, 7 insertions(+), 1101 deletions(-)

diff --git a/packages/admin/src/Actions/Pricing/UpdateCustomerGroupPricing.php b/packages/admin/src/Actions/Pricing/UpdateCustomerGroupPricing.php
index c540b98c1b..f6da870c43 100644
--- a/packages/admin/src/Actions/Pricing/UpdateCustomerGroupPricing.php
+++ b/packages/admin/src/Actions/Pricing/UpdateCustomerGroupPricing.php
@@ -10,8 +10,6 @@ class UpdateCustomerGroupPricing
     /**
      * Execute the action.
      *
-     * @param  Model  $owner
-     * @param  \Illuminate\Support\Collection  $groups
      * @return \Illuminate\Support\Collection
      */
     public function execute(Model $owner, Collection $groups)
diff --git a/packages/admin/src/Actions/Pricing/UpdatePrices.php b/packages/admin/src/Actions/Pricing/UpdatePrices.php
index 5c08b960e6..f9461cc543 100644
--- a/packages/admin/src/Actions/Pricing/UpdatePrices.php
+++ b/packages/admin/src/Actions/Pricing/UpdatePrices.php
@@ -12,8 +12,6 @@ class UpdatePrices
     /**
      * Execute the action.
      *
-     * @param  Model  $owner
-     * @param  \Illuminate\Support\Collection  $prices
      * @return \Illuminate\Support\Collection
      */
     public function execute(Model $owner, Collection $prices)
@@ -39,7 +37,6 @@ public function execute(Model $owner, Collection $prices)
     /**
      * Create or update a price.
      *
-     * @param  Model  $owner
      * @param  int  $tier
      * @param  int|null  $groupId
      * @param  float  $price
diff --git a/packages/admin/src/Actions/Pricing/UpdateTieredPricing.php b/packages/admin/src/Actions/Pricing/UpdateTieredPricing.php
index d1849b6ca3..002af298bb 100644
--- a/packages/admin/src/Actions/Pricing/UpdateTieredPricing.php
+++ b/packages/admin/src/Actions/Pricing/UpdateTieredPricing.php
@@ -13,8 +13,6 @@ class UpdateTieredPricing
     /**
      * Execute the action.
      *
-     * @param  Model  $owner
-     * @param  \Illuminate\Support\Collection  $tieredPrices
      * @return \Illuminate\Support\Collection
      */
     public function execute(Model $owner, Collection $tieredPrices)
@@ -51,7 +49,6 @@ public function execute(Model $owner, Collection $tieredPrices)
     /**
      * Create or update a price.
      *
-     * @param  Model  $owner
      * @param  int  $tier
      * @param  int|null  $groupId
      * @param  float  $price
diff --git a/packages/admin/src/AdminHubServiceProvider.php b/packages/admin/src/AdminHubServiceProvider.php
index f0a6f93bb9..29b6d08922 100644
--- a/packages/admin/src/AdminHubServiceProvider.php
+++ b/packages/admin/src/AdminHubServiceProvider.php
@@ -119,13 +119,13 @@
 use Lunar\Hub\Menu\SettingsMenu;
 use Lunar\Hub\Menu\SidebarMenu;
 use Lunar\Hub\Menu\SlotRegistry;
+use Lunar\Hub\Models\Staff;
 use Lunar\Hub\Tables\Builders\CustomersTableBuilder;
 use Lunar\Hub\Tables\Builders\OrdersTableBuilder;
 use Lunar\Hub\Tables\Builders\ProductsTableBuilder;
 use Lunar\Hub\Tables\Builders\ProductTypesTableBuilder;
 use Lunar\Hub\Tables\Builders\ProductVariantsTableBuilder;
 use Lunar\Models\Product;
-use Lunar\Hub\Models\Staff;
 
 class AdminHubServiceProvider extends ServiceProvider
 {
@@ -500,7 +500,7 @@ protected function registerAuthGuard()
 
         $this->app['config']->set('auth.guards.staff', [
             'driver' => 'session',
-            'provider' => 'staff'
+            'provider' => 'staff',
         ]);
     }
 
diff --git a/packages/admin/src/Assets/Asset.php b/packages/admin/src/Assets/Asset.php
index 948f9f7977..7495441e31 100644
--- a/packages/admin/src/Assets/Asset.php
+++ b/packages/admin/src/Assets/Asset.php
@@ -11,8 +11,6 @@ abstract class Asset implements Responsable
 {
     /**
      * Name of the asset.
-     *
-     * @var string
      */
     protected string $name;
 
@@ -33,8 +31,6 @@ abstract class Asset implements Responsable
     /**
      * Construct a new Asset instance.
      *
-     * @param  string|self  $name
-     * @param  string  $path
      * @param  bool|null  $remote
      */
     public function __construct(string|self $name, string $path, $remote = null)
@@ -60,9 +56,6 @@ public function __construct(string|self $name, string $path, $remote = null)
 
     /**
      * Make a remote URL.
-     *
-     * @param  string  $path
-     * @return static
      */
     public static function remote(string $path): static
     {
@@ -71,8 +64,6 @@ public static function remote(string $path): static
 
     /**
      * Get asset name.
-     *
-     * @return string
      */
     public function name(): string
     {
@@ -81,8 +72,6 @@ public function name(): string
 
     /**
      * Get asset path.
-     *
-     * @return string
      */
     public function path(): string
     {
@@ -91,8 +80,6 @@ public function path(): string
 
     /**
      * Determine if URL is remote.
-     *
-     * @return bool
      */
     public function isRemote(): bool
     {
@@ -103,7 +90,6 @@ public function isRemote(): bool
      * Create an HTTP response that represents the object.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function toResponse($request): Response
     {
@@ -116,8 +102,6 @@ public function toResponse($request): Response
 
     /**
      * Get asset url.
-     *
-     * @return string
      */
     abstract public function url(): string;
 
diff --git a/packages/admin/src/Assets/Script.php b/packages/admin/src/Assets/Script.php
index 864d3b9210..f508c8a6e4 100644
--- a/packages/admin/src/Assets/Script.php
+++ b/packages/admin/src/Assets/Script.php
@@ -6,8 +6,6 @@ class Script extends Asset
 {
     /**
      * Get asset url.
-     *
-     * @return string
      */
     public function url(): string
     {
diff --git a/packages/admin/src/Assets/Style.php b/packages/admin/src/Assets/Style.php
index 11dfe6fd8b..492733a7ce 100644
--- a/packages/admin/src/Assets/Style.php
+++ b/packages/admin/src/Assets/Style.php
@@ -6,8 +6,6 @@ class Style extends Asset
 {
     /**
      * Get asset url.
-     *
-     * @return string
      */
     public function url(): string
     {
diff --git a/packages/admin/src/Auth/Impersonate.php b/packages/admin/src/Auth/Impersonate.php
index 4f9bd75434..cfd05cb4e1 100644
--- a/packages/admin/src/Auth/Impersonate.php
+++ b/packages/admin/src/Auth/Impersonate.php
@@ -8,8 +8,6 @@ abstract class Impersonate
 {
     /**
      * Return the URL for impersonation.
-     *
-     * @return string
      */
     abstract public function getUrl(Authenticatable $authenticatable): string;
 }
diff --git a/packages/admin/src/Auth/Manifest.php b/packages/admin/src/Auth/Manifest.php
index 7970a45936..5a9a8b6289 100644
--- a/packages/admin/src/Auth/Manifest.php
+++ b/packages/admin/src/Auth/Manifest.php
@@ -8,8 +8,6 @@ class Manifest
 {
     /**
      * A collection of permissions loaded into the manifest.
-     *
-     * @var Collection
      */
     protected Collection $permissions;
 
@@ -23,8 +21,6 @@ public function __construct()
 
     /**
      * Returns all permissions loaded in the manifest.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getPermissions(): Collection
     {
@@ -34,8 +30,6 @@ public function getPermissions(): Collection
     /**
      * Returns permissions grouped by their handle
      * For example, settings:channel would become a child of settings.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getGroupedPermissions(): Collection
     {
@@ -56,7 +50,6 @@ public function getGroupedPermissions(): Collection
     /**
      * Returns the parent permission based on handle naming.
      *
-     * @param  Permission  $permission
      * @return null|\Lunar\Hub\Acl\Permission
      */
     protected function getParentPermission(Permission $permission)
@@ -73,7 +66,6 @@ protected function getParentPermission(Permission $permission)
     /**
      * Adds a permission to the manifest if it doesn't already exist.
      *
-     * @param  \Closure  $callback
      * @return void
      */
     public function addPermission(\Closure $callback)
@@ -93,8 +85,6 @@ public function addPermission(\Closure $callback)
 
     /**
      * Returns the base permissions which are required by Lunar.
-     *
-     * @return array
      */
     protected function getBasePermissions(): array
     {
diff --git a/packages/admin/src/Auth/Permission.php b/packages/admin/src/Auth/Permission.php
index 9e82dcc896..37c0ce62d2 100644
--- a/packages/admin/src/Auth/Permission.php
+++ b/packages/admin/src/Auth/Permission.php
@@ -29,15 +29,11 @@ class Permission
 
     /**
      * Whether this is a first party permission, set by Lunar.
-     *
-     * @var bool
      */
     public bool $firstParty = true;
 
     /**
      * A collection of related, children permissions.
-     *
-     * @var Collection
      */
     public Collection $children;
 
diff --git a/packages/admin/src/Base/ActivityLog/Manifest.php b/packages/admin/src/Base/ActivityLog/Manifest.php
index 292972cd88..4c9e8f3a17 100644
--- a/packages/admin/src/Base/ActivityLog/Manifest.php
+++ b/packages/admin/src/Base/ActivityLog/Manifest.php
@@ -41,8 +41,6 @@ class Manifest
     /**
      * Add an activity log render.
      *
-     * @param  string  $subject
-     * @param  string  $renderer
      * @return self
      */
     public function addRender(string $subject, string $renderer)
diff --git a/packages/admin/src/Base/SearchInterface.php b/packages/admin/src/Base/SearchInterface.php
index 442642a1f9..0d1f6fadd0 100644
--- a/packages/admin/src/Base/SearchInterface.php
+++ b/packages/admin/src/Base/SearchInterface.php
@@ -13,7 +13,6 @@ interface SearchInterface
      * @param  array  $options
      * @param  int  $perPage
      * @param  int  $page
-     * @return SearchResults
      */
     public function search($term, $options = [], $perPage = 25, $page = 1): SearchResults;
 }
diff --git a/packages/admin/src/DataTransferObjects/TableColumn.php b/packages/admin/src/DataTransferObjects/TableColumn.php
index 5548cae5d0..728df2a9c2 100644
--- a/packages/admin/src/DataTransferObjects/TableColumn.php
+++ b/packages/admin/src/DataTransferObjects/TableColumn.php
@@ -17,7 +17,6 @@ public function __construct(
     /**
      * Set the value for the table column with a closure.
      *
-     * @param  Closure  $callback
      * @return void
      */
     public function value(Closure $callback)
@@ -30,7 +29,6 @@ public function value(Closure $callback)
     /**
      * Set whether the column should be sortable.
      *
-     * @param  bool  $sortable
      * @return void
      */
     public function sortable(bool $sortable = true)
diff --git a/packages/admin/src/Http/Controllers/ScriptsController.php b/packages/admin/src/Http/Controllers/ScriptsController.php
index c569510ca8..beec03cd82 100644
--- a/packages/admin/src/Http/Controllers/ScriptsController.php
+++ b/packages/admin/src/Http/Controllers/ScriptsController.php
@@ -10,7 +10,6 @@
 class ScriptsController extends Controller
 {
     /**
-     * @param  string  $script
      * @return \Lunar\Hub\Assets\Script
      *
      * @throws HttpException
diff --git a/packages/admin/src/Http/Controllers/StylesController.php b/packages/admin/src/Http/Controllers/StylesController.php
index ce519b763a..4ffc54d0df 100644
--- a/packages/admin/src/Http/Controllers/StylesController.php
+++ b/packages/admin/src/Http/Controllers/StylesController.php
@@ -10,7 +10,6 @@
 class StylesController extends Controller
 {
     /**
-     * @param  string  $style
      * @return \Lunar\Hub\Assets\Script
      *
      * @throws HttpException
diff --git a/packages/admin/src/Http/Livewire/Components/Account.php b/packages/admin/src/Http/Livewire/Components/Account.php
index 15819328c3..6acf5d4967 100644
--- a/packages/admin/src/Http/Livewire/Components/Account.php
+++ b/packages/admin/src/Http/Livewire/Components/Account.php
@@ -13,8 +13,6 @@ class Account extends Component
 
     /**
      * The staff account being edited.
-     *
-     * @var Staff
      */
     public Staff $staff;
 
diff --git a/packages/admin/src/Http/Livewire/Components/ActivityLogFeed.php b/packages/admin/src/Http/Livewire/Components/ActivityLogFeed.php
index f574e545c8..d4bf4b474b 100644
--- a/packages/admin/src/Http/Livewire/Components/ActivityLogFeed.php
+++ b/packages/admin/src/Http/Livewire/Components/ActivityLogFeed.php
@@ -15,15 +15,11 @@ class ActivityLogFeed extends Component
 
     /**
      * The log subject to get activity for.
-     *
-     * @var \Illuminate\Database\Eloquent\Model
      */
     public Model $subject;
 
     /**
      * The new comment for the subject.
-     *
-     * @var string|null
      */
     public ?string $comment = null;
 
diff --git a/packages/admin/src/Http/Livewire/Components/BrandSearch.php b/packages/admin/src/Http/Livewire/Components/BrandSearch.php
index 6cfb2c9fc1..91c50446da 100644
--- a/packages/admin/src/Http/Livewire/Components/BrandSearch.php
+++ b/packages/admin/src/Http/Livewire/Components/BrandSearch.php
@@ -10,8 +10,6 @@ class BrandSearch extends Component
 {
     /**
      * Should the browser be visible?
-     *
-     * @var bool
      */
     public bool $showBrowser = false;
 
@@ -31,15 +29,11 @@ class BrandSearch extends Component
 
     /**
      * Any existing brands to exclude from selecting.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $existing;
 
     /**
      * The currently selected brands.
-     *
-     * @var array
      */
     public array $selected = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Brands/BrandShow.php b/packages/admin/src/Http/Livewire/Components/Brands/BrandShow.php
index bb38d840a6..9455137525 100644
--- a/packages/admin/src/Http/Livewire/Components/Brands/BrandShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Brands/BrandShow.php
@@ -22,8 +22,6 @@ class BrandShow extends Component
 
     /**
      * The current brand we're showing.
-     *
-     * @var Brand
      */
     public Brand $brand;
 
diff --git a/packages/admin/src/Http/Livewire/Components/CollectionSearch.php b/packages/admin/src/Http/Livewire/Components/CollectionSearch.php
index db90f62bd1..065b584a40 100644
--- a/packages/admin/src/Http/Livewire/Components/CollectionSearch.php
+++ b/packages/admin/src/Http/Livewire/Components/CollectionSearch.php
@@ -11,8 +11,6 @@ class CollectionSearch extends Component
 {
     /**
      * Should the browser be visible?
-     *
-     * @var bool
      */
     public bool $showBrowser = false;
 
@@ -32,15 +30,11 @@ class CollectionSearch extends Component
 
     /**
      * Any existing collections to exclude from selecting.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $existing;
 
     /**
      * The currently selected collections.
-     *
-     * @var array
      */
     public array $selected = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Collections/CollectionGroupShow.php b/packages/admin/src/Http/Livewire/Components/Collections/CollectionGroupShow.php
index d225a17c03..b7eddb965e 100644
--- a/packages/admin/src/Http/Livewire/Components/Collections/CollectionGroupShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Collections/CollectionGroupShow.php
@@ -20,8 +20,6 @@ class CollectionGroupShow extends Component
 
     /**
      * The current collection group.
-     *
-     * @var CollectionGroup
      */
     public CollectionGroup $group;
 
@@ -34,15 +32,11 @@ class CollectionGroupShow extends Component
 
     /**
      * Show confirmation if we want to delete the group.
-     *
-     * @var bool
      */
     public bool $showDeleteConfirm = false;
 
     /**
      * Failsafe confirmation in order to delete the collection group.
-     *
-     * @var bool
      */
     public bool $deletionConfirm = false;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Collections/CollectionShow.php b/packages/admin/src/Http/Livewire/Components/Collections/CollectionShow.php
index 551189f75c..d17a11f80d 100644
--- a/packages/admin/src/Http/Livewire/Components/Collections/CollectionShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Collections/CollectionShow.php
@@ -32,8 +32,6 @@ class CollectionShow extends Component
 
     /**
      * The collection we are currently editing.
-     *
-     * @var \Lunar\Models\Collection
      */
     public Collection $collection;
 
@@ -46,15 +44,11 @@ class CollectionShow extends Component
 
     /**
      * The products attached to the collection.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public \Illuminate\Support\Collection $products;
 
     /**
      * Whether products have been loaded.
-     *
-     * @var bool
      */
     public bool $productsLoaded = false;
 
@@ -225,7 +219,6 @@ public function updatedCollectionSort($value)
     /**
      * Sort the products.
      *
-     * @param  array  $payload
      * @return void
      */
     public function sortProducts(array $payload)
@@ -386,7 +379,6 @@ protected function getValidationMessages()
     /**
      * Map products ready for display/sorting.
      *
-     * @param  \Illuminate\Support\Collection  $products
      * @return \Illuminate\Support\Collection
      */
     protected function mapProducts(\Illuminate\Support\Collection $products)
@@ -415,7 +407,6 @@ protected function refreshSorting($column, $direction)
     /**
      * Map a product into the array.
      *
-     * @param  Product  $product
      * @param  bool  $pendingSave
      * @return array
      */
diff --git a/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php b/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php
index 85242dddd4..d8102ece57 100644
--- a/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php
+++ b/packages/admin/src/Http/Livewire/Components/Collections/CollectionTree.php
@@ -14,8 +14,6 @@ class CollectionTree extends Component
 
     /**
      * The nodes for the tree.
-     *
-     * @var array
      */
     public array $nodes;
 
@@ -185,7 +183,6 @@ public function collectionsChanged($parentId)
     /**
      * Refresh the tree with a new set of nodes.
      *
-     * @param  array  $nodes
      * @return void
      */
     public function refreshTree(array $nodes)
diff --git a/packages/admin/src/Http/Livewire/Components/Customers/CustomerShow.php b/packages/admin/src/Http/Livewire/Components/Customers/CustomerShow.php
index a9f23ed38f..b468ec41c7 100644
--- a/packages/admin/src/Http/Livewire/Components/Customers/CustomerShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Customers/CustomerShow.php
@@ -35,15 +35,11 @@ class CustomerShow extends Component
 
     /**
      * The current customer in view.
-     *
-     * @var \Lunar\Models\Customer
      */
     public Customer $customer;
 
     /**
      * An array of synced customer groups.
-     *
-     * @var array
      */
     public array $syncedGroups = [];
 
@@ -103,8 +99,6 @@ class CustomerShow extends Component
 
     /**
      * The current address we want to edit.
-     *
-     * @var Address|null
      */
     public ?Address $address = null;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Customers/CustomersTable.php b/packages/admin/src/Http/Livewire/Components/Customers/CustomersTable.php
index 0f5ebd1807..d53d62472b 100644
--- a/packages/admin/src/Http/Livewire/Components/Customers/CustomersTable.php
+++ b/packages/admin/src/Http/Livewire/Components/Customers/CustomersTable.php
@@ -104,8 +104,6 @@ public function saveSearch()
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php b/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
index 3cf30fcb35..ac705c2180 100644
--- a/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
+++ b/packages/admin/src/Http/Livewire/Components/Discounts/AbstractDiscount.php
@@ -27,8 +27,6 @@ abstract class AbstractDiscount extends Component
 
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
@@ -55,22 +53,16 @@ abstract class AbstractDiscount extends Component
 
     /**
      * The selected conditions
-     *
-     * @var array
      */
     public array $selectedConditions = [];
 
     /**
      * The selected rewards.
-     *
-     * @var array
      */
     public array $selectedRewards = [];
 
     /**
      * The current currency for editing
-     *
-     * @var Currency
      */
     public Currency $currency;
 
@@ -190,7 +182,6 @@ public function getDiscountComponent()
     /**
      * Sync the discount data with what's provided.
      *
-     * @param  array  $data
      * @return void
      */
     public function syncDiscountData(array $data)
@@ -204,7 +195,6 @@ public function syncDiscountData(array $data)
     /**
      * Select brands given an array of IDs
      *
-     * @param  array  $ids
      * @return void
      */
     public function selectBrands(array $ids)
@@ -219,7 +209,6 @@ public function selectBrands(array $ids)
     /**
      * Select collections given an array of IDs
      *
-     * @param  array  $ids
      * @return void
      */
     public function selectCollections(array $ids)
@@ -234,7 +223,6 @@ public function selectCollections(array $ids)
     /**
      * Select products given an array of IDs
      *
-     * @param  array  $ids
      * @return void
      */
     public function selectProducts(array $ids)
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php
index 88578e1598..9adc55ad5a 100644
--- a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php
+++ b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountCreate.php
@@ -11,8 +11,6 @@ class DiscountCreate extends AbstractDiscount
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountShow.php b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountShow.php
index 817bdc7055..caa06593b6 100644
--- a/packages/admin/src/Http/Livewire/Components/Discounts/DiscountShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Discounts/DiscountShow.php
@@ -10,15 +10,11 @@ class DiscountShow extends AbstractDiscount
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
     /**
      * The confirmation text to delete the discount.
-     *
-     * @var string|null
      */
     public ?string $deleteConfirm = null;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/Types/AbstractDiscountType.php b/packages/admin/src/Http/Livewire/Components/Discounts/Types/AbstractDiscountType.php
index 86ac5bddb2..b89e6bee31 100644
--- a/packages/admin/src/Http/Livewire/Components/Discounts/Types/AbstractDiscountType.php
+++ b/packages/admin/src/Http/Livewire/Components/Discounts/Types/AbstractDiscountType.php
@@ -9,8 +9,6 @@ abstract class AbstractDiscountType extends Component
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Discounts/Types/BuyXGetY.php b/packages/admin/src/Http/Livewire/Components/Discounts/Types/BuyXGetY.php
index 63bcbc7735..7ec5fad951 100644
--- a/packages/admin/src/Http/Livewire/Components/Discounts/Types/BuyXGetY.php
+++ b/packages/admin/src/Http/Livewire/Components/Discounts/Types/BuyXGetY.php
@@ -12,22 +12,16 @@ class BuyXGetY extends AbstractDiscountType
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
     /**
      * The product discount conditions
-     *
-     * @var Collection
      */
     public Collection $conditions;
 
     /**
      * The product discount rewards
-     *
-     * @var Collection
      */
     public Collection $rewards;
 
@@ -147,7 +141,6 @@ public function removeReward($productId)
     /**
      * Select products
      *
-     * @param  array  $ids
      * @param  string|null  $ref
      * @return void
      */
diff --git a/packages/admin/src/Http/Livewire/Components/FieldTypes/FileFieldtype.php b/packages/admin/src/Http/Livewire/Components/FieldTypes/FileFieldtype.php
index 9320e7e1a1..60a177b7f5 100644
--- a/packages/admin/src/Http/Livewire/Components/FieldTypes/FileFieldtype.php
+++ b/packages/admin/src/Http/Livewire/Components/FieldTypes/FileFieldtype.php
@@ -36,8 +36,6 @@ class FileFieldtype extends Component
 
     /**
      * Array of selected assets.
-     *
-     * @var array
      */
     public array $selected = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrderCapture.php b/packages/admin/src/Http/Livewire/Components/Orders/OrderCapture.php
index 1517fe024b..f7932cc147 100644
--- a/packages/admin/src/Http/Livewire/Components/Orders/OrderCapture.php
+++ b/packages/admin/src/Http/Livewire/Components/Orders/OrderCapture.php
@@ -34,8 +34,6 @@ class OrderCapture extends Component
 
     /**
      * The instance of the order to capture.
-     *
-     * @var Order
      */
     public Order $order;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrderRefund.php b/packages/admin/src/Http/Livewire/Components/Orders/OrderRefund.php
index 3442cf7615..a8e79da9c5 100644
--- a/packages/admin/src/Http/Livewire/Components/Orders/OrderRefund.php
+++ b/packages/admin/src/Http/Livewire/Components/Orders/OrderRefund.php
@@ -27,8 +27,6 @@ class OrderRefund extends Component
 
     /**
      * Any notes for the refund.
-     *
-     * @var string
      */
     public string $notes = '';
 
@@ -41,8 +39,6 @@ class OrderRefund extends Component
 
     /**
      * The instance of the order to refund.
-     *
-     * @var Order
      */
     public Order $order;
 
@@ -90,7 +86,6 @@ public function mount()
     /**
      * Update the refund amount.
      *
-     * @param  int  $val
      * @return void
      */
     public function updateRefundAmount(int $val)
diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrderShow.php b/packages/admin/src/Http/Livewire/Components/Orders/OrderShow.php
index 80de61a32c..e739bb41ac 100644
--- a/packages/admin/src/Http/Livewire/Components/Orders/OrderShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Orders/OrderShow.php
@@ -18,8 +18,6 @@ class OrderShow extends Component
 
     /**
      * The current order in view.
-     *
-     * @var \Lunar\Models\Order
      */
     public Order $order;
 
@@ -39,64 +37,46 @@ class OrderShow extends Component
 
     /**
      * Whether all lines should be visible.
-     *
-     * @var bool
      */
     public bool $allLinesVisible = false;
 
     /**
      * The maximum lines to show on load.
-     *
-     * @var int
      */
     public int $maxLines = 5;
 
     /**
      * The new comment property.
-     *
-     * @var string
      */
     public string $comment = '';
 
     /**
      * Whether to show the update status modal.
-     *
-     * @var bool
      */
     public bool $showUpdateStatus = false;
 
     /**
      * Whether to show the address edit screen.
-     *
-     * @var bool
      */
     public bool $showShippingAddressEdit = false;
 
     /**
      * Whether to show the billing address edit.
-     *
-     * @var bool
      */
     public bool $showBillingAddressEdit = false;
 
     /**
      * The currently selected lines.
-     *
-     * @var array
      */
     public array $selectedLines = [];
 
     /**
      * Whether to show the refund panel.
-     *
-     * @var bool
      */
     public bool $showRefund = false;
 
     /**
      * Whether to show the capture panel.
-     *
-     * @var bool
      */
     public bool $showCapture = false;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrderStatus.php b/packages/admin/src/Http/Livewire/Components/Orders/OrderStatus.php
index bcd151cf20..1580e0f5c4 100644
--- a/packages/admin/src/Http/Livewire/Components/Orders/OrderStatus.php
+++ b/packages/admin/src/Http/Livewire/Components/Orders/OrderStatus.php
@@ -22,8 +22,6 @@ class OrderStatus extends Component
 
     /**
      * The order to edit.
-     *
-     * @var Order
      */
     public Order $order;
 
@@ -36,15 +34,11 @@ class OrderStatus extends Component
 
     /**
      * The selected mailers to send.
-     *
-     * @var array
      */
     public array $selectedMailers = [];
 
     /**
      * The template we want to preview.
-     *
-     * @var string|null
      */
     public ?string $previewTemplate = null;
 
@@ -57,8 +51,6 @@ class OrderStatus extends Component
 
     /**
      * The email addresses to use for the mailers.
-     *
-     * @var array
      */
     public array $emailAddresses = [];
 
@@ -71,8 +63,6 @@ class OrderStatus extends Component
 
     /**
      * The phone numbers to use for the notifications.
-     *
-     * @var array
      */
     public array $phoneNumbers = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php b/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php
index 121a8d55a0..439602b4d3 100644
--- a/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php
+++ b/packages/admin/src/Http/Livewire/Components/Orders/OrdersTable.php
@@ -208,8 +208,6 @@ public function saveSearch()
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionManager.php b/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionManager.php
index 644bb5c562..b95c57ba50 100644
--- a/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionManager.php
+++ b/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionManager.php
@@ -10,15 +10,11 @@ class OptionManager extends Component
 {
     /**
      * The options to display.
-     *
-     * @var Collection
      */
     public Collection $options;
 
     /**
      * Which option values we have selected.
-     *
-     * @var array
      */
     public array $selectedValues = [];
 
@@ -116,7 +112,6 @@ public function updatedSelectedOption($val)
      * Remove an option from the collection
      *
      * @param  int|string  $key
-     * @return
      */
     public function removeOption($key)
     {
diff --git a/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionValueCreateModal.php b/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionValueCreateModal.php
index 2371d4fffa..094af3ef99 100644
--- a/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionValueCreateModal.php
+++ b/packages/admin/src/Http/Livewire/Components/ProductOptions/OptionValueCreateModal.php
@@ -14,8 +14,6 @@ class OptionValueCreateModal extends Component
 
     /**
      * The parent product option for this new value.
-     *
-     * @var null|\Lunar\Models\ProductOption
      */
     public ?ProductOption $option = null;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Products/AbstractProduct.php b/packages/admin/src/Http/Livewire/Components/Products/AbstractProduct.php
index 704be37f48..e93146e3c5 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/AbstractProduct.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/AbstractProduct.php
@@ -48,15 +48,11 @@ abstract class AbstractProduct extends Component
 
     /**
      * The current product we are editing.
-     *
-     * @var Product
      */
     public Product $product;
 
     /**
      * The current variant we're editing.
-     *
-     * @var ProductVariant
      */
     public ProductVariant $variant;
 
@@ -69,15 +65,11 @@ abstract class AbstractProduct extends Component
 
     /**
      * Whether to use a custom brand.
-     *
-     * @var bool
      */
     public bool $useNewBrand = false;
 
     /**
      * The options we want to use for the product.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $options;
 
@@ -104,8 +96,6 @@ abstract class AbstractProduct extends Component
 
     /**
      * Determines whether the options panel should be on show.
-     *
-     * @var bool
      */
     public bool $optionsPanelVisible = false;
 
@@ -167,15 +157,11 @@ abstract class AbstractProduct extends Component
 
     /**
      * The current product associations.
-     *
-     * @var Collection
      */
     public Collection $associations;
 
     /**
      * Associations that need removing.
-     *
-     * @var array
      */
     public array $associationsToRemove = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Products/Options/OptionCreator.php b/packages/admin/src/Http/Livewire/Components/Products/Options/OptionCreator.php
index 9c7dabe265..88bbe872ca 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/Options/OptionCreator.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/Options/OptionCreator.php
@@ -15,29 +15,21 @@ class OptionCreator extends Component
 
     /**
      * The name of the new option.
-     *
-     * @var array
      */
     public array $name = [];
 
     /**
      * The instance of the option to be created.
-     *
-     * @var \Lunar\Models\ProductOption
      */
     public ProductOption $option;
 
     /**
      * The collection of new values to associate to the option.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $values;
 
     /**
      * The collection of current languages.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $languages;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Products/Options/OptionSelector.php b/packages/admin/src/Http/Livewire/Components/Products/Options/OptionSelector.php
index 6371222265..4c5fb6ead7 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/Options/OptionSelector.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/Options/OptionSelector.php
@@ -12,8 +12,6 @@ class OptionSelector extends Component
 
     /**
      * The selected options that have been chosen.
-     *
-     * @var array
      */
     public array $selected = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php b/packages/admin/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php
index 47f9685eab..6c0a24cb2f 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/ProductTypes/AbstractProductType.php
@@ -28,22 +28,16 @@ abstract class AbstractProductType extends Component
 
     /**
      * Instance of the parent product.
-     *
-     * @var \Lunar\Models\ProductType
      */
     public ProductType $productType;
 
     /**
      * Attributes which are ready to be synced.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $selectedProductAttributes;
 
     /**
      * Attributes which are ready to be synced.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $selectedVariantAttributes;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductTypesTable.php b/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductTypesTable.php
index 3798ca85b1..ef2932dcdf 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductTypesTable.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductTypesTable.php
@@ -105,8 +105,6 @@ public function saveSearch()
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductsTable.php b/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductsTable.php
index 89a4acc0b3..aa5ad9fcd8 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductsTable.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/Tables/ProductsTable.php
@@ -172,8 +172,6 @@ public function saveSearch()
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Products/Variants/VariantShow.php b/packages/admin/src/Http/Livewire/Components/Products/Variants/VariantShow.php
index da4eb8d00b..310bc7a53f 100644
--- a/packages/admin/src/Http/Livewire/Components/Products/Variants/VariantShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Products/Variants/VariantShow.php
@@ -38,15 +38,11 @@ class VariantShow extends Component
 
     /**
      * Instance of the parent product.
-     *
-     * @var \Lunar\Models\Product
      */
     public Product $product;
 
     /**
      * Instance of the product variant.
-     *
-     * @var \Lunar\Models\ProductVariant
      */
     public ProductVariant $variant;
 
@@ -66,8 +62,6 @@ class VariantShow extends Component
 
     /**
      * The new values to generate the variant.
-     *
-     * @var array
      */
     public array $newValues = [];
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AbstractAttribute.php b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AbstractAttribute.php
index 3a70394897..46cd0ab118 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AbstractAttribute.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AbstractAttribute.php
@@ -15,8 +15,6 @@ abstract class AbstractAttribute extends Component
 {
     /**
      * Define whether the handle should be treated as manually input.
-     *
-     * @var bool
      */
     public bool $manualHandle = false;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeEdit.php b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeEdit.php
index df33b91710..50d9f67293 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeEdit.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeEdit.php
@@ -32,15 +32,11 @@ class AttributeEdit extends Component
 
     /**
      * Whether the panel should be visible.
-     *
-     * @var bool
      */
     public bool $panelVisible = true;
 
     /**
      * Whether the user has input a handle manually.
-     *
-     * @var bool
      */
     public bool $manualHandle = false;
 
@@ -138,8 +134,6 @@ public function getFieldTypesProperty()
 
     /**
      * Return the selected field type.
-     *
-     * @return
      */
     public function getFieldType()
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php
index 336df3f538..94ae952b50 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Attributes/AttributeShow.php
@@ -24,8 +24,6 @@ class AttributeShow extends AbstractAttribute
 
     /**
      * The sorted attribute groups.
-     *
-     * @var Collection
      */
     public Collection $sortedAttributeGroups;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelCreate.php b/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelCreate.php
index e3cad190b8..0e20dca0c7 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelCreate.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelCreate.php
@@ -12,8 +12,6 @@ class ChannelCreate extends Component
 
     /**
      * A new instance of the channel model.
-     *
-     * @var Channel
      */
     public Channel $channel;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelShow.php
index 0380fe02f5..8454aa2419 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Channels/ChannelShow.php
@@ -12,8 +12,6 @@ class ChannelShow extends Component
 
     /**
      * The current channel we're showing.
-     *
-     * @var Channel
      */
     public Channel $channel;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyCreate.php b/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyCreate.php
index 0245fa26b1..214685d502 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyCreate.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyCreate.php
@@ -12,8 +12,6 @@ class CurrencyCreate extends Component
 
     /**
      * The empty currency model.
-     *
-     * @var Currency
      */
     public Currency $currency;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyShow.php
index 32f33c559e..7a49c334d7 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Currencies/CurrencyShow.php
@@ -15,8 +15,6 @@ class CurrencyShow extends Component
 
     /**
      * The instance of the currency we're viewing.
-     *
-     * @var \Lunar\Models\Currency
      */
     public Currency $currency;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupCreate.php b/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupCreate.php
index 15441b825e..2bddbc4f1d 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupCreate.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupCreate.php
@@ -13,15 +13,11 @@ class CustomerGroupCreate extends Component
 
     /**
      * A new instance of the customer group model.
-     *
-     * @var CustomerGroup
      */
     public CustomerGroup $customerGroup;
 
     /**
      * Define whether the handle should be treated as manually input.
-     *
-     * @var bool
      */
     public bool $manualHandle = false;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupShow.php b/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupShow.php
index 527e0d44c7..ccf000725d 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/CustomerGroups/CustomerGroupShow.php
@@ -15,8 +15,6 @@ class CustomerGroupShow extends Component
 
     /**
      * The current customer group we're showing.
-     *
-     * @var CustomerGroup
      */
     public CustomerGroup $customerGroup;
 
@@ -29,8 +27,6 @@ class CustomerGroupShow extends Component
 
     /**
      * Define whether the handle should be treated as manually input.
-     *
-     * @var bool
      */
     public bool $manualHandle = true;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageCreate.php b/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageCreate.php
index 400c948426..00bb4f35ec 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageCreate.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageCreate.php
@@ -12,8 +12,6 @@ class LanguageCreate extends Component
 
     /**
      * A new instance of the language model.
-     *
-     * @var \Lunar\Models\Language
      */
     public Language $language;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageShow.php b/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageShow.php
index 6cb789b0d1..d7d640cfe3 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageShow.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Languages/LanguageShow.php
@@ -12,8 +12,6 @@ class LanguageShow extends Component
 
     /**
      * The current language we're showing.
-     *
-     * @var \Lunar\Models\Language
      */
     public Language $language;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionEdit.php b/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionEdit.php
index 05498b23ff..a6f23710bb 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionEdit.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionEdit.php
@@ -32,15 +32,11 @@ class OptionEdit extends Component
 
     /**
      * The new option value to create.
-     *
-     * @var ProductOptionValue
      */
     public ProductOptionValue $newProductOptionValue;
 
     /**
      * The option values.
-     *
-     * @var array
      */
     public array $values = [];
 
@@ -119,7 +115,6 @@ public function rules()
     /**
      * Sort the option values.
      *
-     * @param  array  $optionValues
      * @return void
      */
     public function sortOptionValues(array $optionValues)
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionsIndex.php b/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionsIndex.php
index 069e4e4546..b3ab2d8a6d 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionsIndex.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Product/Options/OptionsIndex.php
@@ -28,8 +28,6 @@ class OptionsIndex extends Component
 
     /**
      * The sorted product options.
-     *
-     * @var Collection
      */
     public Collection $productOptions;
 
@@ -170,8 +168,6 @@ public function refreshGroups()
 
     /**
      * Return the option marked for deletion.
-     *
-     * @return \Lunar\Models\ProductOption|null
      */
     public function getOptionToDeleteProperty(): ?ProductOption
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Staff/AbstractStaff.php b/packages/admin/src/Http/Livewire/Components/Settings/Staff/AbstractStaff.php
index b37a5be3ab..260a1980a0 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Staff/AbstractStaff.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Staff/AbstractStaff.php
@@ -14,15 +14,11 @@ abstract class AbstractStaff extends Component
 
     /**
      * The staff model for the staff member we want to show.
-     *
-     * @var \Lunar\Hub\Models\Staff
      */
     public Staff $staff;
 
     /**
      * The current staff assigned permissions.
-     *
-     * @var Collection
      */
     public Collection $staffPermissions;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Tables/StaffTable.php b/packages/admin/src/Http/Livewire/Components/Settings/Tables/StaffTable.php
index 89ab237d7f..725629a15d 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Tables/StaffTable.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Tables/StaffTable.php
@@ -104,8 +104,6 @@ public function saveSearch()
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Taxes/AbstractTaxZone.php b/packages/admin/src/Http/Livewire/Components/Settings/Taxes/AbstractTaxZone.php
index 01301419c6..c51549471e 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Taxes/AbstractTaxZone.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Taxes/AbstractTaxZone.php
@@ -20,22 +20,16 @@ abstract class AbstractTaxZone extends Component
 
     /**
      * The instance of the Tax Zone.
-     *
-     * @var TaxZone
      */
     public TaxZone $taxZone;
 
     /**
      * The selected countries for the zone.
-     *
-     * @var array
      */
     public array $selectedCountries = [];
 
     /**
      * The selected states for the zone.
-     *
-     * @var array
      */
     public array $selectedStates = [];
 
@@ -69,22 +63,16 @@ abstract class AbstractTaxZone extends Component
 
     /**
      * The tax rates for the tax zone.
-     *
-     * @var array
      */
     public array $taxRates = [];
 
     /**
      * The tax rate amounts for the tax zone.
-     *
-     * @var array
      */
     public array $taxRateAmounts = [];
 
     /**
      * The linked customer groups.
-     *
-     * @var array
      */
     public array $customerGroups = [];
 
@@ -305,7 +293,6 @@ protected function syncCustomerGroups()
     /**
      * Sync states for the TaxZone.
      *
-     * @param  array  $selectedStates
      * @return void
      */
     protected function syncStates(array $selectedStates)
diff --git a/packages/admin/src/Http/Livewire/Components/Settings/Taxes/TaxClassesIndex.php b/packages/admin/src/Http/Livewire/Components/Settings/Taxes/TaxClassesIndex.php
index ebe08592f5..cd3df40793 100644
--- a/packages/admin/src/Http/Livewire/Components/Settings/Taxes/TaxClassesIndex.php
+++ b/packages/admin/src/Http/Livewire/Components/Settings/Taxes/TaxClassesIndex.php
@@ -14,8 +14,6 @@ class TaxClassesIndex extends Component
 
     /**
      * The TaxClass to edit.
-     *
-     * @var null|TaxClass
      */
     public ?TaxClass $taxClass = null;
 
@@ -28,8 +26,6 @@ class TaxClassesIndex extends Component
 
     /**
      * Whether the TaxClass should be deleted on save.
-     *
-     * @var bool
      */
     public bool $deleting = false;
 
diff --git a/packages/admin/src/Http/Livewire/Components/Tables/Actions/UpdateStatus.php b/packages/admin/src/Http/Livewire/Components/Tables/Actions/UpdateStatus.php
index 4c6df274fb..f7f4d91529 100644
--- a/packages/admin/src/Http/Livewire/Components/Tables/Actions/UpdateStatus.php
+++ b/packages/admin/src/Http/Livewire/Components/Tables/Actions/UpdateStatus.php
@@ -12,8 +12,6 @@ class UpdateStatus extends Component
 
     /**
      * The array of selected IDs
-     *
-     * @var array
      */
     public array $ids = [];
 
@@ -47,7 +45,6 @@ public function getStatusesProperty()
     /**
      * Set the selected ids
      *
-     * @param  array  $rows
      * @return void
      */
     public function setSelected(array $rows)
@@ -57,8 +54,6 @@ public function setSelected(array $rows)
 
     /**
      * Save the updated status
-     *
-     * @return
      */
     public function updateStatus()
     {
diff --git a/packages/admin/src/Http/Livewire/Components/Tags.php b/packages/admin/src/Http/Livewire/Components/Tags.php
index 62da7ba321..3676332b9f 100644
--- a/packages/admin/src/Http/Livewire/Components/Tags.php
+++ b/packages/admin/src/Http/Livewire/Components/Tags.php
@@ -22,15 +22,11 @@ class Tags extends Component
 
     /**
      * The model to associate tags to.
-     *
-     * @var Model
      */
     public Model $taggable;
 
     /**
      * The search term for showing relevant available tags.
-     *
-     * @var string|null
      */
     public ?string $searchTerm = null;
 
diff --git a/packages/admin/src/Http/Livewire/Dashboard.php b/packages/admin/src/Http/Livewire/Dashboard.php
index e8d3fe67f2..a46197971a 100644
--- a/packages/admin/src/Http/Livewire/Dashboard.php
+++ b/packages/admin/src/Http/Livewire/Dashboard.php
@@ -17,8 +17,6 @@ class Dashboard extends Component
 {
     /**
      * The date range for the dashboard reports.
-     *
-     * @var array
      */
     public array $range = [
         'from' => null,
@@ -46,8 +44,6 @@ public function rules()
 
     /**
      * Get the computed property for new products count.
-     *
-     * @return int
      */
     public function getNewProductsCountProperty(): int
     {
diff --git a/packages/admin/src/Http/Livewire/Pages/Brands/BrandShow.php b/packages/admin/src/Http/Livewire/Pages/Brands/BrandShow.php
index 028916acc4..cf881c58fe 100644
--- a/packages/admin/src/Http/Livewire/Pages/Brands/BrandShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Brands/BrandShow.php
@@ -9,8 +9,6 @@ class BrandShow extends Component
 {
     /**
      * The instance of the brand we want to edit.
-     *
-     * @var Brand
      */
     public Brand $brand;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountCreate.php b/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountCreate.php
index 1d22b72952..c518f91c43 100644
--- a/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountCreate.php
+++ b/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountCreate.php
@@ -9,8 +9,6 @@ class DiscountCreate extends Component
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountShow.php b/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountShow.php
index 3de0632014..c6fadd3d4c 100644
--- a/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Discounts/DiscountShow.php
@@ -9,8 +9,6 @@ class DiscountShow extends Component
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Products/ProductShow.php b/packages/admin/src/Http/Livewire/Pages/Products/ProductShow.php
index de8a1213be..897e5bf2a2 100644
--- a/packages/admin/src/Http/Livewire/Pages/Products/ProductShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Products/ProductShow.php
@@ -9,8 +9,6 @@ class ProductShow extends Component
 {
     /**
      * The Product we are currently editing.
-     *
-     * @var \Lunar\Models\Product
      */
     public Product $product;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Products/ProductTypes/ProductTypeShow.php b/packages/admin/src/Http/Livewire/Pages/Products/ProductTypes/ProductTypeShow.php
index 58b3e484a3..983b2f54e1 100644
--- a/packages/admin/src/Http/Livewire/Pages/Products/ProductTypes/ProductTypeShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Products/ProductTypes/ProductTypeShow.php
@@ -9,8 +9,6 @@ class ProductTypeShow extends Component
 {
     /**
      * The Product we are currently editing.
-     *
-     * @var \Lunar\Models\ProductType
      */
     public ProductType $productType;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Products/Variants/VariantShow.php b/packages/admin/src/Http/Livewire/Pages/Products/Variants/VariantShow.php
index 395b730658..35c3f8f8dd 100644
--- a/packages/admin/src/Http/Livewire/Pages/Products/Variants/VariantShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Products/Variants/VariantShow.php
@@ -10,15 +10,11 @@ class VariantShow extends Component
 {
     /**
      * The current product.
-     *
-     * @var \Lunar\Models\Product
      */
     public Product $product;
 
     /**
      * The current variant.
-     *
-     * @var \Lunar\Models\ProductVariant
      */
     public ProductVariant $variant;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Settings/Channels/ChannelShow.php b/packages/admin/src/Http/Livewire/Pages/Settings/Channels/ChannelShow.php
index 7a6caf43ec..372492b2b5 100644
--- a/packages/admin/src/Http/Livewire/Pages/Settings/Channels/ChannelShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Settings/Channels/ChannelShow.php
@@ -9,8 +9,6 @@ class ChannelShow extends Component
 {
     /**
      * The instance of the channel we want to edit.
-     *
-     * @var Channel
      */
     public Channel $channel;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Settings/Currencies/CurrencyShow.php b/packages/admin/src/Http/Livewire/Pages/Settings/Currencies/CurrencyShow.php
index d43bf59f4b..2dd198bff8 100644
--- a/packages/admin/src/Http/Livewire/Pages/Settings/Currencies/CurrencyShow.php
+++ b/packages/admin/src/Http/Livewire/Pages/Settings/Currencies/CurrencyShow.php
@@ -9,8 +9,6 @@ class CurrencyShow extends Component
 {
     /**
      * The instance of the channel we want to edit.
-     *
-     * @var \Lunar\Models\Currency
      */
     public Currency $currency;
 
diff --git a/packages/admin/src/Http/Livewire/Pages/Settings/Product/Options/OptionEdit.php b/packages/admin/src/Http/Livewire/Pages/Settings/Product/Options/OptionEdit.php
index 5397ca350d..dd21b5ecd1 100644
--- a/packages/admin/src/Http/Livewire/Pages/Settings/Product/Options/OptionEdit.php
+++ b/packages/admin/src/Http/Livewire/Pages/Settings/Product/Options/OptionEdit.php
@@ -9,8 +9,6 @@ class OptionEdit extends Component
 {
     /**
      * The option to edit.
-     *
-     * @var \Lunar\Models\ProductOption
      */
     public ProductOption $productOption;
 
diff --git a/packages/admin/src/Http/Livewire/Traits/CanExtendValidation.php b/packages/admin/src/Http/Livewire/Traits/CanExtendValidation.php
index bbb8331ec1..61ea61b5d2 100644
--- a/packages/admin/src/Http/Livewire/Traits/CanExtendValidation.php
+++ b/packages/admin/src/Http/Livewire/Traits/CanExtendValidation.php
@@ -12,8 +12,6 @@ trait CanExtendValidation
 
     /**
      * Extend validation rules
-     *
-     * @return void
      */
     public static function extendValidation(array $rules, array $messages = []): void
     {
@@ -23,8 +21,6 @@ public static function extendValidation(array $rules, array $messages = []): voi
 
     /**
      * Get extended validation rules
-     *
-     * @return array
      */
     protected function getExtendedValidationRules($parameters): array
     {
@@ -50,8 +46,6 @@ protected function getExtendedValidationRules($parameters): array
 
     /**
      * Get extended validation messages
-     *
-     * @return array
      */
     protected function getExtendedValidationMessages(): array
     {
diff --git a/packages/admin/src/Http/Livewire/Traits/HasImages.php b/packages/admin/src/Http/Livewire/Traits/HasImages.php
index 3dcc649580..9d7f887905 100644
--- a/packages/admin/src/Http/Livewire/Traits/HasImages.php
+++ b/packages/admin/src/Http/Livewire/Traits/HasImages.php
@@ -28,15 +28,11 @@ trait HasImages
 
     /**
      * An array of selected images.
-     *
-     * @var array
      */
     public array $selectedImages = [];
 
     /**
      * Whether to shoe the image select modal dialog.
-     *
-     * @var bool
      */
     public bool $showImageSelectModal = false;
 
@@ -135,7 +131,6 @@ abstract protected function getMediaModel();
      * Method to handle when Livewire uploads a product image.
      *
      * @param  string  $name
-     * @param  array  $filenames
      * @return void
      */
     public function handleUploadFinished($name, array $filenames = [])
diff --git a/packages/admin/src/Http/Livewire/Traits/HasPrices.php b/packages/admin/src/Http/Livewire/Traits/HasPrices.php
index 7fcba0207f..d44882e616 100644
--- a/packages/admin/src/Http/Livewire/Traits/HasPrices.php
+++ b/packages/admin/src/Http/Livewire/Traits/HasPrices.php
@@ -24,8 +24,6 @@ trait HasPrices
 
     /**
      * Collection of customer group prices.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $customerGroupPrices;
 
@@ -38,15 +36,11 @@ trait HasPrices
 
     /**
      * The currency currency.
-     *
-     * @var \Lunar\Models\Currency
      */
     public Currency $currency;
 
     /**
      * Whether customer group pricing is enabled.
-     *
-     * @var bool
      */
     public bool $customerPricingEnabled = false;
 
@@ -86,7 +80,6 @@ public function mountHasPrices()
     /**
      * Save pricing.
      *
-     * @param  Collection|null  $basePrices
      * @param  Collecton|null  $tierPrices
      * @return void
      */
@@ -230,7 +223,6 @@ public function getTaxClassesProperty()
     /**
      * Return mapped base prices.
      *
-     * @param  \Illuminate\Support\Collection  $prices
      * @return \Illuminate\Support\Collection
      */
     private function mapBasePrices(Collection $prices)
@@ -265,7 +257,6 @@ private function mapBasePrices(Collection $prices)
     /**
      * Return mapped customer group prices.
      *
-     * @param  \Illuminate\Support\Collection  $prices
      * @return \Illuminate\Support\Collection
      */
     private function mapCustomerGroupPrices(Collection $prices)
@@ -301,7 +292,6 @@ private function mapCustomerGroupPrices(Collection $prices)
     /**
      * Return mapped tiered pricing.
      *
-     * @param  \Illuminate\Support\Collection  $prices
      * @return \Illuminate\Support\Collection
      */
     private function mapTieredPrices(Collection $prices)
diff --git a/packages/admin/src/Http/Livewire/Traits/HasTags.php b/packages/admin/src/Http/Livewire/Traits/HasTags.php
index 5021cd0d34..6c445d39ba 100644
--- a/packages/admin/src/Http/Livewire/Traits/HasTags.php
+++ b/packages/admin/src/Http/Livewire/Traits/HasTags.php
@@ -6,8 +6,6 @@ trait HasTags
 {
     /**
      * Array of tags to assign.
-     *
-     * @var array
      */
     public array $tags = [];
 
@@ -18,8 +16,6 @@ public function mountHasTags()
 
     /**
      * Computed property for existing tags.
-     *
-     * @return array
      */
     abstract public function getExistingTagsProperty(): array;
 }
diff --git a/packages/admin/src/Http/Livewire/Traits/SearchesProducts.php b/packages/admin/src/Http/Livewire/Traits/SearchesProducts.php
index 609e05b306..a81e9f6fb0 100644
--- a/packages/admin/src/Http/Livewire/Traits/SearchesProducts.php
+++ b/packages/admin/src/Http/Livewire/Traits/SearchesProducts.php
@@ -11,8 +11,6 @@ trait SearchesProducts
 {
     /**
      * Method to return computed brands.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getBrandsProperty(): Collection
     {
@@ -21,8 +19,6 @@ public function getBrandsProperty(): Collection
 
     /**
      * Method to return computed product types.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getProductTypesProperty(): Collection
     {
@@ -34,7 +30,6 @@ public function getProductTypesProperty(): Collection
      *
      * @param  string  $column
      * @param  string  $term
-     * @return \Illuminate\Support\Collection
      */
     protected function searchDistinct($column, $term = null): Collection
     {
diff --git a/packages/admin/src/Http/Livewire/Traits/WithAttributes.php b/packages/admin/src/Http/Livewire/Traits/WithAttributes.php
index 3a01209208..06fdadfaac 100644
--- a/packages/admin/src/Http/Livewire/Traits/WithAttributes.php
+++ b/packages/admin/src/Http/Livewire/Traits/WithAttributes.php
@@ -55,7 +55,6 @@ protected function mapAttributes()
     /**
      * Parse the attributes into the correct collection format.
      *
-     * @param  \Illuminate\Support\Collection  $attributes
      * @return \Illuminate\Support\Collection
      */
     protected function parseAttributes(Collection $attributes, $existingData, $key = 'attributeMapping')
diff --git a/packages/admin/src/Http/Middleware/Authenticate.php b/packages/admin/src/Http/Middleware/Authenticate.php
index ea5d11d693..10965fd2bc 100644
--- a/packages/admin/src/Http/Middleware/Authenticate.php
+++ b/packages/admin/src/Http/Middleware/Authenticate.php
@@ -23,7 +23,6 @@ protected function redirectTo($request)
      * Determine if the user is logged in to any of the given guards.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  array  $guards
      * @return void
      *
      * @throws \Illuminate\Auth\AuthenticationException
diff --git a/packages/admin/src/Http/Middleware/RedirectIfAuthenticated.php b/packages/admin/src/Http/Middleware/RedirectIfAuthenticated.php
index 409a07c6dd..2fd48deaff 100644
--- a/packages/admin/src/Http/Middleware/RedirectIfAuthenticated.php
+++ b/packages/admin/src/Http/Middleware/RedirectIfAuthenticated.php
@@ -11,8 +11,6 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
      * @return mixed
      */
     public function handle(Request $request, Closure $next)
diff --git a/packages/admin/src/Jobs/Products/GenerateVariants.php b/packages/admin/src/Jobs/Products/GenerateVariants.php
index 2cf3753642..46aac6e126 100644
--- a/packages/admin/src/Jobs/Products/GenerateVariants.php
+++ b/packages/admin/src/Jobs/Products/GenerateVariants.php
@@ -35,8 +35,6 @@ class GenerateVariants implements ShouldQueue
 
     /**
      * The option values to use to generate variants.
-     *
-     * @var array
      */
     protected array $optionValues;
 
@@ -45,8 +43,6 @@ class GenerateVariants implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param  \Lunar\Models\Product  $product
-     * @param  iterable  $optionValues
      * @return void
      */
     public function __construct(Product $product, iterable $optionValues, $additional = false)
diff --git a/packages/admin/src/Listeners/SetStaffAuthMiddlewareListener.php b/packages/admin/src/Listeners/SetStaffAuthMiddlewareListener.php
index 3032a6de4c..4c440b3a79 100644
--- a/packages/admin/src/Listeners/SetStaffAuthMiddlewareListener.php
+++ b/packages/admin/src/Listeners/SetStaffAuthMiddlewareListener.php
@@ -8,15 +8,11 @@
 
 class SetStaffAuthMiddlewareListener
 {
-    /**
-     * @var \Illuminate\Routing\Events\RouteMatched
-     */
     protected RouteMatched $event;
 
     /**
      * Handle the event.
      *
-     * @param  RouteMatched  $event
      * @return void
      */
     public function handle(RouteMatched $event)
@@ -32,8 +28,6 @@ public function handle(RouteMatched $event)
 
     /**
      * Check if the route already has the staff middleware.
-     *
-     * @return bool
      */
     protected function routeAlreadyHasStaffMiddleware(): bool
     {
@@ -42,8 +36,6 @@ protected function routeAlreadyHasStaffMiddleware(): bool
 
     /**
      * Matches livewire routes which are allowed to use auth:staff middleware.
-     *
-     * @return bool
      */
     protected function shouldApplyStaffMiddleware(): bool
     {
@@ -52,8 +44,6 @@ protected function shouldApplyStaffMiddleware(): bool
 
     /**
      * Matches hub routes.
-     *
-     * @return bool
      */
     protected function onlyHubRoutes(): bool
     {
@@ -66,8 +56,6 @@ protected function onlyHubRoutes(): bool
 
     /**
      * List of livewire routes which are not allowed to use auth:staff middleware.
-     *
-     * @return bool
      */
     protected function disallowRoutes(): bool
     {
@@ -79,8 +67,6 @@ protected function disallowRoutes(): bool
 
     /**
      * Matches livewire route which use dot separator.
-     *
-     * @return bool
      */
     protected function isLivewireRoute(): bool
     {
diff --git a/packages/admin/src/LunarHub.php b/packages/admin/src/LunarHub.php
index f4df23986f..d3c09862ad 100644
--- a/packages/admin/src/LunarHub.php
+++ b/packages/admin/src/LunarHub.php
@@ -47,10 +47,6 @@ public static function styles(): array
 
     /**
      * Register script with Lunar.
-     *
-     * @param  string|Script  $name
-     * @param  string  $path
-     * @return static
      */
     public static function script(string|Script $name, string $path): static
     {
@@ -63,7 +59,6 @@ public static function script(string|Script $name, string $path): static
      * Register remote script with Lunar.
      *
      * @param  string  $path
-     * @return static
      */
     public static function remoteScript($path): static
     {
@@ -72,10 +67,6 @@ public static function remoteScript($path): static
 
     /**
      * Register style with Lunar.
-     *
-     * @param  string|Style  $name
-     * @param  string  $path
-     * @return static
      */
     public static function style(string|Style $name, string $path): static
     {
@@ -88,7 +79,6 @@ public static function style(string|Style $name, string $path): static
      * Register remote style with Lunar.
      *
      * @param  string  $path
-     * @return static
      */
     public static function remoteStyle($path): static
     {
diff --git a/packages/admin/src/Menu/MenuRegistry.php b/packages/admin/src/Menu/MenuRegistry.php
index 1f40a6eb1a..ad068ea4d8 100644
--- a/packages/admin/src/Menu/MenuRegistry.php
+++ b/packages/admin/src/Menu/MenuRegistry.php
@@ -9,8 +9,6 @@ class MenuRegistry
 {
     /**
      * The slots which are currently registered.
-     *
-     * @var \Illuminate\Support\Collection
      */
     protected Collection $slots;
 
diff --git a/packages/admin/src/Menu/MenuSlot.php b/packages/admin/src/Menu/MenuSlot.php
index 08b97bae28..01edce3433 100644
--- a/packages/admin/src/Menu/MenuSlot.php
+++ b/packages/admin/src/Menu/MenuSlot.php
@@ -51,7 +51,6 @@ public function __construct($handle)
     /**
      * Add an item to the menu slot.
      *
-     * @param  \Closure  $callback
      * @param  string  $after
      * @return static
      */
@@ -81,7 +80,6 @@ public function addItem(\Closure $callback, $after = null)
     /**
      * Add multiple items.
      *
-     * @param  array  $items
      * @return static
      */
     public function addItems(array $items)
@@ -95,8 +93,6 @@ public function addItems(array $items)
 
     /**
      * Get the items for the menu slot.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getItems(): Collection
     {
diff --git a/packages/admin/src/Menu/SettingsMenu.php b/packages/admin/src/Menu/SettingsMenu.php
index a9c1e9ebd9..209f36e721 100644
--- a/packages/admin/src/Menu/SettingsMenu.php
+++ b/packages/admin/src/Menu/SettingsMenu.php
@@ -10,8 +10,6 @@ class SettingsMenu
 
     /**
      * Make our menu.
-     *
-     * @return void
      */
     public static function make(): void
     {
@@ -21,8 +19,6 @@ public static function make(): void
 
     /**
      * Create our top level menu.
-     *
-     * @return static
      */
     protected function makeTopLevel(): static
     {
@@ -37,8 +33,6 @@ protected function makeTopLevel(): static
 
     /**
      * Create the store sections.
-     *
-     * @return void
      */
     protected function makeStoreSection(): void
     {
@@ -103,8 +97,6 @@ protected function makeStoreSection(): void
 
     /**
      * Create the product sections.
-     *
-     * @return void
      */
     protected function makeProductSection(): void
     {
@@ -121,8 +113,6 @@ protected function makeProductSection(): void
 
     /**
      * Create the admin sections.
-     *
-     * @return void
      */
     protected function makeAdminSection(): void
     {
diff --git a/packages/admin/src/Models/Staff.php b/packages/admin/src/Models/Staff.php
index 95fe384b03..1484f7c219 100644
--- a/packages/admin/src/Models/Staff.php
+++ b/packages/admin/src/Models/Staff.php
@@ -17,8 +17,6 @@ class Staff extends Authenticatable
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Hub\Database\Factories\StaffFactory
      */
     protected static function newFactory(): StaffFactory
     {
@@ -59,8 +57,6 @@ protected static function newFactory(): StaffFactory
 
     /**
      * Create a new instance of the Model.
-     *
-     * @param  array  $attributes
      */
     public function __construct(array $attributes = [])
     {
@@ -90,8 +86,6 @@ public function resolveRouteBinding($value, $field = null)
 
     /**
      * Return the user permissions relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function permissions(): HasMany
     {
@@ -102,7 +96,6 @@ public function permissions(): HasMany
      * Authorize an action via permissions.
      *
      * @param  string  $permission
-     * @return bool
      */
     public function authorize($permission): bool
     {
diff --git a/packages/admin/src/Models/StaffPermission.php b/packages/admin/src/Models/StaffPermission.php
index 838bd6f26f..7aaeb37597 100644
--- a/packages/admin/src/Models/StaffPermission.php
+++ b/packages/admin/src/Models/StaffPermission.php
@@ -11,8 +11,6 @@ class StaffPermission extends BaseModel
 
     /**
      * Return the staff relationship.
-     *
-     * @return BelongsTo
      */
     public function staff(): BelongsTo
     {
diff --git a/packages/admin/src/Slots/SlotRegistry.php b/packages/admin/src/Slots/SlotRegistry.php
index a231ba1a3e..e2e3a34b64 100644
--- a/packages/admin/src/Slots/SlotRegistry.php
+++ b/packages/admin/src/Slots/SlotRegistry.php
@@ -33,7 +33,6 @@ public function __construct()
      *
      * @param  string  $handle
      * @param  class  $slot
-     * @return void
      */
     public function register($handle, $slot): void
     {
@@ -48,7 +47,6 @@ public function register($handle, $slot): void
      * What handle do we want slots for?
      *
      * @param  string  $handle
-     * @return self
      */
     public function for($handle): self
     {
@@ -59,9 +57,6 @@ public function for($handle): self
 
     /**
      * Get slots for the current component.
-     *
-     * @param  Model  $model
-     * @return \Illuminate\Support\Collection
      */
     public function get(Model $model): Collection
     {
diff --git a/packages/admin/src/Tables/Builders/OrdersTableBuilder.php b/packages/admin/src/Tables/Builders/OrdersTableBuilder.php
index ebad645d5f..891f191d23 100644
--- a/packages/admin/src/Tables/Builders/OrdersTableBuilder.php
+++ b/packages/admin/src/Tables/Builders/OrdersTableBuilder.php
@@ -12,8 +12,6 @@ class OrdersTableBuilder extends TableBuilder
 {
     /**
      * The field to sort using.
-     *
-     * @var string|null
      */
     public ?string $sortField = 'placed_at';
 
diff --git a/packages/admin/src/Tables/TableBuilder.php b/packages/admin/src/Tables/TableBuilder.php
index 8eb465b31d..d70d387bb6 100644
--- a/packages/admin/src/Tables/TableBuilder.php
+++ b/packages/admin/src/Tables/TableBuilder.php
@@ -10,8 +10,6 @@ class TableBuilder extends LivewireTableBuilder
 {
     /**
      * The query extenders for the table.
-     *
-     * @var Collection
      */
     protected Collection $queryExtenders;
 
@@ -28,7 +26,6 @@ public function __construct()
     /**
      * Add a query extender to the table.
      *
-     * @param  Closure  $closure
      * @return void
      */
     public function extendQuery(Closure $closure)
diff --git a/packages/admin/src/Views/Components/Branding/Logo.php b/packages/admin/src/Views/Components/Branding/Logo.php
index 7ee21560e7..cc16622e75 100644
--- a/packages/admin/src/Views/Components/Branding/Logo.php
+++ b/packages/admin/src/Views/Components/Branding/Logo.php
@@ -9,15 +9,11 @@ class Logo extends Component
 {
     /**
      * Determine if we should display only the logo icon.
-     *
-     * @var bool
      */
     public bool $iconOnly;
 
     /**
      * Initialise the component.
-     *
-     * @param  bool  $iconOnly
      */
     public function __construct(bool $iconOnly = false)
     {
diff --git a/packages/admin/src/Views/Components/Dropdown.php b/packages/admin/src/Views/Components/Dropdown.php
index ccc58e9a3d..bba8526bee 100644
--- a/packages/admin/src/Views/Components/Dropdown.php
+++ b/packages/admin/src/Views/Components/Dropdown.php
@@ -17,8 +17,6 @@ class Dropdown extends Component
 
     /**
      * Whether we should be displaying a minimal "three dot" dropdown.
-     *
-     * @var bool
      */
     public bool $minimal = false;
 
diff --git a/packages/admin/src/Views/Components/Errors.php b/packages/admin/src/Views/Components/Errors.php
index 87f26c76f4..87e0e3e00c 100644
--- a/packages/admin/src/Views/Components/Errors.php
+++ b/packages/admin/src/Views/Components/Errors.php
@@ -22,8 +22,6 @@ class Errors extends Component
 
     /**
      * Determine whether error icon should be shown.
-     *
-     * @var bool
      */
     public bool $errorIcon = true;
 
diff --git a/packages/admin/src/Views/Components/Input/Autocomplete.php b/packages/admin/src/Views/Components/Input/Autocomplete.php
index cba590de06..000de4fc88 100644
--- a/packages/admin/src/Views/Components/Input/Autocomplete.php
+++ b/packages/admin/src/Views/Components/Input/Autocomplete.php
@@ -8,8 +8,6 @@ class Autocomplete extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Autocomplete/Item.php b/packages/admin/src/Views/Components/Input/Autocomplete/Item.php
index 1bf79f4a0a..ccb636544d 100644
--- a/packages/admin/src/Views/Components/Input/Autocomplete/Item.php
+++ b/packages/admin/src/Views/Components/Input/Autocomplete/Item.php
@@ -8,8 +8,6 @@ class Item extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Datepicker.php b/packages/admin/src/Views/Components/Input/Datepicker.php
index 8af6dd3065..1d05119947 100644
--- a/packages/admin/src/Views/Components/Input/Datepicker.php
+++ b/packages/admin/src/Views/Components/Input/Datepicker.php
@@ -8,15 +8,11 @@ class Datepicker extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
     /**
      * Any options to pass to the datepicker.
-     *
-     * @var array
      */
     public array $options = [];
 
diff --git a/packages/admin/src/Views/Components/Input/Fileupload.php b/packages/admin/src/Views/Components/Input/Fileupload.php
index cd8e587b36..606e8528b7 100644
--- a/packages/admin/src/Views/Components/Input/Fileupload.php
+++ b/packages/admin/src/Views/Components/Input/Fileupload.php
@@ -8,8 +8,6 @@ class Fileupload extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Group.php b/packages/admin/src/Views/Components/Input/Group.php
index 610e845f7d..3cdbb973f4 100644
--- a/packages/admin/src/Views/Components/Input/Group.php
+++ b/packages/admin/src/Views/Components/Input/Group.php
@@ -43,15 +43,11 @@ class Group extends Component
 
     /**
      * Whether this input group is required.
-     *
-     * @var bool
      */
     public bool $required = false;
 
     /**
      * Determine whether error icon should be shown.
-     *
-     * @var bool
      */
     public bool $errorIcon = true;
 
diff --git a/packages/admin/src/Views/Components/Input/Price.php b/packages/admin/src/Views/Components/Input/Price.php
index e7715a408a..191235d50e 100644
--- a/packages/admin/src/Views/Components/Input/Price.php
+++ b/packages/admin/src/Views/Components/Input/Price.php
@@ -8,8 +8,6 @@ class Price extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Richtext.php b/packages/admin/src/Views/Components/Input/Richtext.php
index 61a3de2698..2b4c95be3b 100644
--- a/packages/admin/src/Views/Components/Input/Richtext.php
+++ b/packages/admin/src/Views/Components/Input/Richtext.php
@@ -15,8 +15,6 @@ class Richtext extends Component
 
     /**
      * The set of options for the rich text field.
-     *
-     * @var array
      */
     public array $options = [
         'theme' => 'snow',
diff --git a/packages/admin/src/Views/Components/Input/Select.php b/packages/admin/src/Views/Components/Input/Select.php
index d4a11e0025..ffeee0b97e 100644
--- a/packages/admin/src/Views/Components/Input/Select.php
+++ b/packages/admin/src/Views/Components/Input/Select.php
@@ -8,8 +8,6 @@ class Select extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Tags.php b/packages/admin/src/Views/Components/Input/Tags.php
index 3114ac5c8b..0de4ed069e 100644
--- a/packages/admin/src/Views/Components/Input/Tags.php
+++ b/packages/admin/src/Views/Components/Input/Tags.php
@@ -8,8 +8,6 @@ class Tags extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Text.php b/packages/admin/src/Views/Components/Input/Text.php
index 9464315dd0..c936ce3fba 100644
--- a/packages/admin/src/Views/Components/Input/Text.php
+++ b/packages/admin/src/Views/Components/Input/Text.php
@@ -8,8 +8,6 @@ class Text extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/Input/Textarea.php b/packages/admin/src/Views/Components/Input/Textarea.php
index 42876a4b75..bd8e5d6255 100644
--- a/packages/admin/src/Views/Components/Input/Textarea.php
+++ b/packages/admin/src/Views/Components/Input/Textarea.php
@@ -8,8 +8,6 @@ class Textarea extends Component
 {
     /**
      * Whether or not the input has an error to show.
-     *
-     * @var bool
      */
     public bool $error = false;
 
diff --git a/packages/admin/src/Views/Components/ModelUrl.php b/packages/admin/src/Views/Components/ModelUrl.php
index b390df84fb..0d2cc45ae3 100644
--- a/packages/admin/src/Views/Components/ModelUrl.php
+++ b/packages/admin/src/Views/Components/ModelUrl.php
@@ -16,15 +16,11 @@ class ModelUrl extends Component
 
     /**
      * The model which has the routes.
-     *
-     * @var BaseModel|null
      */
     protected ?BaseModel $model = null;
 
     /**
      * Whether the preview URL should be returned.
-     *
-     * @var bool
      */
     public bool $preview = false;
 
diff --git a/packages/admin/src/Views/Components/Notification.php b/packages/admin/src/Views/Components/Notification.php
index f93cfef0d0..188d7bc42e 100644
--- a/packages/admin/src/Views/Components/Notification.php
+++ b/packages/admin/src/Views/Components/Notification.php
@@ -8,8 +8,6 @@ class Notification extends Component
 {
     /**
      * An array of messages to show.
-     *
-     * @var array
      */
     public array $messages = [];
 
diff --git a/packages/admin/src/Views/Components/Orders/Status.php b/packages/admin/src/Views/Components/Orders/Status.php
index 0c9d672b5c..bdb4692f1c 100644
--- a/packages/admin/src/Views/Components/Orders/Status.php
+++ b/packages/admin/src/Views/Components/Orders/Status.php
@@ -15,15 +15,11 @@ class Status extends Component
 
     /**
      * The status label.
-     *
-     * @var string
      */
     public string $label;
 
     /**
      * The status color.
-     *
-     * @var string
      */
     public string $color;
 
diff --git a/packages/admin/src/Views/Components/Table/Heading.php b/packages/admin/src/Views/Components/Table/Heading.php
index 4f9b86c921..964ea5e3ad 100644
--- a/packages/admin/src/Views/Components/Table/Heading.php
+++ b/packages/admin/src/Views/Components/Table/Heading.php
@@ -8,8 +8,6 @@ class Heading extends Component
 {
     /**
      * Whether the heading should be sortable.
-     *
-     * @var bool
      */
     public bool $sortable = false;
 
@@ -22,15 +20,12 @@ class Heading extends Component
 
     /**
      * Whether the heading spans multiple columns.
-     *
-     * @var bool
      */
     public bool $multiColumn;
 
     /**
      * Create the component instance.
      *
-     * @param  bool  $sortable
      * @param  null|string  $direction
      * @param  null|string  $multiColumn
      */
diff --git a/packages/admin/src/helpers.php b/packages/admin/src/helpers.php
index e03328fdcf..9cdc0cbf2b 100644
--- a/packages/admin/src/helpers.php
+++ b/packages/admin/src/helpers.php
@@ -2,7 +2,6 @@
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\DB;
 use Lunar\DataTypes\Price;
 
 if (! function_exists('max_upload_filesize')) {
diff --git a/packages/core/database/seeders/DemoSeeder.php b/packages/core/database/seeders/DemoSeeder.php
index e4ebae7375..1b51287299 100644
--- a/packages/core/database/seeders/DemoSeeder.php
+++ b/packages/core/database/seeders/DemoSeeder.php
@@ -15,8 +15,6 @@ class DemoSeeder extends Seeder
 
     /**
      * Seed the demo data.
-     *
-     * @return void
      */
     public function run(): void
     {
diff --git a/packages/core/database/seeders/TestingSeeder.php b/packages/core/database/seeders/TestingSeeder.php
index 9b782a9103..7b15bf353f 100644
--- a/packages/core/database/seeders/TestingSeeder.php
+++ b/packages/core/database/seeders/TestingSeeder.php
@@ -8,8 +8,6 @@ class TestingSeeder extends Seeder
 {
     /**
      * Seed the demo data.
-     *
-     * @return void
      */
     public function run(): void
     {
diff --git a/packages/core/src/Actions/Carts/AssociateUser.php b/packages/core/src/Actions/Carts/AssociateUser.php
index 385a52d669..d798f83688 100644
--- a/packages/core/src/Actions/Carts/AssociateUser.php
+++ b/packages/core/src/Actions/Carts/AssociateUser.php
@@ -11,10 +11,7 @@ class AssociateUser extends AbstractAction
     /**
      * Execute the action
      *
-     * @param  Cart  $cart
-     * @param  User  $user
      * @param  string  $policy
-     * @return self
      */
     public function execute(Cart $cart, User $user, $policy = 'merge'): self
     {
diff --git a/packages/core/src/Actions/Carts/CalculateLine.php b/packages/core/src/Actions/Carts/CalculateLine.php
index a3f8d9eb0a..6aa61c01e1 100644
--- a/packages/core/src/Actions/Carts/CalculateLine.php
+++ b/packages/core/src/Actions/Carts/CalculateLine.php
@@ -13,7 +13,6 @@ class CalculateLine
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\CartLine  $cartLine
      * @param  \Illuminate\Database\Eloquent\Collection  $customerGroups
      * @return \Lunar\Models\CartLine
      */
diff --git a/packages/core/src/Actions/Carts/CalculateLineSubtotal.php b/packages/core/src/Actions/Carts/CalculateLineSubtotal.php
index 0942c874b6..b3ad2b01fc 100644
--- a/packages/core/src/Actions/Carts/CalculateLineSubtotal.php
+++ b/packages/core/src/Actions/Carts/CalculateLineSubtotal.php
@@ -14,7 +14,6 @@ class CalculateLineSubtotal
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\CartLine  $cartLine
      * @param  \Illuminate\Database\Eloquent\Collection  $customerGroups
      * @return \Lunar\Models\CartLine
      */
diff --git a/packages/core/src/Actions/Carts/CreateOrder.php b/packages/core/src/Actions/Carts/CreateOrder.php
index 755944b97f..70e78946c5 100644
--- a/packages/core/src/Actions/Carts/CreateOrder.php
+++ b/packages/core/src/Actions/Carts/CreateOrder.php
@@ -16,7 +16,6 @@ class CreateOrder extends AbstractAction
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\Cart  $cart
      * @return void
      */
     public function execute(
diff --git a/packages/core/src/Actions/Carts/GetExistingCartLine.php b/packages/core/src/Actions/Carts/GetExistingCartLine.php
index 1bf3b6b532..c71b9a2be5 100644
--- a/packages/core/src/Actions/Carts/GetExistingCartLine.php
+++ b/packages/core/src/Actions/Carts/GetExistingCartLine.php
@@ -12,11 +12,6 @@ class GetExistingCartLine extends AbstractAction
 {
     /**
      * Execute the action
-     *
-     * @param  Cart  $cart
-     * @param  Purchasable  $purchasable
-     * @param  array  $meta
-     * @return CartLine|null
      */
     public function execute(
         Cart $cart,
diff --git a/packages/core/src/Actions/Carts/MergeCart.php b/packages/core/src/Actions/Carts/MergeCart.php
index 6e39e73bb1..0dac0a0d9e 100644
--- a/packages/core/src/Actions/Carts/MergeCart.php
+++ b/packages/core/src/Actions/Carts/MergeCart.php
@@ -10,8 +10,6 @@ class MergeCart
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\Cart  $target
-     * @param  \Lunar\Models\Cart  $source
      * @return \Lunar\Models\Cart
      */
     public function execute(Cart $target, Cart $source)
diff --git a/packages/core/src/Actions/Carts/RemovePurchasable.php b/packages/core/src/Actions/Carts/RemovePurchasable.php
index 4e1cd76e72..c34d8557e1 100644
--- a/packages/core/src/Actions/Carts/RemovePurchasable.php
+++ b/packages/core/src/Actions/Carts/RemovePurchasable.php
@@ -12,8 +12,6 @@ class RemovePurchasable extends AbstractAction
     /**
      * Execute the action
      *
-     * @param  Cart  $cart
-     * @param  int  $cartLineId
      * @return bool
      *
      * @throws CartLineIdMismatchException
diff --git a/packages/core/src/Actions/Carts/SetShippingOption.php b/packages/core/src/Actions/Carts/SetShippingOption.php
index 2984f93379..39c54b4512 100644
--- a/packages/core/src/Actions/Carts/SetShippingOption.php
+++ b/packages/core/src/Actions/Carts/SetShippingOption.php
@@ -14,7 +14,6 @@ class SetShippingOption extends AbstractAction
      *
      * @param  CartLine  $cartLine
      * @param  ShippingOption  $customerGroups
-     * @return self
      */
     public function execute(
         Cart $cart,
diff --git a/packages/core/src/Actions/Carts/ValidateCartForOrder.php b/packages/core/src/Actions/Carts/ValidateCartForOrder.php
index 97eb6a483c..0de5a06b0d 100644
--- a/packages/core/src/Actions/Carts/ValidateCartForOrder.php
+++ b/packages/core/src/Actions/Carts/ValidateCartForOrder.php
@@ -16,7 +16,6 @@ class ValidateCartForOrder
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\Cart  $cart
      * @return void
      */
     public function execute(
diff --git a/packages/core/src/Actions/Collections/SortProducts.php b/packages/core/src/Actions/Collections/SortProducts.php
index 4ca3d24716..656d179e8a 100644
--- a/packages/core/src/Actions/Collections/SortProducts.php
+++ b/packages/core/src/Actions/Collections/SortProducts.php
@@ -10,7 +10,6 @@ class SortProducts
     /**
      * Execute the action.
      *
-     * @param  \Lunar\Models\Collection  $collection
      * @return void
      */
     public function execute(Collection $collection)
diff --git a/packages/core/src/Actions/Collections/SortProductsByPrice.php b/packages/core/src/Actions/Collections/SortProductsByPrice.php
index 4e91dc830f..18e9a76af0 100644
--- a/packages/core/src/Actions/Collections/SortProductsByPrice.php
+++ b/packages/core/src/Actions/Collections/SortProductsByPrice.php
@@ -11,8 +11,6 @@ class SortProductsByPrice
     /**
      * Execute the action.
      *
-     * @param  \Illuminate\Support\Collection  $products
-     * @param  \Lunar\Models\Currency  $currency
      * @param  string  $direction
      * @return void
      */
diff --git a/packages/core/src/Actions/Collections/SortProductsBySku.php b/packages/core/src/Actions/Collections/SortProductsBySku.php
index 75146b6100..2b786551dd 100644
--- a/packages/core/src/Actions/Collections/SortProductsBySku.php
+++ b/packages/core/src/Actions/Collections/SortProductsBySku.php
@@ -9,7 +9,6 @@ class SortProductsBySku
     /**
      * Execute the action.
      *
-     * @param  \Illuminate\Support\Collection  $products
      * @param  string  $direction
      * @return \Illuminate\Support\Collection
      */
diff --git a/packages/core/src/Addons/Manifest.php b/packages/core/src/Addons/Manifest.php
index b106924cb6..250d4b9092 100644
--- a/packages/core/src/Addons/Manifest.php
+++ b/packages/core/src/Addons/Manifest.php
@@ -89,8 +89,6 @@ protected function formatPackage($package)
 
     /**
      * Get a collection of our addons.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function addons(): Collection
     {
diff --git a/packages/core/src/Base/AttributeManifest.php b/packages/core/src/Base/AttributeManifest.php
index de574a82b0..fd68d3682f 100644
--- a/packages/core/src/Base/AttributeManifest.php
+++ b/packages/core/src/Base/AttributeManifest.php
@@ -14,8 +14,6 @@ class AttributeManifest
 {
     /**
      * A collection of available attribute types.
-     *
-     * @var \Illuminate\Support\Collection
      */
     protected Collection $types;
 
diff --git a/packages/core/src/Base/AttributeManifestInterface.php b/packages/core/src/Base/AttributeManifestInterface.php
index 2199e449bc..fcb6deb99b 100644
--- a/packages/core/src/Base/AttributeManifestInterface.php
+++ b/packages/core/src/Base/AttributeManifestInterface.php
@@ -16,8 +16,6 @@ public function addType($classname);
 
     /**
      * Return the attribute types.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getTypes(): Collection;
 
diff --git a/packages/core/src/Base/BaseModel.php b/packages/core/src/Base/BaseModel.php
index 5db7c51ebd..a6f3d5dfec 100644
--- a/packages/core/src/Base/BaseModel.php
+++ b/packages/core/src/Base/BaseModel.php
@@ -11,8 +11,6 @@ abstract class BaseModel extends Model
 
     /**
      * Create a new instance of the Model.
-     *
-     * @param  array  $attributes
      */
     public function __construct(array $attributes = [])
     {
diff --git a/packages/core/src/Base/CartLineModifier.php b/packages/core/src/Base/CartLineModifier.php
index d36e181e9a..961e1df986 100644
--- a/packages/core/src/Base/CartLineModifier.php
+++ b/packages/core/src/Base/CartLineModifier.php
@@ -9,8 +9,6 @@ abstract class CartLineModifier
 {
     /**
      * Called just before cart totals are calculated.
-     *
-     * @return CartLine
      */
     public function calculating(CartLine $cartLine, Closure $next): CartLine
     {
@@ -19,8 +17,6 @@ public function calculating(CartLine $cartLine, Closure $next): CartLine
 
     /**
      * Called just after cart totals are calculated.
-     *
-     * @return CartLine
      */
     public function calculated(CartLine $cartLine, Closure $next): CartLine
     {
@@ -29,8 +25,6 @@ public function calculated(CartLine $cartLine, Closure $next): CartLine
 
     /**
      * Called just after cart sub total is calculated.
-     *
-     * @return CartLine
      */
     public function subtotalled(CartLine $cartLine, Closure $next): CartLine
     {
diff --git a/packages/core/src/Base/CartSessionInterface.php b/packages/core/src/Base/CartSessionInterface.php
index c0c03cefdb..e7bf65a6ab 100644
--- a/packages/core/src/Base/CartSessionInterface.php
+++ b/packages/core/src/Base/CartSessionInterface.php
@@ -26,8 +26,6 @@ public function forget();
     /**
      * Associate a cart to a user.
      *
-     * @param  \Lunar\Models\Cart  $cart
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @param  string  $policy
      * @return void
      */
@@ -36,7 +34,6 @@ public function associate(Cart $cart, Authenticatable $user, $policy);
     /**
      * Use the given cart and set to the session.
      *
-     * @param  \Lunar\Models\Cart  $cart
      * @return void
      */
     public function use(Cart $cart);
@@ -51,7 +48,6 @@ public function getSessionKey();
     /**
      * Set the cart session channel.
      *
-     * @param  \Lunar\Models\Channel  $channel
      * @return self
      */
     public function setChannel(Channel $channel);
@@ -59,22 +55,17 @@ public function setChannel(Channel $channel);
     /**
      * Set the cart session currency.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return self
      */
     public function setCurrency(Currency $currency);
 
     /**
      * Return the current currency.
-     *
-     * @return \Lunar\Models\Currency
      */
     public function getCurrency(): Currency;
 
     /**
      * Return the current channel.
-     *
-     * @return \Lunar\Models\Channel
      */
     public function getChannel(): Channel;
 }
diff --git a/packages/core/src/Base/Casts/AsAttributeData.php b/packages/core/src/Base/Casts/AsAttributeData.php
index 269c8b88fb..c903105f75 100644
--- a/packages/core/src/Base/Casts/AsAttributeData.php
+++ b/packages/core/src/Base/Casts/AsAttributeData.php
@@ -13,7 +13,6 @@ class AsAttributeData implements Castable
     /**
      * Get the caster class to use when casting from / to this cast target.
      *
-     * @param  array  $arguments
      * @return object|string
      */
     public static function castUsing(array $arguments)
diff --git a/packages/core/src/Base/DiscountManagerInterface.php b/packages/core/src/Base/DiscountManagerInterface.php
index 2dfa3c8f50..1ccda5faee 100644
--- a/packages/core/src/Base/DiscountManagerInterface.php
+++ b/packages/core/src/Base/DiscountManagerInterface.php
@@ -12,45 +12,31 @@ interface DiscountManagerInterface
      * Add a discount type by classname
      *
      * @param  string  $classname
-     * @return self
      */
     public function addType($classname): self;
 
     /**
      * Return the available discount types.
-     *
-     * @return Collection
      */
     public function getTypes(): Collection;
 
     /**
      * Add an applied discount
-     *
-     * @param  CartDiscount  $cartDiscount
-     * @return self
      */
     public function addApplied(CartDiscount $cartDiscount): self;
 
     /**
      * Return the applied discounts
-     *
-     * @return Collection
      */
     public function getApplied(): Collection;
 
     /**
      * Apply discounts for a given cart.
-     *
-     * @param  Cart  $cart
-     * @return Cart
      */
     public function apply(Cart $cart): Cart;
 
     /**
      * Validate a given coupon against all system discounts.
-     *
-     * @param  string  $coupon
-     * @return bool
      */
     public function validateCoupon(string $coupon): bool;
 }
diff --git a/packages/core/src/Base/DiscountTypeInterface.php b/packages/core/src/Base/DiscountTypeInterface.php
index 63361140cc..2b75906e90 100644
--- a/packages/core/src/Base/DiscountTypeInterface.php
+++ b/packages/core/src/Base/DiscountTypeInterface.php
@@ -9,8 +9,6 @@ interface DiscountTypeInterface
 {
     /**
      * Return the name of the discount type.
-     *
-     * @return string
      */
     public function getName(): string;
 
diff --git a/packages/core/src/Base/FieldType.php b/packages/core/src/Base/FieldType.php
index bf11d1904d..f442759288 100644
--- a/packages/core/src/Base/FieldType.php
+++ b/packages/core/src/Base/FieldType.php
@@ -21,15 +21,11 @@ public function setValue($value);
 
     /**
      * Return the display label for the field type.
-     *
-     * @return string
      */
     public function getLabel(): string;
 
     /**
      * Return the config for the field type.
-     *
-     * @return array
      */
     public function getConfig(): array;
 
@@ -40,8 +36,6 @@ public function getSettingsView(): string;
 
     /**
      * Return the view used in editing.
-     *
-     * @return string
      */
     public function getView(): string;
 }
diff --git a/packages/core/src/Base/Migration.php b/packages/core/src/Base/Migration.php
index 37d2b1a54b..449204c6fa 100644
--- a/packages/core/src/Base/Migration.php
+++ b/packages/core/src/Base/Migration.php
@@ -8,8 +8,6 @@ abstract class Migration extends BaseMigration
 {
     /**
      * Migration table prefix.
-     *
-     * @var string
      */
     protected string $prefix = '';
 
diff --git a/packages/core/src/Base/ModelManifest.php b/packages/core/src/Base/ModelManifest.php
index 3c04583f7d..71b4f16a0b 100644
--- a/packages/core/src/Base/ModelManifest.php
+++ b/packages/core/src/Base/ModelManifest.php
@@ -10,8 +10,6 @@ class ModelManifest implements ModelManifestInterface
 {
     /**
      * The collection of models to register to this manifest.
-     *
-     * @var \Illuminate\Support\Collection
      */
     protected Collection $models;
 
@@ -25,9 +23,6 @@ public function __construct()
 
     /**
      * Register models.
-     *
-     * @param  \Illuminate\Support\Collection  $models
-     * @return void
      */
     public function register(Collection $models): void
     {
@@ -41,9 +36,6 @@ public function register(Collection $models): void
 
     /**
      * Get the registered model for a base model class.
-     *
-     * @param  string  $baseModelClass
-     * @return \Illuminate\Database\Eloquent\Model
      */
     public function getRegisteredModel(string $baseModelClass): Model
     {
@@ -52,9 +44,6 @@ public function getRegisteredModel(string $baseModelClass): Model
 
     /**
      * Removes model from manifest.
-     *
-     * @param  string  $baseModelClass
-     * @return void
      */
     public function removeModel(string $baseModelClass): void
     {
@@ -63,10 +52,6 @@ public function removeModel(string $baseModelClass): void
 
     /**
      * Swap the model implementation.
-     *
-     * @param  string  $currentModelClass
-     * @param  string  $newModelClass
-     * @return void
      */
     public function swapModel(string $currentModelClass, string $newModelClass): void
     {
@@ -77,9 +62,6 @@ public function swapModel(string $currentModelClass, string $newModelClass): voi
 
     /**
      * Get the morph class base model.
-     *
-     * @param  string  $morphClass
-     * @return string|null
      */
     public function getMorphClassBaseModel(string $morphClass): ?string
     {
@@ -90,8 +72,6 @@ public function getMorphClassBaseModel(string $morphClass): ?string
 
     /**
      * Get list of registered base model classes.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getBaseModelClasses(): Collection
     {
@@ -100,8 +80,6 @@ public function getBaseModelClasses(): Collection
 
     /**
      * Get list of all registered models.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getRegisteredModels(): Collection
     {
@@ -111,8 +89,6 @@ public function getRegisteredModels(): Collection
     /**
      * Validate class is an eloquent model.
      *
-     * @param  string  $class
-     * @return void
      *
      * @throws \InvalidArgumentException
      */
@@ -126,8 +102,6 @@ private function validateClassIsEloquentModel(string $class): void
     /**
      * Validate base class interacts with eloquent model trait.
      *
-     * @param  string  $baseClass
-     * @return void
      *
      * @throws \InvalidArgumentException
      */
diff --git a/packages/core/src/Base/ModelManifestInterface.php b/packages/core/src/Base/ModelManifestInterface.php
index 8d7ca58f82..167ef05e04 100644
--- a/packages/core/src/Base/ModelManifestInterface.php
+++ b/packages/core/src/Base/ModelManifestInterface.php
@@ -9,32 +9,21 @@ interface ModelManifestInterface
 {
     /**
      * Register models.
-     *
-     * @param  \Illuminate\Support\Collection  $models
-     * @return void
      */
     public function register(Collection $models): void;
 
     /**
      * Get the registered model for a base model class.
-     *
-     * @param  string  $baseModelClass
-     * @return \Illuminate\Database\Eloquent\Model
      */
     public function getRegisteredModel(string $baseModelClass): Model;
 
     /**
      * Get the morph class base model.
-     *
-     * @param  string  $morphClass
-     * @return string|null
      */
     public function getMorphClassBaseModel(string $morphClass): ?string;
 
     /**
      * Get list of registered base model classes.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getBaseModelClasses(): Collection;
 }
diff --git a/packages/core/src/Base/OrderReferenceGeneratorInterface.php b/packages/core/src/Base/OrderReferenceGeneratorInterface.php
index f63778ac52..04998a34dd 100644
--- a/packages/core/src/Base/OrderReferenceGeneratorInterface.php
+++ b/packages/core/src/Base/OrderReferenceGeneratorInterface.php
@@ -8,9 +8,6 @@ interface OrderReferenceGeneratorInterface
 {
     /**
      * Generate a reference for the order.
-     *
-     * @param  \Lunar\Models\Order  $order
-     * @return string
      */
     public function generate(Order $order): string;
 }
diff --git a/packages/core/src/Base/PaymentTypeInterface.php b/packages/core/src/Base/PaymentTypeInterface.php
index 64b76b3156..efdc57e6a0 100644
--- a/packages/core/src/Base/PaymentTypeInterface.php
+++ b/packages/core/src/Base/PaymentTypeInterface.php
@@ -15,31 +15,21 @@ interface PaymentTypeInterface
      * Set the cart.
      *
      * @param  \Lunar\Models\Cart  $order
-     * @return self
      */
     public function cart(Cart $cart): self;
 
     /**
      * Set the order.
-     *
-     * @param  Order  $order
-     * @return self
      */
     public function order(Order $order): self;
 
     /**
      * Set any data the provider might need.
-     *
-     * @param  array  $data
-     * @return self
      */
     public function withData(array $data): self;
 
     /**
      * Set any configuration on the driver.
-     *
-     * @param  array  $config
-     * @return self
      */
     public function setConfig(array $config): self;
 
@@ -53,19 +43,14 @@ public function authorize(): PaymentAuthorize;
     /**
      * Refund a transaction for a given amount.
      *
-     * @param  \Lunar\Models\Transaction  $transaction
-     * @param  int  $amount
      * @param  null|string  $notes
-     * @return \Lunar\Base\DataTransferObjects\PaymentRefund
      */
     public function refund(Transaction $transaction, int $amount, $notes = null): PaymentRefund;
 
     /**
      * Capture an amount for a transaction.
      *
-     * @param  \Lunar\Models\Transaction  $transaction
      * @param  int  $amount
-     * @return \Lunar\Base\DataTransferObjects\PaymentCapture
      */
     public function capture(Transaction $transaction, $amount = 0): PaymentCapture;
 }
diff --git a/packages/core/src/Base/PricingManagerInterface.php b/packages/core/src/Base/PricingManagerInterface.php
index 679432ba05..238889893e 100644
--- a/packages/core/src/Base/PricingManagerInterface.php
+++ b/packages/core/src/Base/PricingManagerInterface.php
@@ -12,7 +12,6 @@ interface PricingManagerInterface
     /**
      * Set the user property.
      *
-     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @return self
      */
     public function user(Authenticatable $user);
@@ -20,7 +19,6 @@ public function user(Authenticatable $user);
     /**
      * Set the currency property.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return self
      */
     public function currency(Currency $currency);
@@ -28,7 +26,6 @@ public function currency(Currency $currency);
     /**
      * Set the quantity property.
      *
-     * @param  int  $qty
      * @return self
      */
     public function qty(int $qty);
@@ -36,7 +33,6 @@ public function qty(int $qty);
     /**
      * Set the customer groups.
      *
-     * @param  Collection  $customerGroups
      * @return self
      */
     public function customerGroups(Collection $customerGroups);
@@ -44,7 +40,6 @@ public function customerGroups(Collection $customerGroups);
     /**
      * Set the customer group.
      *
-     * @param  CustomerGroup  $customerGroup
      * @return self
      */
     public function customerGroup(CustomerGroup $customerGroup);
@@ -52,7 +47,6 @@ public function customerGroup(CustomerGroup $customerGroup);
     /**
      * Get the price for a purchasable.
      *
-     * @param  Purchasable  $purchasable
      * @return \Lunar\Base\DataTransferObjects\PricingResponse
      */
     public function for(Purchasable $purchasable);
diff --git a/packages/core/src/Base/Purchasable.php b/packages/core/src/Base/Purchasable.php
index 75190d7a24..322ba68b15 100644
--- a/packages/core/src/Base/Purchasable.php
+++ b/packages/core/src/Base/Purchasable.php
@@ -16,8 +16,6 @@ public function getPrices(): Collection;
 
     /**
      * Return the purchasable unit quantity.
-     *
-     * @return int
      */
     public function getUnitQuantity(): int;
 
diff --git a/packages/core/src/Base/ShippingManifest.php b/packages/core/src/Base/ShippingManifest.php
index ee8945a3f2..86d8194863 100644
--- a/packages/core/src/Base/ShippingManifest.php
+++ b/packages/core/src/Base/ShippingManifest.php
@@ -11,8 +11,6 @@ class ShippingManifest implements ShippingManifestInterface
 {
     /**
      * The collection of available shipping options.
-     *
-     * @var \Illuminate\Support\Collection
      */
     public Collection $options;
 
diff --git a/packages/core/src/Base/ShippingManifestInterface.php b/packages/core/src/Base/ShippingManifestInterface.php
index 1e0dfac294..f23dd13925 100644
--- a/packages/core/src/Base/ShippingManifestInterface.php
+++ b/packages/core/src/Base/ShippingManifestInterface.php
@@ -11,7 +11,6 @@ interface ShippingManifestInterface
     /**
      * Add a shipping option to the manifest.
      *
-     * @param  \Lunar\DataTypes\ShippingOption  $shippingOption
      * @return self
      */
     public function addOption(ShippingOption $shippingOption);
@@ -25,9 +24,6 @@ public function clearOptions();
 
     /**
      * Return available options for a given cart.
-     *
-     * @param  \Lunar\Models\Cart  $cart
-     * @return \Illuminate\Support\Collection
      */
     public function getOptions(Cart $cart): Collection;
 }
diff --git a/packages/core/src/Base/ShippingModifiers.php b/packages/core/src/Base/ShippingModifiers.php
index 8163541db4..3f1b06e3db 100644
--- a/packages/core/src/Base/ShippingModifiers.php
+++ b/packages/core/src/Base/ShippingModifiers.php
@@ -8,8 +8,6 @@ class ShippingModifiers
 {
     /**
      * The collection of modifiers to use.
-     *
-     * @var \Illuminate\Support\Collection
      */
     protected Collection $modifiers;
 
diff --git a/packages/core/src/Base/TaxDriver.php b/packages/core/src/Base/TaxDriver.php
index a1433dd9cb..96ac2305dc 100644
--- a/packages/core/src/Base/TaxDriver.php
+++ b/packages/core/src/Base/TaxDriver.php
@@ -12,15 +12,11 @@ interface TaxDriver
      * Set the shipping address.
      *
      * @param  \Lunar\Base\Addressable|null  $address
-     * @return self
      */
     public function setShippingAddress(Addressable $address = null): self;
 
     /**
      * Set the currency.
-     *
-     * @param  \Lunar\Models\Currency  $currency
-     * @return self
      */
     public function setCurrency(Currency $currency): self;
 
@@ -28,7 +24,6 @@ public function setCurrency(Currency $currency): self;
      * Set the billing address.
      *
      * @param  \Lunar\Base\Addressable|null  $address
-     * @return self
      */
     public function setBillingAddress(Addressable $address = null): self;
 
@@ -36,15 +31,11 @@ public function setBillingAddress(Addressable $address = null): self;
      * Set the purchasable item.
      *
      * @param  \Lunar\Base\Purchasable  $purchasable
-     * @return self
      */
     public function setPurchasable(Purchasable $purchasable): self;
 
     /**
      * Set the cart line.
-     *
-     * @param  \Lunar\Models\CartLine  $cartLine
-     * @return self
      */
     public function setCartLine(CartLine $cartLine): self;
 
@@ -52,7 +43,6 @@ public function setCartLine(CartLine $cartLine): self;
      * Return the tax breakdown from a given sub total.
      *
      * @param  int  $subTotal
-     * @return \Lunar\Base\ValueObjects\Cart\TaxBreakdown
      */
     public function getBreakdown($subTotal): TaxBreakdown;
 }
diff --git a/packages/core/src/Base/Traits/CanScheduleAvailability.php b/packages/core/src/Base/Traits/CanScheduleAvailability.php
index f475d59acd..51f1f9a0f6 100644
--- a/packages/core/src/Base/Traits/CanScheduleAvailability.php
+++ b/packages/core/src/Base/Traits/CanScheduleAvailability.php
@@ -12,7 +12,6 @@ trait CanScheduleAvailability
     /**
      * Return whether or not the models provided are suitable for scheduling.
      *
-     * @param  \Illuminate\Support\Collection  $models
      * @return void
      */
     abstract protected function validateScheduling(Collection $models);
@@ -20,11 +19,7 @@ abstract protected function validateScheduling(Collection $models);
     /**
      * Schedule models for a given relation.
      *
-     * @param  \Illuminate\Database\Eloquent\Relations\Relation  $relation
      * @param  mixed  $models
-     * @param  DateTime|null  $starts
-     * @param  DateTime|null  $ends
-     * @param  array  $pivotData
      * @return void
      */
     protected function schedule(
@@ -61,9 +56,7 @@ protected function schedule(
     /**
      * Unschedule models for a relation.
      *
-     * @param  Relation  $relation
      * @param  mixed  $models
-     * @param  array  $pivotData
      * @return void
      */
     protected function unschedule(Relation $relation, $models, array $pivotData = [])
@@ -94,7 +87,6 @@ protected function unschedule(Relation $relation, $models, array $pivotData = []
      * Returns the data for the sync update.
      *
      * @param  \Illuminate\Support\Collection  $models
-     * @param  array|null  $pivotData
      * @return \Illuminate\Support\Collection
      */
     private function getScheduleMapping($models, array $pivotData = null)
diff --git a/packages/core/src/Base/Traits/HasAttributes.php b/packages/core/src/Base/Traits/HasAttributes.php
index 550efb89f2..650de7b579 100644
--- a/packages/core/src/Base/Traits/HasAttributes.php
+++ b/packages/core/src/Base/Traits/HasAttributes.php
@@ -19,8 +19,6 @@ public function getAttributableClassnameAttribute()
 
     /**
      * Get the attributes relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function mappedAttributes(): HasMany
     {
diff --git a/packages/core/src/Base/Traits/HasCustomerGroups.php b/packages/core/src/Base/Traits/HasCustomerGroups.php
index a47c5cf4c0..bed03445cf 100644
--- a/packages/core/src/Base/Traits/HasCustomerGroups.php
+++ b/packages/core/src/Base/Traits/HasCustomerGroups.php
@@ -13,8 +13,6 @@ trait HasCustomerGroups
 
     /**
      * Get the relationship for the customer groups.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
     abstract public function customerGroups(): Relation;
 
@@ -22,9 +20,6 @@ abstract public function customerGroups(): Relation;
      * Schedule models against customer groups.
      *
      * @param  mixed  $models
-     * @param  DateTime|null  $starts
-     * @param  DateTime|null  $ends
-     * @param  array  $pivotData
      * @return void
      */
     public function scheduleCustomerGroup(
@@ -46,7 +41,6 @@ public function scheduleCustomerGroup(
      * Unschedule models against a customer group.
      *
      * @param  mixed  $models
-     * @param  array  $pivotData
      * @return void
      */
     public function unscheduleCustomerGroup(
diff --git a/packages/core/src/Base/Traits/HasMedia.php b/packages/core/src/Base/Traits/HasMedia.php
index 61839f0452..53a5dc72bf 100644
--- a/packages/core/src/Base/Traits/HasMedia.php
+++ b/packages/core/src/Base/Traits/HasMedia.php
@@ -13,8 +13,6 @@ trait HasMedia
 
     /**
      * Relationship for thumbnail.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
      */
     public function thumbnail(): MorphOne
     {
diff --git a/packages/core/src/Base/Traits/HasModelExtending.php b/packages/core/src/Base/Traits/HasModelExtending.php
index 47fc1d71c2..bae5a2df7f 100644
--- a/packages/core/src/Base/Traits/HasModelExtending.php
+++ b/packages/core/src/Base/Traits/HasModelExtending.php
@@ -49,7 +49,6 @@ public function __call($method, $parameters)
      * Swap the model implementation.
      *
      * @param  string  $model
-     * @return \Illuminate\Database\Eloquent\Model
      */
     public function swap(string $newModelClass): Model
     {
@@ -63,8 +62,6 @@ public function swap(string $newModelClass): Model
 
     /**
      * Get the class name of the base model.
-     *
-     * @return string
      */
     public function getMorphClass(): string
     {
@@ -75,10 +72,6 @@ public function getMorphClass(): string
 
     /**
      * Forward a method call to the model only when calling a method on the model.
-     *
-     * @param  string  $method
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return bool
      */
     protected function forwardCallsWhen(string $method, Model $model): bool
     {
diff --git a/packages/core/src/Base/Traits/HasTranslations.php b/packages/core/src/Base/Traits/HasTranslations.php
index 077657770e..e9bbb5f922 100644
--- a/packages/core/src/Base/Traits/HasTranslations.php
+++ b/packages/core/src/Base/Traits/HasTranslations.php
@@ -80,7 +80,6 @@ public function translateAttribute($attribute, $locale = null)
     /**
      * Shorthand to translate an attribute.
      *
-     * @param $params
      * @return void
      */
     public function attr(...$params)
diff --git a/packages/core/src/Base/Traits/LogsActivity.php b/packages/core/src/Base/Traits/LogsActivity.php
index 1d5564dab8..c43da2754f 100644
--- a/packages/core/src/Base/Traits/LogsActivity.php
+++ b/packages/core/src/Base/Traits/LogsActivity.php
@@ -11,8 +11,6 @@ trait LogsActivity
 
     /**
      * Get the log options for the activity log.
-     *
-     * @return LogOptions
      */
     public function getActivitylogOptions(): LogOptions
     {
diff --git a/packages/core/src/Base/Traits/Searchable.php b/packages/core/src/Base/Traits/Searchable.php
index 446da937e2..282efa940e 100644
--- a/packages/core/src/Base/Traits/Searchable.php
+++ b/packages/core/src/Base/Traits/Searchable.php
@@ -60,7 +60,6 @@ public function getFilterableAttributes()
     /**
      * Add additional fields to filter on.
      *
-     * @param  array  $attributes
      * @return void
      */
     public function addFilterableAttributes(array $attributes)
@@ -75,7 +74,6 @@ public function addFilterableAttributes(array $attributes)
     /**
      * Add additional sortable attributes.
      *
-     * @param  array  $attributes
      * @return void
      */
     public function addSortableAttributes(array $attributes)
diff --git a/packages/core/src/Base/Validation/CouponValidatorInterface.php b/packages/core/src/Base/Validation/CouponValidatorInterface.php
index 8b657e5383..987f83cc03 100644
--- a/packages/core/src/Base/Validation/CouponValidatorInterface.php
+++ b/packages/core/src/Base/Validation/CouponValidatorInterface.php
@@ -6,9 +6,6 @@ interface CouponValidatorInterface
 {
     /**
      * Validate a coupon for whether it can be used.
-     *
-     * @param  string  $coupon
-     * @return bool
      */
     public function validate(string $coupon): bool;
 }
diff --git a/packages/core/src/Base/ValueObjects/Cart/FreeItem.php b/packages/core/src/Base/ValueObjects/Cart/FreeItem.php
index 53bfbb8ebe..939ac5d4b5 100644
--- a/packages/core/src/Base/ValueObjects/Cart/FreeItem.php
+++ b/packages/core/src/Base/ValueObjects/Cart/FreeItem.php
@@ -8,23 +8,17 @@ class FreeItem
 {
     /**
      * The associated product variant.
-     *
-     * @var ProductVariant
      */
     public ProductVariant $productVariant;
 
     /**
      * Quantity available from promotions,
-     *
-     * @var int
      */
     public int $available = 1;
 
     /**
      * Group for the item.
      * Allows free items to be grouped together, e.g. by promotion.
-     *
-     * @var string
      */
     public string $group = '';
 }
diff --git a/packages/core/src/Base/ValueObjects/Cart/Promotion.php b/packages/core/src/Base/ValueObjects/Cart/Promotion.php
index 62d1857e3d..94e1e5fa76 100644
--- a/packages/core/src/Base/ValueObjects/Cart/Promotion.php
+++ b/packages/core/src/Base/ValueObjects/Cart/Promotion.php
@@ -8,22 +8,16 @@ class Promotion
 {
     /**
      * Description of the promotion.
-     *
-     * @var string
      */
     public string $description = '';
 
     /**
      * Promotion reference.
-     *
-     * @var string
      */
     public string $reference = '';
 
     /**
      * Discount amount
-     *
-     * @var Price
      */
     public Price $amount;
 }
diff --git a/packages/core/src/Base/ValueObjects/Cart/TaxBreakdown.php b/packages/core/src/Base/ValueObjects/Cart/TaxBreakdown.php
index 393c6c0c1d..3c3eac90fe 100644
--- a/packages/core/src/Base/ValueObjects/Cart/TaxBreakdown.php
+++ b/packages/core/src/Base/ValueObjects/Cart/TaxBreakdown.php
@@ -15,7 +15,6 @@ public function __construct(
     /**
      * Add a tax breakdown amount.
      *
-     * @param  TaxBreakdownAmount  $taxBreakdownAmount
      * @return void
      */
     public function addAmount(TaxBreakdownAmount $taxBreakdownAmount)
diff --git a/packages/core/src/Console/Commands/ScoutIndexer.php b/packages/core/src/Console/Commands/ScoutIndexer.php
index 48fcb14aac..ac385c6078 100644
--- a/packages/core/src/Console/Commands/ScoutIndexer.php
+++ b/packages/core/src/Console/Commands/ScoutIndexer.php
@@ -38,7 +38,6 @@ public function __construct()
      * Executes the re-index of the informed models.
      *
      * @param  array  $models  Models array for indexing
-     * @return void
      */
     private function indexer(array $models): void
     {
diff --git a/packages/core/src/Console/InstallLunar.php b/packages/core/src/Console/InstallLunar.php
index 5bee998e41..d66b35dbd2 100644
--- a/packages/core/src/Console/InstallLunar.php
+++ b/packages/core/src/Console/InstallLunar.php
@@ -38,8 +38,6 @@ class InstallLunar extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return void
      */
     public function handle(): void
     {
@@ -258,7 +256,6 @@ public function handle(): void
      * Checks if config exists given a filename.
      *
      * @param  string  $fileName
-     * @return bool
      */
     private function configExists($fileName): bool
     {
@@ -271,8 +268,6 @@ private function configExists($fileName): bool
 
     /**
      * Returns a prompt if config exists and ask to override it.
-     *
-     * @return bool
      */
     private function shouldOverwriteConfig(): bool
     {
@@ -286,7 +281,6 @@ private function shouldOverwriteConfig(): bool
      * Publishes configuration for the Service Provider.
      *
      * @param  bool  $forcePublish
-     * @return void
      */
     private function publishConfiguration($forcePublish = false): void
     {
diff --git a/packages/core/src/DataTypes/Price.php b/packages/core/src/DataTypes/Price.php
index 6e684e4292..5a7e7024d6 100644
--- a/packages/core/src/DataTypes/Price.php
+++ b/packages/core/src/DataTypes/Price.php
@@ -13,8 +13,6 @@ class Price
      * Initialise the Price datatype.
      *
      * @param  mixed  $value
-     * @param  Currency  $currency
-     * @param  int  $unitQty
      */
     public function __construct(
         public $value,
diff --git a/packages/core/src/DataTypes/ShippingOption.php b/packages/core/src/DataTypes/ShippingOption.php
index 6200ec21eb..384b25cddf 100644
--- a/packages/core/src/DataTypes/ShippingOption.php
+++ b/packages/core/src/DataTypes/ShippingOption.php
@@ -33,8 +33,6 @@ public function getPrice()
 
     /**
      * Get prices for the purchasable item.
-     *
-     * @return \Illuminate\Support\Collection
      */
     public function getPrices(): Collection
     {
@@ -45,8 +43,6 @@ public function getPrices(): Collection
 
     /**
      * Return the purchasable unit quantity.
-     *
-     * @return int
      */
     public function getUnitQuantity(): int
     {
diff --git a/packages/core/src/DiscountTypes/AbstractDiscountType.php b/packages/core/src/DiscountTypes/AbstractDiscountType.php
index e83999e10c..1414ff3f19 100644
--- a/packages/core/src/DiscountTypes/AbstractDiscountType.php
+++ b/packages/core/src/DiscountTypes/AbstractDiscountType.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Auth;
 use Lunar\Base\DiscountTypeInterface;
 use Lunar\Base\ValueObjects\Cart\DiscountBreakdown;
 use Lunar\Models\Cart;
@@ -14,8 +13,6 @@ abstract class AbstractDiscountType implements DiscountTypeInterface
 {
     /**
      * The instance of the discount.
-     *
-     * @var Discount
      */
     public Discount $discount;
 
@@ -23,7 +20,6 @@ abstract class AbstractDiscountType implements DiscountTypeInterface
      * Set the data for the discount to user.
      *
      * @param  array  $data
-     * @return self
      */
     public function with(Discount $discount): self
     {
@@ -34,8 +30,6 @@ public function with(Discount $discount): self
 
     /**
      * Mark a discount as used
-     *
-     * @return self
      */
     public function markAsUsed(Cart $cart): self
     {
@@ -51,7 +45,6 @@ public function markAsUsed(Cart $cart): self
     /**
      * Return the eligible lines for the discount.
      *
-     * @param  Cart  $cart
      * @return Illuminate\Support\Collection
      */
     protected function getEligibleLines(Cart $cart): Collection
@@ -61,9 +54,6 @@ protected function getEligibleLines(Cart $cart): Collection
 
     /**
      * Check if discount's conditions met.
-     *
-     * @param  Cart  $cart
-     * @return bool
      */
     protected function checkDiscountConditions(Cart $cart): bool
     {
@@ -92,7 +82,6 @@ protected function checkDiscountConditions(Cart $cart): bool
     /**
      * Check if discount's conditions met.
      *
-     * @param  Cart  $cart
      * @param  Lunar\Base\ValueObjects\Cart\DiscountBreakdown  $breakdown
      * @return self
      */
diff --git a/packages/core/src/DiscountTypes/AmountOff.php b/packages/core/src/DiscountTypes/AmountOff.php
index c603fc2d72..5155432a50 100644
--- a/packages/core/src/DiscountTypes/AmountOff.php
+++ b/packages/core/src/DiscountTypes/AmountOff.php
@@ -13,8 +13,6 @@ class AmountOff extends AbstractDiscountType
 {
     /**
      * Return the name of the discount.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -49,10 +47,6 @@ public function apply(Cart $cart): Cart
 
     /**
      * Apply fixed value discount
-     *
-     * @param  array  $values
-     * @param  Cart  $cart
-     * @return Cart
      */
     private function applyFixedValue(array $values, Cart $cart): Cart
     {
@@ -146,9 +140,6 @@ private function applyFixedValue(array $values, Cart $cart): Cart
 
     /**
      * Return the eligible lines for the discount.
-     *
-     * @param  Cart  $cart
-     * @return \Illuminate\Support\Collection
      */
     protected function getEligibleLines(Cart $cart): \Illuminate\Support\Collection
     {
diff --git a/packages/core/src/DiscountTypes/BuyXGetY.php b/packages/core/src/DiscountTypes/BuyXGetY.php
index 2cf3fdcfca..51f1737a3e 100644
--- a/packages/core/src/DiscountTypes/BuyXGetY.php
+++ b/packages/core/src/DiscountTypes/BuyXGetY.php
@@ -14,8 +14,6 @@ class BuyXGetY extends AbstractDiscountType
 {
     /**
      * Return the name of the discount.
-     *
-     * @return string
      */
     public function getName(): string
     {
diff --git a/packages/core/src/Drivers/SystemTaxDriver.php b/packages/core/src/Drivers/SystemTaxDriver.php
index bc92283dff..2020fea385 100644
--- a/packages/core/src/Drivers/SystemTaxDriver.php
+++ b/packages/core/src/Drivers/SystemTaxDriver.php
@@ -16,36 +16,26 @@ class SystemTaxDriver implements TaxDriver
 {
     /**
      * The taxable shipping address.
-     *
-     * @var \Lunar\Base\Addressable|null
      */
     protected ?Addressable $shippingAddress = null;
 
     /**
      * The taxable billing address.
-     *
-     * @var \Lunar\Base\Addressable|null
      */
     protected ?Addressable $billingAddress = null;
 
     /**
      * The currency model.
-     *
-     * @var Currency
      */
     protected Currency $currency;
 
     /**
      * The purchasable item.
-     *
-     * @var Purchasable
      */
     protected Purchasable $purchasable;
 
     /**
      * The cart line model.
-     *
-     * @var CartLine|null
      */
     protected ?CartLine $cartLine = null;
 
@@ -91,9 +81,6 @@ public function setPurchasable(Purchasable $purchasable): self
 
     /**
      * Set the cart line.
-     *
-     * @param  CartLine  $cartLine
-     * @return self
      */
     public function setCartLine(CartLine $cartLine): self
     {
diff --git a/packages/core/src/Exceptions/Carts/CartException.php b/packages/core/src/Exceptions/Carts/CartException.php
index dbfcbde4dd..e97074527d 100644
--- a/packages/core/src/Exceptions/Carts/CartException.php
+++ b/packages/core/src/Exceptions/Carts/CartException.php
@@ -9,8 +9,6 @@ class CartException extends Exception
 {
     /**
      * The cart exception message bag
-     *
-     * @var MessageBag
      */
     protected MessageBag $messageBag;
 
diff --git a/packages/core/src/FieldTypes/File.php b/packages/core/src/FieldTypes/File.php
index 8b44e88436..05e4e55619 100644
--- a/packages/core/src/FieldTypes/File.php
+++ b/packages/core/src/FieldTypes/File.php
@@ -15,8 +15,6 @@ class File implements FieldType, JsonSerializable
 
     /**
      * The config to use.
-     *
-     * @var array
      */
     protected array $config = [];
 
diff --git a/packages/core/src/Generators/UrlGenerator.php b/packages/core/src/Generators/UrlGenerator.php
index 5aac7fafe4..39a2404bb5 100644
--- a/packages/core/src/Generators/UrlGenerator.php
+++ b/packages/core/src/Generators/UrlGenerator.php
@@ -17,8 +17,6 @@ class UrlGenerator
 
     /**
      * The default language.
-     *
-     * @var \Lunar\Models\Language
      */
     protected Language $defaultLanguage;
 
@@ -33,7 +31,6 @@ public function __construct()
     /**
      * Handle the URL generation.
      *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return void
      */
     public function handle(Model $model)
diff --git a/packages/core/src/Jobs/Collections/RebuildCollectionTree.php b/packages/core/src/Jobs/Collections/RebuildCollectionTree.php
index b8c38ec8c5..298b12f209 100644
--- a/packages/core/src/Jobs/Collections/RebuildCollectionTree.php
+++ b/packages/core/src/Jobs/Collections/RebuildCollectionTree.php
@@ -42,10 +42,6 @@ class RebuildCollectionTree implements ShouldQueue
 
     /**
      * Create a new job instance.
-     *
-     * @param  array  $newTree
-     * @param  array  $currentTree
-     * @param  \Lunar\Models\Collection|null  $parent
      */
     public function __construct(array $newTree, array $currentTree, Collection $parent = null)
     {
diff --git a/packages/core/src/Jobs/Collections/UpdateProductPositions.php b/packages/core/src/Jobs/Collections/UpdateProductPositions.php
index 208846efc0..ba30935fe5 100644
--- a/packages/core/src/Jobs/Collections/UpdateProductPositions.php
+++ b/packages/core/src/Jobs/Collections/UpdateProductPositions.php
@@ -22,15 +22,11 @@ class UpdateProductPositions implements ShouldQueue
 
     /**
      * The target collection.
-     *
-     * @var Collection
      */
     public Collection $collection;
 
     /**
      * Create a new job instance.
-     *
-     * @param  Collection  $collection
      */
     public function __construct(Collection $collection)
     {
diff --git a/packages/core/src/Jobs/Products/Associations/Associate.php b/packages/core/src/Jobs/Products/Associations/Associate.php
index c4b4964d95..dd4d9d8f8a 100644
--- a/packages/core/src/Jobs/Products/Associations/Associate.php
+++ b/packages/core/src/Jobs/Products/Associations/Associate.php
@@ -29,8 +29,6 @@ class Associate implements ShouldQueue
 
     /**
      * The parent product instance.
-     *
-     * @var \Lunar\Models\Product
      */
     protected Product $product;
 
@@ -44,7 +42,6 @@ class Associate implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param  \Lunar\Models\Product  $product
      * @param  mixed  $targets
      * @param  string  $type
      */
diff --git a/packages/core/src/Jobs/Products/Associations/Dissociate.php b/packages/core/src/Jobs/Products/Associations/Dissociate.php
index 2f98789c46..d8e8df1a34 100644
--- a/packages/core/src/Jobs/Products/Associations/Dissociate.php
+++ b/packages/core/src/Jobs/Products/Associations/Dissociate.php
@@ -29,8 +29,6 @@ class Dissociate implements ShouldQueue
 
     /**
      * The parent product instance.
-     *
-     * @var \Lunar\Models\Product
      */
     protected Product $product;
 
@@ -44,7 +42,6 @@ class Dissociate implements ShouldQueue
     /**
      * Create a new job instance.
      *
-     * @param  \Lunar\Models\Product  $product
      * @param  mixed  $targets
      * @param  string  $type
      */
diff --git a/packages/core/src/Jobs/SyncTags.php b/packages/core/src/Jobs/SyncTags.php
index 6e1c36d612..f3e2fbf175 100644
--- a/packages/core/src/Jobs/SyncTags.php
+++ b/packages/core/src/Jobs/SyncTags.php
@@ -24,23 +24,17 @@ class SyncTags implements ShouldQueue
 
     /**
      * The product instance.
-     *
-     * @var \Illuminate\Database\Eloquent\Model
      */
     protected Model $model;
 
     /**
      * The option values to use to generate variants.
-     *
-     * @var \Illuminate\Support\Collection
      */
     protected Collection $tags;
 
     /**
      * Create a new job instance.
      *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @param  \Illuminate\Support\Collection  $tags
      * @return void
      */
     public function __construct(Model $model, Collection $tags)
diff --git a/packages/core/src/Listeners/CartSessionAuthListener.php b/packages/core/src/Listeners/CartSessionAuthListener.php
index 07b90f2cda..815bb8cee2 100644
--- a/packages/core/src/Listeners/CartSessionAuthListener.php
+++ b/packages/core/src/Listeners/CartSessionAuthListener.php
@@ -22,7 +22,6 @@ public function __construct()
     /**
      * Handle the login event.
      *
-     * @param  \Illuminate\Auth\Events\Login  $event
      * @return void
      */
     public function login(Login $event)
@@ -54,7 +53,6 @@ public function login(Login $event)
     /**
      * Handle the logout event.
      *
-     * @param  \Illuminate\Auth\Events\Logout  $event
      * @return void
      */
     public function logout(Logout $event)
diff --git a/packages/core/src/LunarServiceProvider.php b/packages/core/src/LunarServiceProvider.php
index 78af32f7f3..2145d948f2 100644
--- a/packages/core/src/LunarServiceProvider.php
+++ b/packages/core/src/LunarServiceProvider.php
@@ -92,8 +92,6 @@ class LunarServiceProvider extends ServiceProvider
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
     public function register(): void
     {
@@ -164,8 +162,6 @@ public function register(): void
 
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot(): void
     {
@@ -258,8 +254,6 @@ protected function registerStateListeners()
 
     /**
      * Register the observers used in Lunar.
-     *
-     * @return void
      */
     protected function registerObservers(): void
     {
@@ -278,8 +272,6 @@ protected function registerObservers(): void
 
     /**
      * Register the blueprint macros.
-     *
-     * @return void
      */
     protected function registerBlueprintMacros(): void
     {
diff --git a/packages/core/src/Managers/CartSessionManager.php b/packages/core/src/Managers/CartSessionManager.php
index abeaa916df..c98db9d3e0 100644
--- a/packages/core/src/Managers/CartSessionManager.php
+++ b/packages/core/src/Managers/CartSessionManager.php
@@ -147,8 +147,6 @@ public function setCurrency(Currency $currency)
 
     /**
      * Return the current currency.
-     *
-     * @return \Lunar\Models\Currency
      */
     public function getCurrency(): Currency
     {
@@ -157,8 +155,6 @@ public function getCurrency(): Currency
 
     /**
      * Return the current channel.
-     *
-     * @return \Lunar\Models\Channel
      */
     public function getChannel(): Channel
     {
diff --git a/packages/core/src/Managers/DiscountManager.php b/packages/core/src/Managers/DiscountManager.php
index 68b921d14e..b86f494014 100644
--- a/packages/core/src/Managers/DiscountManager.php
+++ b/packages/core/src/Managers/DiscountManager.php
@@ -32,8 +32,6 @@ class DiscountManager implements DiscountManagerInterface
 
     /**
      * The available discounts
-     *
-     * @var null|Collection
      */
     protected ?Collection $discounts = null;
 
@@ -49,8 +47,6 @@ class DiscountManager implements DiscountManagerInterface
 
     /**
      * The applied discounts.
-     *
-     * @var Collection
      */
     protected Collection $applied;
 
@@ -66,9 +62,6 @@ public function __construct()
 
     /**
      * Set a single channel or a collection.
-     *
-     * @param  Channel|iterable  $channel
-     * @return self
      */
     public function channel(Channel|iterable $channel): self
     {
@@ -92,9 +85,6 @@ public function channel(Channel|iterable $channel): self
 
     /**
      * Set a single customer group or a collection.
-     *
-     * @param  CustomerGroup|iterable  $customerGroups
-     * @return self
      */
     public function customerGroup(CustomerGroup|iterable $customerGroups): self
     {
@@ -117,8 +107,6 @@ public function customerGroup(CustomerGroup|iterable $customerGroups): self
 
     /**
      * Return the applied channels.
-     *
-     * @return Collection
      */
     public function getChannels(): Collection
     {
@@ -127,8 +115,6 @@ public function getChannels(): Collection
 
     /**
      * Returns the available discounts.
-     *
-     * @return Collection
      */
     public function getDiscounts(): Collection
     {
@@ -170,8 +156,6 @@ public function getDiscounts(): Collection
 
     /**
      * Return the applied customer groups.
-     *
-     * @return Collection
      */
     public function getCustomerGroups(): Collection
     {
diff --git a/packages/core/src/Managers/PricingManager.php b/packages/core/src/Managers/PricingManager.php
index 777d51371d..8db8702b3c 100644
--- a/packages/core/src/Managers/PricingManager.php
+++ b/packages/core/src/Managers/PricingManager.php
@@ -16,8 +16,6 @@ class PricingManager implements PricingManagerInterface
 {
     /**
      * The instance of the purchasable model.
-     *
-     * @var \Lunar\Base\Purchasable
      */
     protected Purchasable $purchasable;
 
@@ -37,8 +35,6 @@ class PricingManager implements PricingManagerInterface
 
     /**
      * The quantity value.
-     *
-     * @var int
      */
     protected int $qty = 1;
 
@@ -59,7 +55,6 @@ public function __construct()
     /**
      * Set the purchasable property.
      *
-     * @param  \Lunar\Base\Purchasable  $purchasable
      * @return self
      */
     public function for(Purchasable $purchasable)
@@ -110,7 +105,6 @@ public function currency(?Currency $currency)
     /**
      * Set the quantity property.
      *
-     * @param  int  $qty
      * @return self
      */
     public function qty(int $qty)
diff --git a/packages/core/src/Models/Address.php b/packages/core/src/Models/Address.php
index 2f9bb3c886..f49c94a36d 100644
--- a/packages/core/src/Models/Address.php
+++ b/packages/core/src/Models/Address.php
@@ -38,8 +38,6 @@ class Address extends BaseModel implements Addressable
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\AddressFactory
      */
     protected static function newFactory(): AddressFactory
     {
@@ -67,7 +65,6 @@ protected static function newFactory(): AddressFactory
     /**
      * Mutator for the meta attribute.
      *
-     * @param  array|null  $value
      * @return void
      */
     public function setMetaAttribute(array $value = null)
diff --git a/packages/core/src/Models/Attribute.php b/packages/core/src/Models/Attribute.php
index 1933cf563e..b209556bc4 100644
--- a/packages/core/src/Models/Attribute.php
+++ b/packages/core/src/Models/Attribute.php
@@ -51,8 +51,6 @@ public static function boot()
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\AttributeFactory
      */
     protected static function newFactory(): AttributeFactory
     {
@@ -79,8 +77,6 @@ protected static function newFactory(): AttributeFactory
 
     /**
      * Return the attribuable relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function attributable(): MorphTo
     {
@@ -89,8 +85,6 @@ public function attributable(): MorphTo
 
     /**
      * Returns the attribute group relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
     public function attributeGroup(): BelongsTo
     {
@@ -100,7 +94,6 @@ public function attributeGroup(): BelongsTo
     /**
      * Apply the system scope to the query builder.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @param  string  $type
      * @return void
      */
diff --git a/packages/core/src/Models/AttributeGroup.php b/packages/core/src/Models/AttributeGroup.php
index faee7082ee..b13842c5a9 100644
--- a/packages/core/src/Models/AttributeGroup.php
+++ b/packages/core/src/Models/AttributeGroup.php
@@ -26,8 +26,6 @@ class AttributeGroup extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\AttributeGroupFactory
      */
     protected static function newFactory(): AttributeGroupFactory
     {
diff --git a/packages/core/src/Models/Brand.php b/packages/core/src/Models/Brand.php
index d396ae98f3..ca5760c6cf 100644
--- a/packages/core/src/Models/Brand.php
+++ b/packages/core/src/Models/Brand.php
@@ -51,8 +51,6 @@ class Brand extends BaseModel implements SpatieHasMedia
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\BrandFactory
      */
     protected static function newFactory(): BrandFactory
     {
@@ -61,8 +59,6 @@ protected static function newFactory(): BrandFactory
 
     /**
      * Get the name of the index associated with the model.
-     *
-     * @return string
      */
     public function searchableAs(): string
     {
@@ -84,8 +80,6 @@ public function getSearchableAttributes()
 
     /**
      * Return the product relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function products(): HasMany
     {
diff --git a/packages/core/src/Models/Cart.php b/packages/core/src/Models/Cart.php
index 50386bc60a..a14d0a577a 100644
--- a/packages/core/src/Models/Cart.php
+++ b/packages/core/src/Models/Cart.php
@@ -74,31 +74,23 @@ class Cart extends BaseModel
     /**
      * The cart sub total.
      * Sum of cart line amounts, before tax, shipping and cart-level discounts.
-     *
-     * @var null|Price
      */
     public ?Price $subTotal = null;
 
     /**
      * The shipping total for the cart.
-     *
-     * @var null|Price
      */
     public ?Price $shippingTotal = null;
 
     /**
      * The cart tax total.
      * Sum of all tax to pay across cart lines and shipping.
-     *
-     * @var null|Price
      */
     public ?Price $taxTotal = null;
 
     /**
      * The discount total.
      * Sum of all cart line discounts and cart-level discounts.
-     *
-     * @var null|Price
      */
     public ?Price $discountTotal = null;
 
@@ -112,8 +104,6 @@ class Cart extends BaseModel
     /**
      * The cart total.
      * Sum of the cart-line amounts, shipping and tax, minus cart-level discount amount.
-     *
-     * @var null|Price
      */
     public ?Price $total = null;
 
@@ -147,8 +137,6 @@ class Cart extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CartFactory
      */
     protected static function newFactory(): CartFactory
     {
@@ -251,7 +239,6 @@ public function order()
     /**
      * Apply scope to get active cart.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return void
      */
     public function scopeActive(Builder $query)
@@ -261,8 +248,6 @@ public function scopeActive(Builder $query)
 
     /**
      * Calculate the cart totals and cache the result.
-     *
-     * @return Cart
      */
     public function calculate(): Cart
     {
@@ -279,11 +264,6 @@ public function calculate(): Cart
 
     /**
      * Add or update a purchasable item to the cart
-     *
-     * @param  Purchasable  $purchasable
-     * @param  int  $quantity
-     * @param  array  $meta
-     * @return Cart
      */
     public function add(Purchasable $purchasable, int $quantity = 1, array $meta = [], bool $refresh = true): Cart
     {
@@ -306,7 +286,6 @@ public function add(Purchasable $purchasable, int $quantity = 1, array $meta = [
     /**
      * Add cart lines.
      *
-     * @param  iterable  $lines
      * @return bool
      */
     public function addLines(iterable $lines)
@@ -327,9 +306,6 @@ public function addLines(iterable $lines)
 
     /**
      * Remove a cart line
-     *
-     * @param  int  $cartLineId
-     * @return Cart
      */
     public function remove(int $cartLineId, bool $refresh = true): Cart
     {
@@ -349,10 +325,7 @@ public function remove(int $cartLineId, bool $refresh = true): Cart
     /**
      * Update cart line
      *
-     * @param  int  $cartLineId
-     * @param  int  $quantity
      * @param  array  $meta
-     * @return Cart
      */
     public function updateLine(int $cartLineId, int $quantity, $meta = null, bool $refresh = true): Cart
     {
@@ -374,7 +347,6 @@ public function updateLine(int $cartLineId, int $quantity, $meta = null, bool $r
     /**
      * Update cart lines.
      *
-     * @param  Collection  $lines
      * @return \Lunar\Models\Cart
      */
     public function updateLines(Collection $lines)
@@ -406,7 +378,6 @@ public function clear()
     /**
      * Associate a user to the cart
      *
-     * @param  User  $user
      * @param  string  $policy
      * @param  bool  $refresh
      * @return Cart
@@ -421,11 +392,6 @@ public function associate(User $user, $policy = 'merge', $refresh = true)
 
     /**
      * Add an address to the Cart.
-     *
-     * @param  array|Addressable  $address
-     * @param  string  $type
-     * @param  bool  $refresh
-     * @return Cart
      */
     public function addAddress(array|Addressable $address, string $type, bool $refresh = true): Cart
     {
@@ -446,7 +412,6 @@ public function addAddress(array|Addressable $address, string $type, bool $refre
     /**
      * Set the shipping address.
      *
-     * @param  \Lunar\Base\Addressable|array  $address
      * @return \Lunar\Models\Cart
      */
     public function setShippingAddress(array|Addressable $address)
@@ -457,7 +422,6 @@ public function setShippingAddress(array|Addressable $address)
     /**
      * Set the billing address.
      *
-     * @param  array|Addressable  $address
      * @return self
      */
     public function setBillingAddress(array|Addressable $address)
@@ -467,9 +431,6 @@ public function setBillingAddress(array|Addressable $address)
 
     /**
      * Set the shipping option to the shipping address.
-     *
-     * @param  ShippingOption  $option
-     * @return Cart
      */
     public function setShippingOption(ShippingOption $option, $refresh = true): Cart
     {
@@ -488,8 +449,6 @@ public function setShippingOption(ShippingOption $option, $refresh = true): Cart
 
     /**
      * Get the shipping option for the cart
-     *
-     * @return ShippingOption|null
      */
     public function getShippingOption(): ShippingOption|null
     {
diff --git a/packages/core/src/Models/CartAddress.php b/packages/core/src/Models/CartAddress.php
index 11387eba29..0b9e695cd7 100644
--- a/packages/core/src/Models/CartAddress.php
+++ b/packages/core/src/Models/CartAddress.php
@@ -58,29 +58,21 @@ class CartAddress extends BaseModel implements Addressable
 
     /**
      * The applied shipping option.
-     *
-     * @var ShippingOption|null
      */
     public ?ShippingOption $shippingOption = null;
 
     /**
      * The shipping sub total.
-     *
-     * @var Price|null
      */
     public ?Price $shippingSubTotal = null;
 
     /**
      * The shipping tax total.
-     *
-     * @var Price|null
      */
     public ?Price $shippingTaxTotal = null;
 
     /**
      * The shipping total.
-     *
-     * @var Price|null
      */
     public ?Price $shippingTotal = null;
 
@@ -93,8 +85,6 @@ class CartAddress extends BaseModel implements Addressable
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return CartAddressFactory
      */
     protected static function newFactory(): CartAddressFactory
     {
diff --git a/packages/core/src/Models/CartLine.php b/packages/core/src/Models/CartLine.php
index a33920471e..05f8ae1ea1 100644
--- a/packages/core/src/Models/CartLine.php
+++ b/packages/core/src/Models/CartLine.php
@@ -45,64 +45,46 @@ class CartLine extends BaseModel
 
     /**
      * The cart line unit price.
-     *
-     * @var null|Price
      */
     public ?Price $unitPrice = null;
 
     /**
      * The cart line sub total.
-     *
-     * @var null|Price
      */
     public ?Price $subTotal = null;
 
     /**
      * The discounted sub total
-     *
-     * @var null|Price
      */
     public ?Price $subTotalDiscounted = null;
 
     /**
      * The discount total.
-     *
-     * @var null|Price
      */
     public ?Price $discountTotal = null;
 
     /**
      * The cart line tax amount.
-     *
-     * @var null|Price
      */
     public ?Price $taxAmount = null;
 
     /**
      * The cart line total.
-     *
-     * @var null|Price
      */
     public ?Price $total = null;
 
     /**
      * The promotion description.
-     *
-     * @var string
      */
     public string $promotionDescription = '';
 
     /**
      * All the tax breakdowns for the cart line.
-     *
-     * @var \Lunar\Base\ValueObjects\Cart\TaxBreakdown
      */
     public TaxBreakdown $taxBreakdown;
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CartLineFactory
      */
     protected static function newFactory(): CartLineFactory
     {
diff --git a/packages/core/src/Models/Channel.php b/packages/core/src/Models/Channel.php
index 2f1e8608b0..b2499ceb35 100644
--- a/packages/core/src/Models/Channel.php
+++ b/packages/core/src/Models/Channel.php
@@ -31,8 +31,6 @@ class Channel extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ChannelFactory
      */
     protected static function newFactory(): ChannelFactory
     {
diff --git a/packages/core/src/Models/Collection.php b/packages/core/src/Models/Collection.php
index 539d4c572d..b6380fb03b 100644
--- a/packages/core/src/Models/Collection.php
+++ b/packages/core/src/Models/Collection.php
@@ -76,8 +76,6 @@ class Collection extends BaseModel implements SpatieHasMedia
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CollectionFactory
      */
     protected static function newFactory(): CollectionFactory
     {
@@ -162,8 +160,6 @@ public function getBreadcrumbAttribute()
 
     /**
      * Return the customer groups relationship.
-     *
-     * @return BelongsToMany
      */
     public function customerGroups(): BelongsToMany
     {
diff --git a/packages/core/src/Models/CollectionGroup.php b/packages/core/src/Models/CollectionGroup.php
index 055505b93e..05b23737be 100644
--- a/packages/core/src/Models/CollectionGroup.php
+++ b/packages/core/src/Models/CollectionGroup.php
@@ -23,8 +23,6 @@ class CollectionGroup extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CollectionGroupFactory
      */
     protected static function newFactory(): CollectionGroupFactory
     {
diff --git a/packages/core/src/Models/Country.php b/packages/core/src/Models/Country.php
index 96e4dc539f..7c8eb492d0 100644
--- a/packages/core/src/Models/Country.php
+++ b/packages/core/src/Models/Country.php
@@ -28,8 +28,6 @@ class Country extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CountryFactory
      */
     protected static function newFactory(): CountryFactory
     {
diff --git a/packages/core/src/Models/Currency.php b/packages/core/src/Models/Currency.php
index 06ce5d15cc..9e597198ef 100644
--- a/packages/core/src/Models/Currency.php
+++ b/packages/core/src/Models/Currency.php
@@ -38,8 +38,6 @@ class Currency extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CurrencyFactory
      */
     protected static function newFactory(): CurrencyFactory
     {
diff --git a/packages/core/src/Models/Customer.php b/packages/core/src/Models/Customer.php
index e1111ab206..d9d93759c5 100644
--- a/packages/core/src/Models/Customer.php
+++ b/packages/core/src/Models/Customer.php
@@ -71,8 +71,6 @@ class Customer extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CustomerFactory
      */
     protected static function newFactory(): CustomerFactory
     {
diff --git a/packages/core/src/Models/CustomerGroup.php b/packages/core/src/Models/CustomerGroup.php
index 2eaac2248b..1f6dbe3850 100644
--- a/packages/core/src/Models/CustomerGroup.php
+++ b/packages/core/src/Models/CustomerGroup.php
@@ -29,8 +29,6 @@ class CustomerGroup extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\CustomerGroupFactory
      */
     protected static function newFactory(): CustomerGroupFactory
     {
diff --git a/packages/core/src/Models/Discount.php b/packages/core/src/Models/Discount.php
index 1256950acf..07ae131ebf 100644
--- a/packages/core/src/Models/Discount.php
+++ b/packages/core/src/Models/Discount.php
@@ -49,8 +49,6 @@ class Discount extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return DiscountFactory
      */
     protected static function newFactory(): DiscountFactory
     {
@@ -114,8 +112,6 @@ public function collections()
 
     /**
      * Return the customer groups relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function customerGroups(): BelongsToMany
     {
@@ -145,7 +141,6 @@ public function brands()
     /**
      * Return the active scope.
      *
-     * @param  Builder  $query
      * @return void
      */
     public function scopeActive(Builder $query)
diff --git a/packages/core/src/Models/Language.php b/packages/core/src/Models/Language.php
index 551bf422b8..3b6d6e6da8 100644
--- a/packages/core/src/Models/Language.php
+++ b/packages/core/src/Models/Language.php
@@ -25,8 +25,6 @@ class Language extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\LanguageFactory
      */
     protected static function newFactory(): LanguageFactory
     {
diff --git a/packages/core/src/Models/Order.php b/packages/core/src/Models/Order.php
index b615ffa733..814195ba98 100644
--- a/packages/core/src/Models/Order.php
+++ b/packages/core/src/Models/Order.php
@@ -92,8 +92,6 @@ class Order extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\OrderFactory
      */
     protected static function newFactory(): OrderFactory
     {
diff --git a/packages/core/src/Models/OrderAddress.php b/packages/core/src/Models/OrderAddress.php
index a98451955b..3f470be307 100644
--- a/packages/core/src/Models/OrderAddress.php
+++ b/packages/core/src/Models/OrderAddress.php
@@ -42,8 +42,6 @@ class OrderAddress extends BaseModel implements Addressable
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\OrderAddressFactory
      */
     protected static function newFactory(): OrderAddressFactory
     {
diff --git a/packages/core/src/Models/OrderLine.php b/packages/core/src/Models/OrderLine.php
index f197b2eeb0..769aa491b8 100644
--- a/packages/core/src/Models/OrderLine.php
+++ b/packages/core/src/Models/OrderLine.php
@@ -40,8 +40,6 @@ class OrderLine extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\OrderLineFactory
      */
     protected static function newFactory(): OrderLineFactory
     {
diff --git a/packages/core/src/Models/Price.php b/packages/core/src/Models/Price.php
index 23e4394eac..487954ecf2 100644
--- a/packages/core/src/Models/Price.php
+++ b/packages/core/src/Models/Price.php
@@ -27,8 +27,6 @@ class Price extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\PriceFactory
      */
     protected static function newFactory(): PriceFactory
     {
diff --git a/packages/core/src/Models/Product.php b/packages/core/src/Models/Product.php
index c6ebbbfb04..da0a91f5e7 100644
--- a/packages/core/src/Models/Product.php
+++ b/packages/core/src/Models/Product.php
@@ -83,8 +83,6 @@ public function searchableAs()
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductFactory
      */
     protected static function newFactory(): ProductFactory
     {
@@ -240,8 +238,6 @@ public function getSearchableAttributes()
 
     /**
      * Return the customer groups relationship.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
     public function customerGroups(): BelongsToMany
     {
diff --git a/packages/core/src/Models/ProductAssociation.php b/packages/core/src/Models/ProductAssociation.php
index 8ae8305c41..3e21ad0530 100644
--- a/packages/core/src/Models/ProductAssociation.php
+++ b/packages/core/src/Models/ProductAssociation.php
@@ -51,8 +51,6 @@ class ProductAssociation extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductAssociationFactory
      */
     protected static function newFactory(): ProductAssociationFactory
     {
@@ -82,7 +80,6 @@ public function target()
     /**
      * Apply the cross sell scope.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return void
      */
     public function scopeCrossSell(Builder $query)
@@ -93,7 +90,6 @@ public function scopeCrossSell(Builder $query)
     /**
      * Apply the up sell scope.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return void
      */
     public function scopeUpSell(Builder $query)
@@ -104,7 +100,6 @@ public function scopeUpSell(Builder $query)
     /**
      * Apply the up alternate scope.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return void
      */
     public function scopeAlternate(Builder $query)
@@ -115,7 +110,6 @@ public function scopeAlternate(Builder $query)
     /**
      * Apply the type scope.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @param  string  $type
      * @return void
      */
diff --git a/packages/core/src/Models/ProductOption.php b/packages/core/src/Models/ProductOption.php
index 180491c5ef..12f11c9d74 100644
--- a/packages/core/src/Models/ProductOption.php
+++ b/packages/core/src/Models/ProductOption.php
@@ -65,8 +65,6 @@ public function searchableAs()
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductOptionFactory
      */
     protected static function newFactory(): ProductOptionFactory
     {
diff --git a/packages/core/src/Models/ProductOptionValue.php b/packages/core/src/Models/ProductOptionValue.php
index 21c399b18f..44e0a4be27 100644
--- a/packages/core/src/Models/ProductOptionValue.php
+++ b/packages/core/src/Models/ProductOptionValue.php
@@ -37,8 +37,6 @@ class ProductOptionValue extends BaseModel implements SpatieHasMedia
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductOptionValueFactory
      */
     protected static function newFactory(): ProductOptionValueFactory
     {
diff --git a/packages/core/src/Models/ProductType.php b/packages/core/src/Models/ProductType.php
index 33765ca2d7..02106b0baa 100644
--- a/packages/core/src/Models/ProductType.php
+++ b/packages/core/src/Models/ProductType.php
@@ -22,8 +22,6 @@ class ProductType extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductTypeFactory
      */
     protected static function newFactory(): ProductTypeFactory
     {
diff --git a/packages/core/src/Models/ProductVariant.php b/packages/core/src/Models/ProductVariant.php
index 611ada97b0..a3cb8b89d1 100644
--- a/packages/core/src/Models/ProductVariant.php
+++ b/packages/core/src/Models/ProductVariant.php
@@ -70,8 +70,6 @@ class ProductVariant extends BaseModel implements Purchasable
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\ProductVariantFactory
      */
     protected static function newFactory(): ProductVariantFactory
     {
@@ -122,8 +120,6 @@ public function getPrices(): Collection
 
     /**
      * Return the unit quantity for the variant.
-     *
-     * @return int
      */
     public function getUnitQuantity(): int
     {
diff --git a/packages/core/src/Models/State.php b/packages/core/src/Models/State.php
index a2f0063e9a..87a943ace8 100644
--- a/packages/core/src/Models/State.php
+++ b/packages/core/src/Models/State.php
@@ -22,8 +22,6 @@ class State extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\StateFactory
      */
     protected static function newFactory(): StateFactory
     {
diff --git a/packages/core/src/Models/Tag.php b/packages/core/src/Models/Tag.php
index edb7f9ced9..1f03d44a00 100644
--- a/packages/core/src/Models/Tag.php
+++ b/packages/core/src/Models/Tag.php
@@ -20,8 +20,6 @@ class Tag extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TagFactory
      */
     protected static function newFactory(): TagFactory
     {
diff --git a/packages/core/src/Models/TaxClass.php b/packages/core/src/Models/TaxClass.php
index e85ee8ab4c..ccc76dd65e 100644
--- a/packages/core/src/Models/TaxClass.php
+++ b/packages/core/src/Models/TaxClass.php
@@ -42,8 +42,6 @@ public static function booted()
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxClassFactory
      */
     protected static function newFactory(): TaxClassFactory
     {
diff --git a/packages/core/src/Models/TaxRate.php b/packages/core/src/Models/TaxRate.php
index 3cd6c26298..7faebfb098 100644
--- a/packages/core/src/Models/TaxRate.php
+++ b/packages/core/src/Models/TaxRate.php
@@ -22,8 +22,6 @@ class TaxRate extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxRateFactory
      */
     protected static function newFactory(): TaxRateFactory
     {
diff --git a/packages/core/src/Models/TaxRateAmount.php b/packages/core/src/Models/TaxRateAmount.php
index 9849a9f991..90ad50d962 100644
--- a/packages/core/src/Models/TaxRateAmount.php
+++ b/packages/core/src/Models/TaxRateAmount.php
@@ -29,8 +29,6 @@ class TaxRateAmount extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxRateAmountFactory
      */
     protected static function newFactory(): TaxRateAmountFactory
     {
diff --git a/packages/core/src/Models/TaxZone.php b/packages/core/src/Models/TaxZone.php
index c0913527f8..91a788d4ef 100644
--- a/packages/core/src/Models/TaxZone.php
+++ b/packages/core/src/Models/TaxZone.php
@@ -26,8 +26,6 @@ class TaxZone extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxZoneFactory
      */
     protected static function newFactory(): TaxZoneFactory
     {
diff --git a/packages/core/src/Models/TaxZoneCountry.php b/packages/core/src/Models/TaxZoneCountry.php
index 93d8c35cad..517ca82548 100644
--- a/packages/core/src/Models/TaxZoneCountry.php
+++ b/packages/core/src/Models/TaxZoneCountry.php
@@ -21,8 +21,6 @@ class TaxZoneCountry extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxZoneCountryFactory
      */
     protected static function newFactory(): TaxZoneCountryFactory
     {
diff --git a/packages/core/src/Models/TaxZoneCustomerGroup.php b/packages/core/src/Models/TaxZoneCustomerGroup.php
index 36601ac881..1f94965117 100644
--- a/packages/core/src/Models/TaxZoneCustomerGroup.php
+++ b/packages/core/src/Models/TaxZoneCustomerGroup.php
@@ -21,8 +21,6 @@ class TaxZoneCustomerGroup extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxZoneCustomerGroupFactory
      */
     protected static function newFactory(): TaxZoneCustomerGroupFactory
     {
diff --git a/packages/core/src/Models/TaxZonePostcode.php b/packages/core/src/Models/TaxZonePostcode.php
index 88843d5919..ad2b1c9fa2 100644
--- a/packages/core/src/Models/TaxZonePostcode.php
+++ b/packages/core/src/Models/TaxZonePostcode.php
@@ -22,8 +22,6 @@ class TaxZonePostcode extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxZonePostcodeFactory
      */
     protected static function newFactory(): TaxZonePostcodeFactory
     {
diff --git a/packages/core/src/Models/TaxZoneState.php b/packages/core/src/Models/TaxZoneState.php
index cca2278dd9..18ae418b55 100644
--- a/packages/core/src/Models/TaxZoneState.php
+++ b/packages/core/src/Models/TaxZoneState.php
@@ -21,8 +21,6 @@ class TaxZoneState extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TaxZoneStateFactory
      */
     protected static function newFactory(): TaxZoneStateFactory
     {
diff --git a/packages/core/src/Models/Transaction.php b/packages/core/src/Models/Transaction.php
index 8b929114d0..838be720c7 100644
--- a/packages/core/src/Models/Transaction.php
+++ b/packages/core/src/Models/Transaction.php
@@ -50,8 +50,6 @@ class Transaction extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\TransactionFactory
      */
     protected static function newFactory(): TransactionFactory
     {
diff --git a/packages/core/src/Models/Url.php b/packages/core/src/Models/Url.php
index 4f070aeae9..4b4bed8cf5 100644
--- a/packages/core/src/Models/Url.php
+++ b/packages/core/src/Models/Url.php
@@ -24,8 +24,6 @@ class Url extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\UrlFactory
      */
     protected static function newFactory(): UrlFactory
     {
diff --git a/packages/core/src/Models/UserDetail.php b/packages/core/src/Models/UserDetail.php
index f9de305979..c317e57842 100644
--- a/packages/core/src/Models/UserDetail.php
+++ b/packages/core/src/Models/UserDetail.php
@@ -15,8 +15,6 @@ class UserDetail extends BaseModel
 
     /**
      * Return a new factory instance for the model.
-     *
-     * @return \Lunar\Database\Factories\UserDetailFactory
      */
     protected static function newFactory(): UserDetailFactory
     {
@@ -25,8 +23,6 @@ protected static function newFactory(): UserDetailFactory
 
     /**
      * Return the user relationship.
-     *
-     * @return BelongsTo
      */
     public function user(): BelongsTo
     {
diff --git a/packages/core/src/Models/UserPermission.php b/packages/core/src/Models/UserPermission.php
index 1d1f32d900..9a22b67cf4 100644
--- a/packages/core/src/Models/UserPermission.php
+++ b/packages/core/src/Models/UserPermission.php
@@ -14,8 +14,6 @@ class UserPermission extends BaseModel
 
     /**
      * Return the user relationship.
-     *
-     * @return BelongsTo
      */
     public function user(): BelongsTo
     {
diff --git a/packages/core/src/Observers/AddressObserver.php b/packages/core/src/Observers/AddressObserver.php
index 98c16c8955..9e741ec6b3 100644
--- a/packages/core/src/Observers/AddressObserver.php
+++ b/packages/core/src/Observers/AddressObserver.php
@@ -9,7 +9,6 @@ class AddressObserver
     /**
      * Handle the Address "creating" event.
      *
-     * @param  \Lunar\Models\Address  $address
      * @return void
      */
     public function creating(Address $address)
@@ -21,7 +20,6 @@ public function creating(Address $address)
     /**
      * Handle the Address "updating" event.
      *
-     * @param  \Lunar\Models\Address  $address
      * @return void
      */
     public function updating(Address $address)
diff --git a/packages/core/src/Observers/CartLineObserver.php b/packages/core/src/Observers/CartLineObserver.php
index aa24dd7d32..8788761aed 100644
--- a/packages/core/src/Observers/CartLineObserver.php
+++ b/packages/core/src/Observers/CartLineObserver.php
@@ -11,7 +11,6 @@ class CartLineObserver
     /**
      * Handle the CartLine "creating" event.
      *
-     * @param  \Lunar\Models\CartLine  $cartLine
      * @return void
      */
     public function creating(CartLine $cartLine)
@@ -24,7 +23,6 @@ public function creating(CartLine $cartLine)
     /**
      * Handle the CartLine "updated" event.
      *
-     * @param  \Lunar\Models\CartLine  $cartLine
      * @return void
      */
     public function updating(CartLine $cartLine)
diff --git a/packages/core/src/Observers/ChannelObserver.php b/packages/core/src/Observers/ChannelObserver.php
index faeb5424b3..245753c111 100644
--- a/packages/core/src/Observers/ChannelObserver.php
+++ b/packages/core/src/Observers/ChannelObserver.php
@@ -9,7 +9,6 @@ class ChannelObserver
     /**
      * Handle the User "created" event.
      *
-     * @param  \Lunar\Models\Channel  $channel
      * @return void
      */
     public function created(Channel $channel)
@@ -20,7 +19,6 @@ public function created(Channel $channel)
     /**
      * Handle the User "updated" event.
      *
-     * @param  \Lunar\Models\Channel  $channel
      * @return void
      */
     public function updated(Channel $channel)
@@ -31,7 +29,6 @@ public function updated(Channel $channel)
     /**
      * Handle the User "deleted" event.
      *
-     * @param  \Lunar\Models\Channel  $channel
      * @return void
      */
     public function deleted(Channel $channel)
@@ -42,7 +39,6 @@ public function deleted(Channel $channel)
     /**
      * Handle the User "forceDeleted" event.
      *
-     * @param  \Lunar\Models\Channel  $channel
      * @return void
      */
     public function forceDeleted(Channel $channel)
@@ -54,7 +50,6 @@ public function forceDeleted(Channel $channel)
      * Ensures that only one default channel exists.
      *
      * @param  Channel  $savedChannel  The channel that was just saved.
-     * @return void
      */
     protected function ensureOnlyOneDefault(Channel $savedChannel): void
     {
diff --git a/packages/core/src/Observers/CollectionObserver.php b/packages/core/src/Observers/CollectionObserver.php
index b54d57c095..39f7e5329b 100644
--- a/packages/core/src/Observers/CollectionObserver.php
+++ b/packages/core/src/Observers/CollectionObserver.php
@@ -10,7 +10,6 @@ class CollectionObserver
     /**
      * Handle the Collection "updated" event.
      *
-     * @param  \Lunar\Models\Collection  $collection
      * @return void
      */
     public function updated(Collection $collection)
diff --git a/packages/core/src/Observers/CurrencyObserver.php b/packages/core/src/Observers/CurrencyObserver.php
index bc13105507..0b34c53e69 100644
--- a/packages/core/src/Observers/CurrencyObserver.php
+++ b/packages/core/src/Observers/CurrencyObserver.php
@@ -9,7 +9,6 @@ class CurrencyObserver
     /**
      * Handle the Currency "created" event.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return void
      */
     public function created(Currency $currency)
@@ -20,7 +19,6 @@ public function created(Currency $currency)
     /**
      * Handle the Currency "updated" event.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return void
      */
     public function updated(Currency $currency)
@@ -31,7 +29,6 @@ public function updated(Currency $currency)
     /**
      * Handle the Currency "deleted" event.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return void
      */
     public function deleted(Currency $currency)
@@ -42,7 +39,6 @@ public function deleted(Currency $currency)
     /**
      * Handle the Currency "forceDeleted" event.
      *
-     * @param  \Lunar\Models\Currency  $currency
      * @return void
      */
     public function forceDeleted(Currency $currency)
@@ -54,7 +50,6 @@ public function forceDeleted(Currency $currency)
      * Ensures that only one default currency exists.
      *
      * @param  \Lunar\Models\Currency  $savedCurrency  The currency that was just saved.
-     * @return void
      */
     protected function ensureOnlyOneDefault(Currency $savedCurrency): void
     {
diff --git a/packages/core/src/Observers/CustomerGroupObserver.php b/packages/core/src/Observers/CustomerGroupObserver.php
index 7496258f43..303125a305 100644
--- a/packages/core/src/Observers/CustomerGroupObserver.php
+++ b/packages/core/src/Observers/CustomerGroupObserver.php
@@ -9,7 +9,6 @@ class CustomerGroupObserver
     /**
      * Handle the Language "created" event.
      *
-     * @param  \Lunar\Models\CustomerGroup  $customerGroup
      * @return void
      */
     public function created(CustomerGroup $customerGroup)
@@ -20,7 +19,6 @@ public function created(CustomerGroup $customerGroup)
     /**
      * Handle the CustomerGroup "updated" event.
      *
-     * @param  \Lunar\Models\CustomerGroup  $customerGroup
      * @return void
      */
     public function updated(CustomerGroup $customerGroup)
@@ -31,7 +29,6 @@ public function updated(CustomerGroup $customerGroup)
     /**
      * Handle the CustomerGroup "deleted" event.
      *
-     * @param  \Lunar\Models\CustomerGroup  $customerGroup
      * @return void
      */
     public function deleted(CustomerGroup $customerGroup)
@@ -42,7 +39,6 @@ public function deleted(CustomerGroup $customerGroup)
     /**
      * Handle the CustomerGroup "forceDeleted" event.
      *
-     * @param  \Lunar\Models\CustomerGroup  $customerGroup
      * @return void
      */
     public function forceDeleted(CustomerGroup $customerGroup)
@@ -54,7 +50,6 @@ public function forceDeleted(CustomerGroup $customerGroup)
      * Ensures that only one default CustomerGroup exists.
      *
      * @param  \Lunar\Models\CustomerGroup  $savedCustomerGroup  The customer group that was just saved.
-     * @return void
      */
     protected function ensureOnlyOneDefault(CustomerGroup $savedCustomerGroup): void
     {
diff --git a/packages/core/src/Observers/LanguageObserver.php b/packages/core/src/Observers/LanguageObserver.php
index 8cdf98a076..b9ab1cf598 100644
--- a/packages/core/src/Observers/LanguageObserver.php
+++ b/packages/core/src/Observers/LanguageObserver.php
@@ -10,7 +10,6 @@ class LanguageObserver
     /**
      * Handle the Language "created" event.
      *
-     * @param  \Lunar\Models\Language  $language
      * @return void
      */
     public function created(Language $language)
@@ -21,7 +20,6 @@ public function created(Language $language)
     /**
      * Handle the Language "updated" event.
      *
-     * @param  \Lunar\Models\Language  $language
      * @return void
      */
     public function updated(Language $language)
@@ -32,7 +30,6 @@ public function updated(Language $language)
     /**
      * Handle the Language "deleted" event.
      *
-     * @param  \Lunar\Models\Language  $language
      * @return void
      */
     public function deleting(Language $language)
@@ -45,7 +42,6 @@ public function deleting(Language $language)
     /**
      * Handle the Language "forceDeleted" event.
      *
-     * @param  \Lunar\Models\Language  $language
      * @return void
      */
     public function forceDeleted(Language $language)
@@ -57,7 +53,6 @@ public function forceDeleted(Language $language)
      * Ensures that only one default language exists.
      *
      * @param  \Lunar\Models\Language  $savedLanguage  The language that was just saved.
-     * @return void
      */
     protected function ensureOnlyOneDefault(Language $savedLanguage): void
     {
diff --git a/packages/core/src/Observers/OrderLineObserver.php b/packages/core/src/Observers/OrderLineObserver.php
index 225c5603b3..e38fcbe792 100644
--- a/packages/core/src/Observers/OrderLineObserver.php
+++ b/packages/core/src/Observers/OrderLineObserver.php
@@ -11,7 +11,6 @@ class OrderLineObserver
     /**
      * Handle the OrderLine "creating" event.
      *
-     * @param  \Lunar\Models\OrderLine  $orderLine
      * @return void
      */
     public function creating(OrderLine $orderLine)
@@ -24,7 +23,6 @@ public function creating(OrderLine $orderLine)
     /**
      * Handle the OrderLine "updated" event.
      *
-     * @param  \Lunar\Models\OrderLine  $orderLine
      * @return void
      */
     public function updating(OrderLine $orderLine)
diff --git a/packages/core/src/Observers/UrlObserver.php b/packages/core/src/Observers/UrlObserver.php
index 604d586ae0..a73a303055 100644
--- a/packages/core/src/Observers/UrlObserver.php
+++ b/packages/core/src/Observers/UrlObserver.php
@@ -9,7 +9,6 @@ class UrlObserver
     /**
      * Handle the Url "created" event.
      *
-     * @param  \Lunar\Models\Url  $url
      * @return void
      */
     public function created(Url $url)
@@ -20,7 +19,6 @@ public function created(Url $url)
     /**
      * Handle the User "updated" event.
      *
-     * @param  \Lunar\Models\Url  $url
      * @return void
      */
     public function updated(Url $url)
@@ -31,7 +29,6 @@ public function updated(Url $url)
     /**
      * Handle the Url "deleted" event.
      *
-     * @param  \Lunar\Models\Url  $url
      * @return void
      */
     public function deleted(Url $url)
@@ -55,7 +52,6 @@ public function deleted(Url $url)
      * Ensures that only one default channel exists.
      *
      * @param  Url  $savedUrl  The url that was just saved.
-     * @return void
      */
     protected function ensureOnlyOneDefault(Url $savedUrl): void
     {
diff --git a/packages/core/src/PaymentTypes/AbstractPayment.php b/packages/core/src/PaymentTypes/AbstractPayment.php
index 2c8a984e88..ad6036dc59 100644
--- a/packages/core/src/PaymentTypes/AbstractPayment.php
+++ b/packages/core/src/PaymentTypes/AbstractPayment.php
@@ -24,8 +24,6 @@ abstract class AbstractPayment implements PaymentTypeInterface
 
     /**
      * Any config for this payment provider.
-     *
-     * @var array
      */
     protected array $config = [];
 
diff --git a/packages/core/src/Validation/BaseValidator.php b/packages/core/src/Validation/BaseValidator.php
index 5feedacb3e..eafb68e5ae 100644
--- a/packages/core/src/Validation/BaseValidator.php
+++ b/packages/core/src/Validation/BaseValidator.php
@@ -9,8 +9,6 @@ abstract class BaseValidator
 {
     /**
      * The parameters used in the validation
-     *
-     * @var array
      */
     protected array $parameters;
 
@@ -18,7 +16,6 @@ abstract class BaseValidator
      * Set the parameters to use for validation
      *
      * @param  array  $args
-     * @return self
      */
     public function using(...$args): self
     {
@@ -32,7 +29,6 @@ public function using(...$args): self
      *
      * @param  string  $where
      * @param  string  $reason
-     * @return bool
      */
     public function fail($where, $reason): bool
     {
@@ -53,8 +49,6 @@ public function fail($where, $reason): bool
 
     /**
      * Pass the validation
-     *
-     * @return bool
      */
     public function pass(): bool
     {
@@ -63,8 +57,6 @@ public function pass(): bool
 
     /**
      * Validate against the passed parameters.
-     *
-     * @return bool
      */
     abstract public function validate(): bool;
 }
diff --git a/packages/core/tests/Stubs/TestDiscountType.php b/packages/core/tests/Stubs/TestDiscountType.php
index e8aaad6a14..9cc35ef6a8 100644
--- a/packages/core/tests/Stubs/TestDiscountType.php
+++ b/packages/core/tests/Stubs/TestDiscountType.php
@@ -10,8 +10,6 @@ class TestDiscountType extends AbstractDiscountType
 {
     /**
      * Return the name of the discount.
-     *
-     * @return string
      */
     public function getName(): string
     {
diff --git a/packages/core/tests/Stubs/TestTaxDriver.php b/packages/core/tests/Stubs/TestTaxDriver.php
index 8fc55d67cf..a0e99d014c 100644
--- a/packages/core/tests/Stubs/TestTaxDriver.php
+++ b/packages/core/tests/Stubs/TestTaxDriver.php
@@ -17,29 +17,21 @@ class TestTaxDriver implements TaxDriver
 {
     /**
      * The taxable shipping address.
-     *
-     * @var \Lunar\Base\Addressable|null
      */
     protected ?Addressable $shippingAddress = null;
 
     /**
      * The taxable billing address.
-     *
-     * @var \Lunar\Base\Addressable|null
      */
     protected ?Addressable $billingAddress = null;
 
     /**
      * The currency model.
-     *
-     * @var Currency
      */
     protected Currency $currency;
 
     /**
      * The purchasable item.
-     *
-     * @var Purchasable
      */
     protected Purchasable $purchasable;
 
@@ -85,9 +77,6 @@ public function setPurchasable(Purchasable $purchasable): self
 
     /**
      * Set the cart line.
-     *
-     * @param  CartLine  $cartLine
-     * @return self
      */
     public function setCartLine(CartLine $cartLine): self
     {
diff --git a/packages/core/tests/Stubs/TestUrlGenerator.php b/packages/core/tests/Stubs/TestUrlGenerator.php
index 868a9e376d..85ef961b83 100644
--- a/packages/core/tests/Stubs/TestUrlGenerator.php
+++ b/packages/core/tests/Stubs/TestUrlGenerator.php
@@ -16,7 +16,6 @@ class TestUrlGenerator
     /**
      * Handle the URL generation.
      *
-     * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return void
      */
     public function handle(Model $model)
diff --git a/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php b/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php
index 9c52fa53e4..1a3f508829 100644
--- a/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php
+++ b/packages/core/tests/Unit/DiscountTypes/BuyXGetYTest.php
@@ -405,6 +405,7 @@ public function can_discount_purchasable_with_priority()
 
     /**
      * @test
+     *
      * @group flub
      *
      * Scenario
diff --git a/packages/licensing/src/License.php b/packages/licensing/src/License.php
index c86ddbbc5f..963ed51a30 100644
--- a/packages/licensing/src/License.php
+++ b/packages/licensing/src/License.php
@@ -7,7 +7,9 @@
 class License
 {
     const INVALID = 0;
+
     const DEVELOPMENT = 1;
+
     const UNLICENSED = 2;
 
     public string $id;
@@ -33,6 +35,7 @@ public function fill(array $properties): License
 
             if (method_exists($this, $setter)) {
                 $this->{$setter}($value);
+
                 continue;
             }
 
diff --git a/packages/licensing/tests/Unit/LicenseManagerTest.php b/packages/licensing/tests/Unit/LicenseManagerTest.php
index f17ce21ff1..a9e7f969e5 100644
--- a/packages/licensing/tests/Unit/LicenseManagerTest.php
+++ b/packages/licensing/tests/Unit/LicenseManagerTest.php
@@ -2,10 +2,10 @@
 
 namespace Lunar\Licensing\Tests\Unit;
 
+use Illuminate\Support\Facades\Http;
 use Lunar\Licensing\License;
 use Lunar\Licensing\LicenseManager;
 use Lunar\Licensing\Tests\TestCase;
-use Illuminate\Support\Facades\Http;
 
 /**
  * @group hub.menu
diff --git a/packages/licensing/tests/Unit/LicenseTest.php b/packages/licensing/tests/Unit/LicenseTest.php
index 446ccf568a..14fd1ead59 100644
--- a/packages/licensing/tests/Unit/LicenseTest.php
+++ b/packages/licensing/tests/Unit/LicenseTest.php
@@ -3,9 +3,7 @@
 namespace Lunar\Licensing\Tests\Unit;
 
 use Lunar\Licensing\License;
-use Lunar\Licensing\LicenseManager;
 use Lunar\Licensing\Tests\TestCase;
-use Illuminate\Support\Facades\Http;
 
 /**
  * @group hub.menu
diff --git a/utils/livewire-tables/src/Components/Actions/Action.php b/utils/livewire-tables/src/Components/Actions/Action.php
index 5de166f6fc..0a206c0af5 100644
--- a/utils/livewire-tables/src/Components/Actions/Action.php
+++ b/utils/livewire-tables/src/Components/Actions/Action.php
@@ -37,7 +37,6 @@ class Action extends Component implements Htmlable
      * Set the label on the action.
      *
      * @param  string  $label
-     * @return self
      */
     public function label($label): self
     {
diff --git a/utils/livewire-tables/src/Components/Actions/BulkAction.php b/utils/livewire-tables/src/Components/Actions/BulkAction.php
index bb51da8683..b60fc38ddc 100644
--- a/utils/livewire-tables/src/Components/Actions/BulkAction.php
+++ b/utils/livewire-tables/src/Components/Actions/BulkAction.php
@@ -13,8 +13,6 @@ class BulkAction extends Action
 
     /**
      * Whether to show the modal.
-     *
-     * @var bool
      */
     public bool $showModal = false;
 
@@ -39,7 +37,6 @@ public function resetState()
     /**
      * Set the selected ids
      *
-     * @param  array  $rows
      * @return void
      */
     public function setSelected(array $rows)
diff --git a/utils/livewire-tables/src/Components/Columns/AvatarColumn.php b/utils/livewire-tables/src/Components/Columns/AvatarColumn.php
index 0fec252497..c2f9d9eeef 100644
--- a/utils/livewire-tables/src/Components/Columns/AvatarColumn.php
+++ b/utils/livewire-tables/src/Components/Columns/AvatarColumn.php
@@ -6,8 +6,6 @@ class AvatarColumn extends BaseColumn
 {
     /**
      * Whether this should use gravatar
-     *
-     * @var bool
      */
     public bool $gravatar = false;
 
diff --git a/utils/livewire-tables/src/Components/Columns/BaseColumn.php b/utils/livewire-tables/src/Components/Columns/BaseColumn.php
index 0b3062d914..b72880958d 100644
--- a/utils/livewire-tables/src/Components/Columns/BaseColumn.php
+++ b/utils/livewire-tables/src/Components/Columns/BaseColumn.php
@@ -64,9 +64,6 @@ public function after($column)
 
     /**
      * Set the property value for sortable.
-     *
-     * @param  bool  $sortable
-     * @return self
      */
     public function sortable(bool $sortable = true): self
     {
@@ -133,7 +130,6 @@ public function getValue()
      * Set the record property.
      *
      * @param  mixed  $record
-     * @return self
      */
     public function record($record): self
     {
diff --git a/utils/livewire-tables/src/Components/Concerns/HasClosure.php b/utils/livewire-tables/src/Components/Concerns/HasClosure.php
index 4c36f4337b..1f48ba0288 100644
--- a/utils/livewire-tables/src/Components/Concerns/HasClosure.php
+++ b/utils/livewire-tables/src/Components/Concerns/HasClosure.php
@@ -15,9 +15,6 @@ trait HasClosure
 
     /**
      * Set the closure when returning the value of the column.
-     *
-     * @param  Closure  $closure
-     * @return self
      */
     public function value(Closure $closure): self
     {
diff --git a/utils/livewire-tables/src/Components/Concerns/HasLivewireComponent.php b/utils/livewire-tables/src/Components/Concerns/HasLivewireComponent.php
index 4c8bbc4fcd..7d582daa4a 100644
--- a/utils/livewire-tables/src/Components/Concerns/HasLivewireComponent.php
+++ b/utils/livewire-tables/src/Components/Concerns/HasLivewireComponent.php
@@ -15,7 +15,6 @@ trait HasLivewireComponent
      * Set the livewire component to render.
      *
      * @param  string  $livewire
-     * @return self
      */
     public function livewire($livewire): self
     {
@@ -26,8 +25,6 @@ public function livewire($livewire): self
 
     /**
      * Get the Livewire component name.
-     *
-     * @return string
      */
     public function getLivewire(): string
     {
@@ -40,8 +37,6 @@ public function getLivewire(): string
 
     /**
      * Returns whether we have the Livewire component set.
-     *
-     * @return bool
      */
     public function isLivewire(): bool
     {
diff --git a/utils/livewire-tables/src/Components/Concerns/HasSavedSearches.php b/utils/livewire-tables/src/Components/Concerns/HasSavedSearches.php
index 723ccf7244..d7cd48ca01 100644
--- a/utils/livewire-tables/src/Components/Concerns/HasSavedSearches.php
+++ b/utils/livewire-tables/src/Components/Concerns/HasSavedSearches.php
@@ -8,15 +8,11 @@ trait HasSavedSearches
 {
     /**
      * Whether the table can save searches.
-     *
-     * @var bool
      */
     public bool $canSaveSearches = false;
 
     /**
      * The saved search reference
-     *
-     * @var string|null
      */
     public ?string $savedSearch = null;
 
@@ -29,8 +25,6 @@ trait HasSavedSearches
 
     /**
      * Return the saved searches available to the table.
-     *
-     * @return Collection
      */
     public function getSavedSearchesProperty(): Collection
     {
@@ -100,8 +94,6 @@ public function resetSavedSearch()
 
     /**
      * Return whether the search state has filters or search applied.
-     *
-     * @return bool
      */
     public function getHasSearchAppliedProperty(): bool
     {
diff --git a/utils/livewire-tables/src/Components/Concerns/HasViewComponent.php b/utils/livewire-tables/src/Components/Concerns/HasViewComponent.php
index 78cd2c36c5..a91b7a3124 100644
--- a/utils/livewire-tables/src/Components/Concerns/HasViewComponent.php
+++ b/utils/livewire-tables/src/Components/Concerns/HasViewComponent.php
@@ -15,7 +15,6 @@ trait HasViewComponent
      * Set the view component.
      *
      * @param  string  $viewComponent
-     * @return self
      */
     public function viewComponent($viewComponent): self
     {
@@ -26,8 +25,6 @@ public function viewComponent($viewComponent): self
 
     /**
      * Whether the column is a view component.
-     *
-     * @return bool
      */
     public function isViewComponent(): bool
     {
@@ -36,8 +33,6 @@ public function isViewComponent(): bool
 
     /**
      * Return the reference to the view component.
-     *
-     * @return string
      */
     public function getViewComponent(): string
     {
diff --git a/utils/livewire-tables/src/Components/Head.php b/utils/livewire-tables/src/Components/Head.php
index f64b603f2d..3bac5e6ce5 100644
--- a/utils/livewire-tables/src/Components/Head.php
+++ b/utils/livewire-tables/src/Components/Head.php
@@ -8,8 +8,6 @@ class Head extends Component
 {
     /**
      * Whether the column should be sortable.
-     *
-     * @var bool
      */
     public bool $sortable = false;
 
diff --git a/utils/livewire-tables/src/Components/Table.php b/utils/livewire-tables/src/Components/Table.php
index b66ea32af1..5a46a7a9fd 100644
--- a/utils/livewire-tables/src/Components/Table.php
+++ b/utils/livewire-tables/src/Components/Table.php
@@ -33,15 +33,11 @@ class Table extends Component
 
     /**
      * Whether this table is searchable.
-     *
-     * @var bool
      */
     public bool $searchable = false;
 
     /**
      * If the table should show filters
-     *
-     * @var bool
      */
     public bool $filterable = true;
 
@@ -54,22 +50,16 @@ class Table extends Component
 
     /**
      * The array of selected rows.
-     *
-     * @var array
      */
     public array $selected = [];
 
     /**
      * The applied filters.
-     *
-     * @var array
      */
     public array $filters = [];
 
     /**
      * The number of records per page.
-     *
-     * @var int
      */
     public int $perPage = 50;
 
@@ -214,8 +204,6 @@ public function getBulkActionsProperty()
 
     /**
      * Return the search placeholder.
-     *
-     * @return string
      */
     public function getSearchPlaceholderProperty(): string
     {
diff --git a/utils/livewire-tables/src/Support/TableBuilder.php b/utils/livewire-tables/src/Support/TableBuilder.php
index 722a713468..6a5a5c5d01 100644
--- a/utils/livewire-tables/src/Support/TableBuilder.php
+++ b/utils/livewire-tables/src/Support/TableBuilder.php
@@ -12,78 +12,56 @@ class TableBuilder implements TableBuilderInterface
 {
     /**
      * The columns available to the table.
-     *
-     * @var Collection
      */
     public Collection $columns;
 
     /**
      * The base columns set on the table.
-     *
-     * @var Collection
      */
     public Collection $baseColumns;
 
     /**
      * The filters available to the table.
-     *
-     * @var Collection
      */
     public Collection $filters;
 
     /**
      * The actions available to the table.
-     *
-     * @var Collection
      */
     public Collection $actions;
 
     /**
      * The bulk actions available.
-     *
-     * @var Collection
      */
     public Collection $bulkActions;
 
     /**
      * The search term for the table.
-     *
-     * @var string|null
      */
     public ?string $searchTerm = null;
 
     /**
      * The number of records per page.
-     *
-     * @var int
      */
     public int $perPage = 50;
 
     /**
      * The field to sort using.
-     *
-     * @var string|null
      */
     public ?string $sortField = 'created_at';
 
     /**
      * The sort direction.
-     *
-     * @var string|null
      */
     public ?string $sortDir = 'desc';
 
     /**
      * The filters from the query string
-     *
-     * @var array
      */
     public array $queryStringFilters = [];
 
     /**
      * The empty message.
-     *
-     * @var string|null
      */
     public ?string $emptyMessage = '';
 
diff --git a/utils/livewire-tables/src/Support/TableBuilderInterface.php b/utils/livewire-tables/src/Support/TableBuilderInterface.php
index e0b8a57c67..c64138e0c2 100644
--- a/utils/livewire-tables/src/Support/TableBuilderInterface.php
+++ b/utils/livewire-tables/src/Support/TableBuilderInterface.php
@@ -15,7 +15,6 @@ interface TableBuilderInterface
      *
      * @param  string  $sortField
      * @param  string  $sortDir
-     * @return self
      */
     public function sort($sortField, $sortDir = 'desc'): self;
 
@@ -23,7 +22,6 @@ public function sort($sortField, $sortDir = 'desc'): self;
      * Set the search term on the table builder.
      *
      * @param  string  $searchTerm
-     * @return self
      */
     public function searchTerm($searchTerm): self;
 
@@ -31,90 +29,61 @@ public function searchTerm($searchTerm): self;
      * Set the results limit on the table builder.
      *
      * @param  int  $limit
-     * @return self
      */
     public function perPage(int $perPage): self;
 
     /**
      * Add a column to the table builder.
-     *
-     * @param  BaseColumn  $column
-     * @return self
      */
     public function addColumn(BaseColumn $column): self;
 
     /**
      * Add multiple columns to the table builder.
-     *
-     * @param  iterable  $columns
-     * @return self
      */
     public function addColumns(iterable $columns): self;
 
     /**
      * Set the base columns that the table builder needs.
-     *
-     * @param  iterable  $columns
-     * @return self
      */
     public function baseColumns(iterable $columns): self;
 
     /**
      * Return the columns for the table builder.
-     *
-     * @return Collection
      */
     public function getColumns(): Collection;
 
     /**
      * Add a filter to the table builder.
-     *
-     * @param  BaseFilter  $filter
-     * @return self
      */
     public function addFilter(BaseFilter $filter): self;
 
     /**
      * Return the filters for the table builder.
-     *
-     * @return Collection
      */
     public function getFilters(): Collection;
 
     /**
      * Add an action to the table builder.
-     *
-     * @param  Action  $action
-     * @return self
      */
     public function addAction(Action $action): self;
 
     /**
      * Return the actions for the table builder.
-     *
-     * @return Collection
      */
     public function getActions(): Collection;
 
     /**
      * Add a bulk action to the table builder.
-     *
-     * @param  BulkAction  $bulkAction
-     * @return self
      */
     public function addBulkAction(BulkAction $bulkAction): self;
 
     /**
      * Return the bulk actions for the table builder.
-     *
-     * @return Collection
      */
     public function getBulkActions(): Collection;
 
     /**
      * Get the data from the table builder.
-     *
-     * @return iterable
      */
     public function getData(): iterable;
 }
diff --git a/utils/scout-database-engine/src/DatabaseEngine.php b/utils/scout-database-engine/src/DatabaseEngine.php
index 7962b8deb4..7e789f60a3 100644
--- a/utils/scout-database-engine/src/DatabaseEngine.php
+++ b/utils/scout-database-engine/src/DatabaseEngine.php
@@ -90,7 +90,6 @@ public function delete($models)
     /**
      * Perform the given search on the engine.
      *
-     * @param  \Laravel\Scout\Builder  $builder
      * @return mixed
      */
     public function search(Builder $builder)
@@ -101,7 +100,6 @@ public function search(Builder $builder)
     /**
      * Perform the given search on the engine.
      *
-     * @param  \Laravel\Scout\Builder  $builder
      * @param  int  $perPage
      * @param  int  $page
      * @return mixed
@@ -152,7 +150,6 @@ public function mapIdsFrom($results, $key)
     /**
      * Map the given results to instances of the given model.
      *
-     * @param  \Laravel\Scout\Builder  $builder
      * @param  mixed  $results
      * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return \Illuminate\Database\Eloquent\Collection
@@ -178,7 +175,6 @@ public function map(Builder $builder, $results, $model)
     /**
      * Map the given results to instances of the given model via a lazy collection.
      *
-     * @param  \Laravel\Scout\Builder  $builder
      * @param  mixed  $results
      * @param  \Illuminate\Database\Eloquent\Model  $model
      * @return \Illuminate\Support\LazyCollection
@@ -214,7 +210,6 @@ public function flush($model)
      * Create a search index.
      *
      * @param  string  $name
-     * @param  array  $options
      * @return mixed
      *
      * @throws \Exception
@@ -238,7 +233,6 @@ public function deleteIndex($name)
     /**
      * Gets the index name to use.
      *
-     * @param  \Laravel\Scout\Builder  $builder
      * @return string
      */
     protected function getIndexFromBuilder(Builder $builder)
diff --git a/utils/scout-database-engine/src/ScoutDatabaseServiceProvider.php b/utils/scout-database-engine/src/ScoutDatabaseServiceProvider.php
index 8749feb668..9c9308b9f4 100644
--- a/utils/scout-database-engine/src/ScoutDatabaseServiceProvider.php
+++ b/utils/scout-database-engine/src/ScoutDatabaseServiceProvider.php
@@ -9,8 +9,6 @@ class ScoutDatabaseServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot(): void
     {
diff --git a/utils/scout-database-engine/tests/TestServiceProvider.php b/utils/scout-database-engine/tests/TestServiceProvider.php
index cba9f7dd9b..4df3e32671 100644
--- a/utils/scout-database-engine/tests/TestServiceProvider.php
+++ b/utils/scout-database-engine/tests/TestServiceProvider.php
@@ -8,8 +8,6 @@ class TestServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot(): void
     {