diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
index eee72d9210..88399592a7 100644
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -119,7 +119,6 @@ class UploadedFilesController extends Controller
      */
     public function store(UploadFileRequest $request, $object_type, $id) : JsonResponse
     {
-        \Log::debug('store fired');
 
         $object = self::$map_object_type[$object_type]::find($id);
         $this->authorize('view', $object);
@@ -209,9 +208,10 @@ class UploadedFilesController extends Controller
      */
     public function destroy($object_type, $id, $file_id) : JsonResponse
     {
+        \Log::error('destroy called for '.$object_type.' with id '.$id.' and file_id '.$file_id);
 
         $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('update', $file_id);
+        $this->authorize('update', self::$map_object_type[$object_type]);
 
         if (!$object) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
@@ -219,7 +219,7 @@ class UploadedFilesController extends Controller
 
 
         // Check for the file
-        $log = Actionlog::find($file_id)->where('item_type', AssetModel::class)
+        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
             ->where('item_id', $object->id)->first();
 
         if ($log) {
diff --git a/app/Http/Transformers/UploadedFilesTransformer.php b/app/Http/Transformers/UploadedFilesTransformer.php
index d61db90e3a..ee91d70974 100644
--- a/app/Http/Transformers/UploadedFilesTransformer.php
+++ b/app/Http/Transformers/UploadedFilesTransformer.php
@@ -29,14 +29,19 @@ class UploadedFilesTransformer
         $array = [
             'id' => (int) $file->id,
             'icon' => Helper::filetype_icon($file->filename),
+            'name' => e($file->filename),
+            'item' => ($file->item_type) ? [
+                'id' => (int) $file->item_id,
+                'type' => strtolower(class_basename($file->item_type)),
+            ] : null,
             'filename' => e($file->filename),
             'filetype' => StorageHelper::getFiletype($file->uploads_file_path()),
             'url' => $file->uploads_file_url(),
+            'note' =>  ($file->note) ? e($file->note) : null,
             'created_by' => ($file->adminuser) ? [
                 'id' => (int) $file->adminuser->id,
                 'name'=> e($file->adminuser->present()->fullName),
             ] : null,
-            'note' =>  ($file->note) ? e($file->note) : null,
             'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
             'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
             'inline' => StorageHelper::allowSafeInline($file->uploads_file_path()),
diff --git a/app/Presenters/UploadsPresenter.php b/app/Presenters/UploadsPresenter.php
index 63034ce96d..37f1c95f48 100644
--- a/app/Presenters/UploadsPresenter.php
+++ b/app/Presenters/UploadsPresenter.php
@@ -91,7 +91,7 @@ class UploadsPresenter extends Presenter
                 'sortable' => false,
                 'switchable' => false,
                 'title' => trans('table.actions'),
-                'formatter' => $object.'ActionsFormatter',
+                'formatter' => 'deleteUploadFormatter',
             ],
         ];
 
diff --git a/resources/views/blade/confirm-modal.blade.php b/resources/views/blade/confirm-modal.blade.php
new file mode 100644
index 0000000000..bee7a3c03a
--- /dev/null
+++ b/resources/views/blade/confirm-modal.blade.php
@@ -0,0 +1,32 @@
+{{-- IMPORTANT!!! Make sure there is no newline at the end of this file, or it will break the loaders for the tables --}}
+
+@props([
+    'route',
+    'id',
+    'method',
+])
+<div {{ $attributes->merge() }} id="dataConfirmModal" tabindex="-1" role="dialog"
+     aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h2 class="modal-title" id="myModalLabel">&nbsp;</h2>
+            </div>
+            <div class="modal-body"></div>
+            <div class="modal-footer">
+                <form method="post" id="{{ isset($id) ?? $id }}" role="form"{!! isset($route) ?? ' action="'.route($route).'"' !!}>
+                    {{ csrf_field() }}
+                    {{ method_field('DELETE') }}
+
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">
+                        {{ trans('general.cancel') }}
+                    </button>
+                    <button type="submit" class="btn btn-outline" id="dataConfirmOK">
+                        {{ trans('general.yes') }}
+                    </button>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/blade/filestable.blade.php b/resources/views/blade/filestable.blade.php
index a82f662b84..fd64dda00d 100644
--- a/resources/views/blade/filestable.blade.php
+++ b/resources/views/blade/filestable.blade.php
@@ -14,7 +14,6 @@
             data-cookie-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
             data-id-table="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
             id="{{ str_slug($object->name ?? $object->id) }}UploadsTable"
-            data-search="true"
             data-show-custom-view="true"
             data-custom-view="fileGalleryFormatter"
             data-show-custom-view-button="true"
@@ -38,6 +37,7 @@
                     }'>
     </table>
 
+<!-- this is used by the bootstrap-table partial to format the file gallery -->
 <template id="fileGalleryTemplate">
     <div class="col-md-4">
         <div class="panel panel-%PANEL_CLASS%">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index d83a7f0e33..a1fbd58a6f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -962,55 +962,8 @@ dir="{{ Helper::determineLanguageDirection() }}">
 
         <!-- end main container -->
 
-        <div class="modal modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog"
-             aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h2 class="modal-title" id="myModalLabel">&nbsp;</h2>
-                    </div>
-                    <div class="modal-body"></div>
-                    <div class="modal-footer">
-                        <form method="post" id="deleteForm" role="form">
-                            {{ csrf_field() }}
-                            {{ method_field('DELETE') }}
-
-                            <button type="button" class="btn btn-default pull-left"
-                                    data-dismiss="modal">{{ trans('general.cancel') }}</button>
-                            <button type="submit" class="btn btn-outline"
-                                    id="dataConfirmOK">{{ trans('general.yes') }}</button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-        <div class="modal modal-warning fade" id="restoreConfirmModal" tabindex="-1" role="dialog"
-             aria-labelledby="confirmModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title" id="confirmModalLabel">&nbsp;</h4>
-                    </div>
-                    <div class="modal-body"></div>
-                    <div class="modal-footer">
-                        <form method="post" id="restoreForm" role="form">
-                            {{ csrf_field() }}
-                            {{ method_field('POST') }}
-
-                            <button type="button" class="btn btn-default pull-left"
-                                    data-dismiss="modal">{{ trans('general.cancel') }}</button>
-                            <button type="submit" class="btn btn-outline"
-                                    id="dataConfirmOK">{{ trans('general.yes') }}</button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-
+        <x-confirm-modal class="modal modal-danger fade" id="deleteModal" method="DELETE"/>
+        <x-confirm-modal class="modal modal-warning fade" id="restoreModal" method="POST"/>
 
 
         {{-- Javascript files --}}
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 0f25132d6f..515b8e62df 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -345,11 +345,16 @@
     }
 
     function deleteUploadFormatter(value, row) {
+
+        var item_type = row.item.type;
+        if (item_type == 'assetmodel') {
+            item_type = 'models'
+        }
         if ((row.available_actions) && (row.available_actions.delete === true)) {
-            return '<a href="{{ config('app.url') }}/' + dest + '/' + row.id + '" '
+            return '<a href="{{ config('app.url') }}/' + item_type + '/' + row.item.id + '/showfile/' + row.id + '/delete" '
                 + ' class="actions btn btn-danger btn-sm delete-asset" data-tooltip="true"  '
                 + ' data-toggle="modal" '
-                + ' data-content="{{ trans('general.file_upload_status.confirm_delete') }} ' + name_for_box + '?" '
+                + ' data-content="{{ trans('general.file_upload_status.confirm_delete') }} ' + row.filename + '?" '
                 + ' data-title="{{  trans('general.delete') }}" onClick="return false;">'
                 + '<x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>&nbsp;';
         }
@@ -952,6 +957,18 @@
         } 
     }
 
