diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index b15e9cf20..46223a64b 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -50,7 +50,6 @@
             colspan="{{ $colspan }}"
         >
             <div>
-                @php /** @var \Rappasoft\LaravelLivewireTables\Views\Column $column */ @endphp
                 @foreach($columns as $colIndex => $column)
                     @continue($column->isHidden())
                     @continue($this->columnSelectIsEnabled() && ! $this->columnSelectIsEnabledForColumn($column))
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
index 8320d2d9f..0ce20238b 100644
--- a/resources/views/components/table/td.blade.php
+++ b/resources/views/components/table/td.blade.php
@@ -2,7 +2,6 @@
 @props(['column', 'colIndex'])
 
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Column $column */
     $customAttributes = $this->getTdAttributes($column, $row, $colIndex, $rowIndex)
 @endphp
 
diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php
index 824bcf2af..ff1506dbe 100644
--- a/resources/views/components/table/td/plain.blade.php
+++ b/resources/views/components/table/td/plain.blade.php
@@ -1,7 +1,6 @@
 @aware(['component', 'rowIndex', 'rowID','isTailwind','isBootstrap'])
 @props(['column' => null, 'customAttributes' => [], 'displayMinimisedOnReorder' => false, 'hideUntilReorder' => false])
 
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Column|null $column */ @endphp
 
 @if ($isTailwind)
     <td x-cloak {{ $attributes
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index ee837bf28..d928dbb25 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -2,7 +2,6 @@
 @props(['column', 'index'])
 
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Column $column */
     $attributes = $attributes->merge(['wire:key' => $tableName . '-header-col-'.$column->getSlug()]);
     $allThAttributes = $this->getAllThAttributes($column);
 
diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php
index eb81b92d3..c3dbc72ea 100644
--- a/resources/views/components/tools/filter-label.blade.php
+++ b/resources/views/components/tools/filter-label.blade.php
@@ -2,7 +2,6 @@
 @props(['filter', 'filterLayout' => 'popover', 'tableName' => 'table', 'isTailwind' => false, 'isBootstrap' => false, 'isBootstrap4' => false, 'isBootstrap5' => false, 'for' => null])
 
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Filter $filter */
     $filterLabelAttributes = $filter->getFilterLabelAttributes();
     $customLabelAttributes = $filter->getLabelAttributes();
 @endphp
diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index 400de52b9..9e04fa0e0 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -14,7 +14,6 @@
             </small>
 
             @foreach($this->getAppliedFiltersWithValues() as $filterSelectName => $value)
-                @php /** @var \Rappasoft\LaravelLivewireTables\Views\Filter $filter */ @endphp
                 @php($filter = $this->getFilterByKey($filterSelectName))
                 @continue(is_null($filter) || $filter->isHiddenFromPills())
                 @php( $filterPillTitle = $filter->getFilterPillTitle())
diff --git a/resources/views/components/tools/filters/boolean.blade.php b/resources/views/components/tools/filters/boolean.blade.php
index ce7eb38c5..abc983581 100644
--- a/resources/views/components/tools/filters/boolean.blade.php
+++ b/resources/views/components/tools/filters/boolean.blade.php
@@ -1,5 +1,4 @@
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\BooleanFilter $filter */
     $defaultValue = ($filter->hasFilterDefaultValue() ? (bool) $filter->getFilterDefaultValue() : false)
 @endphp
 <div class="flex flex-cols"
diff --git a/resources/views/components/tools/filters/date-range.blade.php b/resources/views/components/tools/filters/date-range.blade.php
index 47bca62d5..f9cab0a75 100644
--- a/resources/views/components/tools/filters/date-range.blade.php
+++ b/resources/views/components/tools/filters/date-range.blade.php
@@ -1,5 +1,4 @@
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\DateRangeFilter $filter */
     $filterKey = $filter->getKey();
 @endphp
 
diff --git a/resources/views/components/tools/filters/date.blade.php b/resources/views/components/tools/filters/date.blade.php
index 3d008c9c2..e3c75f0b0 100644
--- a/resources/views/components/tools/filters/date.blade.php
+++ b/resources/views/components/tools/filters/date.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\DateFilter $filter */ @endphp
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
     <div @class([
diff --git a/resources/views/components/tools/filters/datetime.blade.php b/resources/views/components/tools/filters/datetime.blade.php
index c79edf5bf..1ca67a233 100644
--- a/resources/views/components/tools/filters/datetime.blade.php
+++ b/resources/views/components/tools/filters/datetime.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\DateTimeFilter $filter */ @endphp
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/filters/livewire-component-array-filter.blade.php b/resources/views/components/tools/filters/livewire-component-array-filter.blade.php
index e3b5f32f8..237d062fa 100644
--- a/resources/views/components/tools/filters/livewire-component-array-filter.blade.php
+++ b/resources/views/components/tools/filters/livewire-component-array-filter.blade.php
@@ -1,5 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\LivewireComponentArrayFilter $filter */ @endphp
-
 <div wire:key="filterComponents.{{ $filter->getKey() }}-wrapper">
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
     <livewire:dynamic-component :is="$livewireComponent" :tableComponent="get_class($this)" :filterKey="$filter->getKey()" :$tableName :key="'filterComponents-'.$filter->getKey()" wire:model="filterComponents.{{ $filter->getKey() }}" />
diff --git a/resources/views/components/tools/filters/livewire-component-filter.blade.php b/resources/views/components/tools/filters/livewire-component-filter.blade.php
index 1b0efa654..a430faf9f 100644
--- a/resources/views/components/tools/filters/livewire-component-filter.blade.php
+++ b/resources/views/components/tools/filters/livewire-component-filter.blade.php
@@ -1,5 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\LivewireComponentFilter $filter */ @endphp
-
 <div wire:key="filterComponents.{{ $filter->getKey() }}-wrapper">
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
     <livewire:dynamic-component :is="$livewireComponent" :tableComponent="get_class($this)" :filterKey="$filter->getKey()" :$tableName :key="'filterComponents-'.$filter->getKey()" wire:model.live="filterComponents.{{ $filter->getKey() }}" />
diff --git a/resources/views/components/tools/filters/multi-select-dropdown.blade.php b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
index f1aa4afd1..a9c86ff68 100644
--- a/resources/views/components/tools/filters/multi-select-dropdown.blade.php
+++ b/resources/views/components/tools/filters/multi-select-dropdown.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectDropdownFilter $filter */ @endphp
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/filters/multi-select.blade.php b/resources/views/components/tools/filters/multi-select.blade.php
index 97cc7edf7..582848bd3 100644
--- a/resources/views/components/tools/filters/multi-select.blade.php
+++ b/resources/views/components/tools/filters/multi-select.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\MultiSelectFilter $filter */ @endphp
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/filters/number-range.blade.php b/resources/views/components/tools/filters/number-range.blade.php
index f4ebef1a4..ecdc29573 100644
--- a/resources/views/components/tools/filters/number-range.blade.php
+++ b/resources/views/components/tools/filters/number-range.blade.php
@@ -1,5 +1,4 @@
 @php
-    /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\NumberRangeFilter $filter */
     $filterKey = $filter->getKey();
     $currentMin = $minRange = $filter->getConfig('minRange');
     $currentMax = $maxRange = $filter->getConfig('maxRange');
diff --git a/resources/views/components/tools/filters/number.blade.php b/resources/views/components/tools/filters/number.blade.php
index c130ef6d1..bca4f1956 100644
--- a/resources/views/components/tools/filters/number.blade.php
+++ b/resources/views/components/tools/filters/number.blade.php
@@ -1,5 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\NumberFilter $filter */ @endphp
-
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/filters/select.blade.php b/resources/views/components/tools/filters/select.blade.php
index 9eb3c3fdd..7ff281a76 100644
--- a/resources/views/components/tools/filters/select.blade.php
+++ b/resources/views/components/tools/filters/select.blade.php
@@ -1,5 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\SelectFilter $filter */ @endphp
-
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/filters/text-field.blade.php b/resources/views/components/tools/filters/text-field.blade.php
index b87f22b08..edf6898bc 100644
--- a/resources/views/components/tools/filters/text-field.blade.php
+++ b/resources/views/components/tools/filters/text-field.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Filters\TextFilter $filter */ @endphp
 <div>
     <x-livewire-tables::tools.filter-label :$filter :$filterLayout :$tableName :$isTailwind :$isBootstrap4 :$isBootstrap5 :$isBootstrap />
 
diff --git a/resources/views/components/tools/sorting-pills.blade.php b/resources/views/components/tools/sorting-pills.blade.php
index 8e959e3eb..7c688be86 100644
--- a/resources/views/components/tools/sorting-pills.blade.php
+++ b/resources/views/components/tools/sorting-pills.blade.php
@@ -7,7 +7,6 @@
                 <small class="text-gray-700 dark:text-white">{{ __($this->getLocalisationPath.'Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
-                    @php /** @var \Rappasoft\LaravelLivewireTables\Views\Column|null $column */ @endphp
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
 
                     @continue(is_null($column))
@@ -49,7 +48,6 @@ class="focus:outline-none active:outline-none"
                 <small>{{ __($this->getLocalisationPath.'Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
-                    @php /** @var \Rappasoft\LaravelLivewireTables\Views\Column|null $column */ @endphp
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
 
                     @continue(is_null($column))
@@ -90,7 +88,6 @@ class="badge badge-pill badge-light"
                 <small>{{ __($this->getLocalisationPath.'Applied Sorting') }}:</small>
 
                 @foreach($this->getSorts() as $columnSelectName => $direction)
-                    @php /** @var \Rappasoft\LaravelLivewireTables\Views\Column|null $column */ @endphp
                     @php($column = $this->getColumnBySelectName($columnSelectName) ?? $this->getColumnBySlug($columnSelectName))
 
                     @continue(is_null($column))
diff --git a/resources/views/components/tools/toolbar/items/filter-popover.blade.php b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
index b406312c1..03b8dbca0 100644
--- a/resources/views/components/tools/toolbar/items/filter-popover.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
@@ -9,7 +9,6 @@
         x-bind:class="{ 'show': filterPopoverOpen }"
         role="menu"
     >
-        @php /** @var \Rappasoft\LaravelLivewireTables\Views\Filter $filter */ @endphp
         @foreach ($this->getVisibleFilters() as $filter)
             <div
                 wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}-toolbar"
@@ -55,7 +54,6 @@ class="origin-top-left absolute left-0 mt-2 w-full md:w-56 rounded-md shadow-lg
         aria-orientation="vertical"
         aria-labelledby="filters-menu"
     >
-        @php /** @var \Rappasoft\LaravelLivewireTables\Views\Filter $filter */ @endphp
         @foreach ($this->getVisibleFilters() as $filter)
             <div class="py-1" role="none">
                 <div
diff --git a/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php b/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
index 6692a4e32..927461b10 100644
--- a/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
@@ -22,7 +22,6 @@
             ])
             row="{{ $filterRowIndex }}"
         >
-            @php /** @var \Rappasoft\LaravelLivewireTables\Views\Filter $filter */ @endphp
             @foreach ($filterRow as $filter)
                 <div
                     @class([
diff --git a/resources/views/includes/actions/button.blade.php b/resources/views/includes/actions/button.blade.php
index f142502d2..074a36de2 100644
--- a/resources/views/includes/actions/button.blade.php
+++ b/resources/views/includes/actions/button.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Action $action */ @endphp
 <a {{ $attributes->merge()
             ->class(['justify-center text-center items-center inline-flex space-x-2 rounded-md border shadow-sm px-4 py-2 text-sm font-medium focus:ring focus:ring-opacity-50' => $isTailwind && $attributes['default-styling'] ?? true])
             ->class(['focus:border-indigo-300 focus:ring-indigo-200' => $isTailwind && $attributes['default-colors'] ?? true])
diff --git a/resources/views/includes/columns/link.blade.php b/resources/views/includes/columns/link.blade.php
index a2f350d28..e361ae7f5 100644
--- a/resources/views/includes/columns/link.blade.php
+++ b/resources/views/includes/columns/link.blade.php
@@ -1,5 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn $column */ @endphp
-
 <a href="{{ $path }}" {!! count($attributes) ? $column->arrayToAttributes($attributes) : '' !!}>
     @if($column->isHtml())
         {!! $title !!}
diff --git a/resources/views/includes/columns/wire-link.blade.php b/resources/views/includes/columns/wire-link.blade.php
index 6770e3936..dc8add95c 100644
--- a/resources/views/includes/columns/wire-link.blade.php
+++ b/resources/views/includes/columns/wire-link.blade.php
@@ -1,4 +1,3 @@
-@php /** @var \Rappasoft\LaravelLivewireTables\Views\Columns\WireLinkColumn $column */ @endphp
 <button
     {!! count($attributes) ? $column->arrayToAttributes($attributes) : '' !!}
     @if($column->hasConfirmMessage())