diff --git a/ajax/ajax_asset_link_credential.php b/ajax/ajax_asset_link_credential.php
new file mode 100644
index 00000000..c075a283
--- /dev/null
+++ b/ajax/ajax_asset_link_credential.php
@@ -0,0 +1,69 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$asset_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM assets
+    WHERE asset_id = $asset_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$client_id = intval($row['asset_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Link Credential to <strong><?php echo $asset_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
+                </div>
+                <select class="form-control select2" name="credential_id">
+                    <option value="">- Select a Credential -</option>
+                    <?php
+                    $sql_credentials_select = mysqli_query($mysqli, "
+                        SELECT credentials.credential_id, credentials.credential_name
+                        FROM credentials
+                        LEFT JOIN assets ON credentials.credential_asset_id = assets.asset_id
+                        AND credentials.credential_asset_id = $asset_id
+                        WHERE credentials.credential_client_id = $client_id
+                        AND credentials.credential_asset_id = 0
+                        AND credentials.credential_archived_at IS NULL
+                        ORDER BY credentials.credential_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_credentials_select)) {
+                        $credential_id = intval($row['credential_id']);
+                        $credential_name = nullable_htmlentities($row['credential_name']);
+                        ?>
+                        <option value="<?php echo $credential_id ?>"><?php echo $credential_name; ?></option>
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="link_asset_to_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
+?>
diff --git a/ajax/ajax_asset_link_document.php b/ajax/ajax_asset_link_document.php
new file mode 100644
index 00000000..82020756
--- /dev/null
+++ b/ajax/ajax_asset_link_document.php
@@ -0,0 +1,70 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$asset_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM assets
+    WHERE asset_id = $asset_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$client_id = intval($row['asset_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-folder mr-2"></i>Link Document to <strong><?php echo $asset_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
+                </div>
+                <select class="form-control select2" name="document_id">
+                    <option value="">- Select a Document -</option>
+                    <?php
+                    $sql_documents_select = mysqli_query($mysqli, "
+                        SELECT documents.document_id, documents.document_name
+                        FROM documents
+                        LEFT JOIN asset_documents
+                        ON documents.document_id = asset_documents.document_id
+                        AND asset_documents.asset_id = $asset_id
+                        WHERE documents.document_client_id = $client_id
+                        AND documents.document_archived_at IS NULL
+                        AND asset_documents.asset_id IS NULL
+                        ORDER BY documents.document_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_documents_select)) {
+                        $document_id = intval($row['document_id']);
+                        $document_name = nullable_htmlentities($row['document_name']);
+                        ?>
+                        <option value="<?php echo $document_id ?>"><?php echo $document_name; ?></option>
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
+?>
diff --git a/ajax/ajax_asset_link_file.php b/ajax/ajax_asset_link_file.php
new file mode 100644
index 00000000..6cfdf871
--- /dev/null
+++ b/ajax/ajax_asset_link_file.php
@@ -0,0 +1,73 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$asset_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM assets
+    WHERE asset_id = $asset_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$client_id = intval($row['asset_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $asset_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-paperclip"></i></span>
+                </div>
+                <select class="form-control select2" name="file_id">
+                    <option value="">- Select a File -</option>
+                    <?php
+                    $sql_files_select = mysqli_query($mysqli, "
+                        SELECT files.file_id, files.file_name, folders.folder_name
+                        FROM files
+                        LEFT JOIN asset_files
+                            ON files.file_id = asset_files.file_id
+                            AND asset_files.asset_id = $asset_id
+                        LEFT JOIN folders
+                            ON folders.folder_id = files.file_folder_id
+                        WHERE files.file_client_id = $client_id
+                        AND asset_files.asset_id IS NULL
+                        ORDER BY folders.folder_name ASC, files.file_name ASC
+                    ");
+                    
+                    while ($row = mysqli_fetch_array($sql_files_select)) {
+                        $file_id = intval($row['file_id']);
+                        $file_name = nullable_htmlentities($row['file_name']);
+                        $folder_name = nullable_htmlentities($row['folder_name']);
+                        ?>
+                        <option value="<?php echo $file_id ?>"><?php echo "$folder_name/$file_name"; ?></option>
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="link_asset_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
+?>
diff --git a/ajax/ajax_asset_link_service.php b/ajax/ajax_asset_link_service.php
new file mode 100644
index 00000000..4e538aa2
--- /dev/null
+++ b/ajax/ajax_asset_link_service.php
@@ -0,0 +1,68 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$asset_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM assets
+    WHERE asset_id = $asset_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$client_id = intval($row['asset_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-stream mr-2"></i>Link Service to <strong><?php echo $asset_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-stream"></i></span>
+                </div>
+                <select class="form-control select2" name="service_id">
+                    <option value="">- Select a Service -</option>
+                    <?php
+                    $sql_services_select = mysqli_query($mysqli, "
+                        SELECT services.service_id, services.service_name
+                        FROM services
+                        LEFT JOIN service_assets
+                        ON services.service_id = service_assets.service_id
+                        AND service_assets.asset_id = $asset_id
+                        WHERE services.service_client_id = $client_id
+                        AND service_assets.asset_id IS NULL
+                        ORDER BY services.service_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_services_select)) {
+                        $service_id = intval($row['service_id']);
+                        $service_name = nullable_htmlentities($row['service_name']);
+                        ?>
+                        <option value="<?php echo $service_id ?>"><?php echo $service_name; ?></option>
+                        <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="link_service_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
diff --git a/ajax/ajax_asset_link_software.php b/ajax/ajax_asset_link_software.php
new file mode 100644
index 00000000..cf57e059
--- /dev/null
+++ b/ajax/ajax_asset_link_software.php
@@ -0,0 +1,73 @@
+<?php
+
+require_once '../includes/ajax_header.php';
+
+$asset_id = intval($_GET['id']);
+
+$sql = mysqli_query($mysqli, "SELECT * FROM assets
+    WHERE asset_id = $asset_id
+    LIMIT 1
+");
+
+$row = mysqli_fetch_array($sql);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$client_id = intval($row['asset_client_id']);
+
+// Generate the HTML form content using output buffering.
+ob_start();
+
+?>
+
+
+<div class="modal-header">
+    <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>License Software to <strong><?php echo $asset_name; ?></strong></h5>
+    <button type="button" class="close text-white" data-dismiss="modal">
+        <span>&times;</span>
+    </button>
+</div>
+<form action="post.php" method="post" autocomplete="off">
+    <input type="hidden" name="asset_id" value="<?php echo $asset_id; ?>">
+    <div class="modal-body bg-white">
+
+        <div class="form-group">
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
+                </div>
+                <select class="form-control select2" name="software_id">
+                    <option value="">- Select a Device Software License -</option>
+                    <?php
+                    $sql_software_select = mysqli_query($mysqli, "
+                        SELECT software.software_id, software.software_name
+                        FROM software
+                        LEFT JOIN software_assets
+                        ON software.software_id = software_assets.software_id
+                        AND software_assets.asset_id = $asset_id
+                        WHERE software.software_client_id = $client_id
+                        AND software.software_archived_at IS NULL
+                        AND software.software_license_type = 'Device'
+                        AND software_assets.asset_id IS NULL
+                        ORDER BY software.software_name ASC
+                    ");
+                    while ($row = mysqli_fetch_array($sql_software_select)) {
+                        $software_id = intval($row['software_id']);
+                        $software_name = nullable_htmlentities($row['software_name']);
+
+                        ?>
+                        <option value="<?php echo $software_id ?>"><?php echo $software_name; ?></option>
+                        <?php
+                    }
+                    ?>
+
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer bg-white">
+        <button type="submit" name="link_software_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
+        <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+    </div>
+</form>
+
+<?php
+require_once "../includes/ajax_footer.php";
\ No newline at end of file
diff --git a/asset_details.php b/asset_details.php
index 8c2fe149..ca4eaf2e 100644
--- a/asset_details.php
+++ b/asset_details.php
@@ -378,27 +378,40 @@ if (isset($_GET['asset_id'])) {
                 <div class="dropdown dropleft">
                     <button type="button" class="btn btn-outline-primary" data-toggle="dropdown"><i class="fas fa-link mr-2"></i>Link</button>
                     <div class="dropdown-menu">
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkSoftwareModal">
+                        <a class="dropdown-item text-dark" href="#"
+                            data-toggle="ajax-modal"
+                            data-ajax-url="ajax/ajax_asset_link_software.php"
+                            data-ajax-id="<?php echo $asset_id; ?>">
                             <i class="fa fa-fw fa-cube mr-2"></i>License
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkCredentialModal">
+                        <a class="dropdown-item text-dark" href="#"
+                            data-toggle="ajax-modal"
+                            data-ajax-url="ajax/ajax_asset_link_credential.php"
+                            data-ajax-id="<?php echo $asset_id; ?>">
                             <i class="fa fa-fw fa-key mr-2"></i>Credential
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkServiceModal">
+                        <a class="dropdown-item text-dark" href="#"
+                            data-toggle="ajax-modal"
+                            data-ajax-url="ajax/ajax_asset_link_service.php"
+                            data-ajax-id="<?php echo $asset_id; ?>">
                             <i class="fa fa-fw fa-stream mr-2"></i>Service
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkDocumentModal">
+                        <a class="dropdown-item text-dark" href="#"
+                            data-toggle="ajax-modal"
+                            data-ajax-url="ajax/ajax_asset_link_document.php"
+                            data-ajax-id="<?php echo $asset_id; ?>">
                             <i class="fa fa-fw fa-folder mr-2"></i>Document
                         </a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#linkFileModal">
+                        <a class="dropdown-item text-dark" href="#"
+                            data-toggle="ajax-modal"
+                            data-ajax-url="ajax/ajax_asset_link_file.php"
+                            data-ajax-id="<?php echo $asset_id; ?>">
                             <i class="fa fa-fw fa-paperclip mr-2"></i>File
-                        </a>
-                        
-                        
+                        </a>     
                     </div>
                 </div>
             </div>
@@ -1193,10 +1206,4 @@ require_once "modals/credential_add_modal.php";
 require_once "modals/client_document_add_modal.php";
 require_once "modals/client_file_upload_modal.php";
 
-require_once "modals/asset_link_software_modal.php";
-require_once "modals/asset_link_credential_modal.php";
-require_once "modals/asset_link_service_modal.php";
-require_once "modals/asset_link_document_modal.php";
-require_once "modals/asset_link_file_modal.php";
-
 require_once "includes/footer.php";
diff --git a/modals/asset_link_credential_modal.php b/modals/asset_link_credential_modal.php
deleted file mode 100644
index 8a1ca42b..00000000
--- a/modals/asset_link_credential_modal.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="modal" id="linkCredentialModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Link Credential to <strong><?php echo $asset_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo intval($_GET['asset_id']); ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
-                            </div>
-                            <select class="form-control select2" name="credential_id">
-                                <option value="">- Select a Credential -</option>
-                                <?php
-            
-                                $sql_credentials_select = mysqli_query($mysqli, "SELECT credential_id, credential_name FROM credentials
-                                    WHERE credential_client_id = $client_id
-                                    AND credential_asset_id != $contact_id
-                                    AND credential_asset_id = 0
-                                    AND credential_archived_at IS NULL
-                                    ORDER BY credential_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_credentials_select)) {
-                                    $credential_id = intval($row['credential_id']);
-                                    $credential_name = nullable_htmlentities($row['credential_name']);
-
-                                    ?>
-                                    <option value="<?php echo $credential_id ?>"><?php echo $credential_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="link_asset_to_credential" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/modals/asset_link_document_modal.php b/modals/asset_link_document_modal.php
deleted file mode 100644
index 52c6eb5d..00000000
--- a/modals/asset_link_document_modal.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<div class="modal" id="linkDocumentModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-folder mr-2"></i>Link Document to <strong><?php echo $asset_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo intval($_GET['asset_id']); ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                            </div>
-                            <select class="form-control select2" name="document_id">
-                                <option value="">- Select a Document -</option>
-                                <?php
-                                // Check if there are any associated documents
-                                if ($linked_documents) {
-                                    $excluded_document_ids = implode(",", $linked_documents);
-                                    $exclude_condition = "AND document_id NOT IN ($excluded_document_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed documents
-                                }
-
-                                $sql_documents_select = mysqli_query($mysqli, "SELECT * FROM documents
-                                    WHERE document_client_id = $client_id 
-                                    AND document_archived_at IS NULL
-                                    $exclude_condition
-                                    ORDER BY document_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_documents_select)) {
-                                    $document_id = intval($row['document_id']);
-                                    $document_name = nullable_htmlentities($row['document_name']);
-
-                                    ?>
-                                    <option value="<?php echo $document_id ?>"><?php echo $document_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="link_asset_to_document" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/modals/asset_link_file_modal.php b/modals/asset_link_file_modal.php
deleted file mode 100644
index 3c8f7e1f..00000000
--- a/modals/asset_link_file_modal.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<div class="modal" id="linkFileModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-paperclip mr-2"></i>Link File to <strong><?php echo $asset_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo intval($_GET['asset_id']); ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-paperclip"></i></span>
-                            </div>
-                            <select class="form-control select2" name="file_id">
-                                <option value="">- Select a File -</option>
-                                <?php
-                                // Check if there are any associated files
-                                if (!empty($linked_files)) {
-                                    $excluded_file_ids = implode(",", $linked_files);
-                                    $exclude_condition = "AND file_id NOT IN ($excluded_file_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed vendors
-                                }
-
-                                $sql_files_select = mysqli_query($mysqli, "SELECT * FROM files 
-                                    LEFT JOIN folders ON folder_id = file_folder_id
-                                    WHERE file_client_id = $client_id 
-                                    $exclude_condition
-                                    ORDER BY folder_name ASC, file_name ASC"
-                                );
-                                
-                                while ($row = mysqli_fetch_array($sql_files_select)) {
-                                    $file_id = intval($row['file_id']);
-                                    $file_name = nullable_htmlentities($row['file_name']);
-                                    $folder_name = nullable_htmlentities($row['folder_name']);
-
-                                    ?>
-                                    <option value="<?php echo $file_id ?>"><?php echo "$folder_name/$file_name"; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="link_asset_to_file" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/modals/asset_link_service_modal.php b/modals/asset_link_service_modal.php
deleted file mode 100644
index 89f55ece..00000000
--- a/modals/asset_link_service_modal.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<div class="modal" id="linkServiceModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-stream mr-2"></i>Link Service to <strong><?php echo $asset_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo intval($_GET['asset_id']); ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-stream"></i></span>
-                            </div>
-                            <select class="form-control select2" name="service_id">
-                                <option value="">- Select a Service -</option>
-                                <?php
-                                // Check if there are any associated services
-                                if (!empty($linked_services)) {
-                                    $excluded_service_ids = implode(",", $linked_services);
-                                    $exclude_condition = "AND service_id NOT IN ($excluded_service_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed services
-                                }
-
-                                $sql_services_select = mysqli_query($mysqli, "SELECT * FROM services
-                                    WHERE service_client_id = $client_id
-                                    $exclude_condition
-                                    ORDER BY service_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_services_select)) {
-                                    $service_id = intval($row['service_id']);
-                                    $service_name = nullable_htmlentities($row['service_name']);
-
-                                    ?>
-                                    <option value="<?php echo $service_id ?>"><?php echo $service_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="link_service_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>
diff --git a/modals/asset_link_software_modal.php b/modals/asset_link_software_modal.php
deleted file mode 100644
index 747d177e..00000000
--- a/modals/asset_link_software_modal.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="modal" id="linkSoftwareModal" tabindex="-1">
-    <div class="modal-dialog">
-        <div class="modal-content bg-dark">
-            <div class="modal-header">
-                <h5 class="modal-title"><i class="fa fa-fw fa-cube mr-2"></i>License Software to <strong><?php echo $asset_name; ?></strong></h5>
-                <button type="button" class="close text-white" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="asset_id" value="<?php echo intval($_GET['asset_id']); ?>">
-                <div class="modal-body bg-white">
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text"><i class="fa fa-fw fa-cube"></i></span>
-                            </div>
-                            <select class="form-control select2" name="software_id">
-                                <option value="">- Select a Device Software License -</option>
-                                <?php
-                                // Check if there are any associated sofctware
-                                if (!empty($linked_software)) {
-                                    $excluded_software_ids = implode(",", $linked_software);
-                                    $exclude_condition = "AND software_id NOT IN ($excluded_software_ids)";
-                                } else {
-                                    $exclude_condition = "";  // No condition if there are no displayed software
-                                }
-
-                                $sql_software_select = mysqli_query($mysqli, "SELECT * FROM software
-                                    WHERE software_client_id = $client_id
-                                    AND software_archived_at IS NULL
-                                    AND software_license_type = 'Device'
-                                    $exclude_condition
-                                    ORDER BY software_name ASC"
-                                );
-                                while ($row = mysqli_fetch_array($sql_software_select)) {
-                                    $software_id = intval($row['software_id']);
-                                    $software_name = nullable_htmlentities($row['software_name']);
-
-                                    ?>
-                                    <option value="<?php echo $software_id ?>"><?php echo $software_name; ?></option>
-                                    <?php
-                                }
-                                ?>
-
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer bg-white">
-                    <button type="submit" name="link_software_to_asset" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Link</button>
-                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>