+    function fileUploadDeleteFormatter(row, value) {
+
+        if ((value) && (value.filename) && (value.url)) {
+            if (value.exists_on_disk) {
+                return '<a href="' + value.url + '?inline=true" target="_blank">' + value.filename + '</a>';
+            } else {
+                return '<span data-tooltip="true" title="{{ trans('general.file_does_not_exist') }}"><x-icon type="x" class="text-danger" /> <del>' + value.filename + '</del></span>';
+            }
+
+        }
+    }
+
     function linkToUserSectionBasedOnCount (count, id, section) {
         if (count) {
             return '<a href="{{ config('app.url') }}/users/' + id + '#' + section +'">' + count + '</a>';
diff --git a/routes/api.php b/routes/api.php
index aec3ca65bf..56d630592e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1076,12 +1076,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi
             ]
             )->name('api.users.licenselist');
 
-            Route::post('{user}/upload',
-            [
-                Api\UsersController::class, 
-                'postUpload'
-            ]
-            )->name('api.users.uploads');
 
             Route::post('{user}/restore',
                 [
diff --git a/routes/web/hardware.php b/routes/web/hardware.php
index 21f4f40d41..b0bc5a3bfe 100644
--- a/routes/web/hardware.php
+++ b/routes/web/hardware.php
@@ -5,7 +5,6 @@ use App\Http\Controllers\Assets\AssetsController;
 use App\Http\Controllers\Assets\BulkAssetsController;
 use App\Http\Controllers\Assets\AssetCheckoutController;
 use App\Http\Controllers\Assets\AssetCheckinController;
-use App\Http\Controllers\Assets\AssetFilesController;
 use App\Models\Setting;
 use Tabuna\Breadcrumbs\Trail;
 use Illuminate\Support\Facades\Route;
@@ -141,17 +140,6 @@ Route::group(
             [AssetsController::class, 'getRestore']
         )->name('restore/hardware')->withTrashed();
 
-        Route::post('{asset}/upload',
-            [AssetFilesController::class, 'store']
-        )->name('upload/asset')->withTrashed();
-
-        Route::get('{asset}/showfile/{fileId}/{download?}',
-            [AssetFilesController::class, 'show']
-        )->name('show/assetfile')->withTrashed();
-
-        Route::delete('{asset}/showfile/{fileId}/delete',
-            [AssetFilesController::class, 'destroy']
-        )->name('delete/assetfile')->withTrashed();
 
         Route::post(
             'bulkedit',
diff --git a/routes/web/models.php b/routes/web/models.php
index 8c003ba662..e3262ab502 100644
--- a/routes/web/models.php
+++ b/routes/web/models.php
@@ -11,6 +11,10 @@ use Tabuna\Breadcrumbs\Trail;
 
 Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
 
+    Route::delete('{model}/showfile/{fileId}/delete',
+        [AssetModelsFilesController::class, 'destroy']
+    )->name('delete/modelfile')->withTrashed();
+
     Route::post('{model}/upload',
         [AssetModelsFilesController::class, 'store']
     )->name('upload/models')->withTrashed();
@@ -19,9 +23,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
         [AssetModelsFilesController::class, 'show']
     )->name('show/modelfile')->withTrashed();
 
-    Route::delete('{model}/showfile/{fileId}/delete',
-        [AssetModelsFilesController::class, 'destroy']
-    )->name('delete/modelfile')->withTrashed();
+
 
     Route::get(
         '{model}/clone',