diff --git a/post/admin/admin_tag.php b/post/admin/admin_tag.php
index 2602ebfb..d5df9008 100644
--- a/post/admin/admin_tag.php
+++ b/post/admin/admin_tag.php
@@ -49,7 +49,6 @@ if (isset($_GET['delete_tag'])) {
     $tag_name = sanitizeInput($row['tag_name']);
 
     mysqli_query($mysqli,"DELETE FROM tags WHERE tag_id = $tag_id");
-    mysqli_query($mysqli,"DELETE FROM client_tags WHERE tag_id = $tag_id");
 
     // Logging
     logAction("Tag", "Delete", "$session_name deleted tag $tag_name");
diff --git a/post/user/client.php b/post/user/client.php
index 71abd8d0..5d1051af 100644
--- a/post/user/client.php
+++ b/post/user/client.php
@@ -246,7 +246,7 @@ if (isset($_GET['delete_client'])) {
     }
     mysqli_query($mysqli, "DELETE FROM domains WHERE domain_client_id = $client_id");
 
-    mysqli_query($mysqli, "DELETE FROM events WHERE event_client_id = $client_id");
+    mysqli_query($mysqli, "DELETE FROM calendar_events WHERE event_client_id = $client_id");
     mysqli_query($mysqli, "DELETE FROM files WHERE file_client_id = $client_id");
     mysqli_query($mysqli, "DELETE FROM folders WHERE folder_client_id = $client_id");
 
@@ -268,7 +268,7 @@ if (isset($_GET['delete_client'])) {
     }
     mysqli_query($mysqli, "DELETE FROM locations WHERE location_client_id = $client_id");
 
-    mysqli_query($mysqli, "DELETE FROM logins WHERE login_client_id = $client_id");
+    mysqli_query($mysqli, "DELETE FROM credentials WHERE credential_client_id = $client_id");
     mysqli_query($mysqli, "DELETE FROM logs WHERE log_client_id = $client_id");
     mysqli_query($mysqli, "DELETE FROM networks WHERE network_client_id = $client_id");
     mysqli_query($mysqli, "DELETE FROM notifications WHERE notification_client_id = $client_id");
diff --git a/post/user/contact.php b/post/user/contact.php
index c1d60573..b780e5d6 100644
--- a/post/user/contact.php
+++ b/post/user/contact.php
@@ -704,14 +704,6 @@ if (isset($_POST['bulk_delete_contacts'])) {
 
             mysqli_query($mysqli, "DELETE FROM contacts WHERE contact_id = $contact_id AND contact_client_id = $client_id");
 
-            // Remove Relations
-            mysqli_query($mysqli, "DELETE FROM contact_tags WHERE contact_id = $contact_id");
-            mysqli_query($mysqli, "DELETE FROM contact_assets WHERE contact_id = $contact_id");
-            mysqli_query($mysqli, "DELETE FROM contact_documents WHERE contact_id = $contact_id");
-            mysqli_query($mysqli, "DELETE FROM contact_files WHERE contact_id = $contact_id");
-            mysqli_query($mysqli, "DELETE FROM contact_credentials WHERE contact_id = $contact_id");
-            mysqli_query($mysqli, "DELETE FROM contact_notes WHERE contact_note_contact_id = $contact_id");
-
             // Individual Logging
             logAction("Contact", "Delete", "$session_name deleted $contact_name", $client_id);
 
@@ -909,14 +901,6 @@ if (isset($_GET['delete_contact'])) {
 
     mysqli_query($mysqli,"DELETE FROM contacts WHERE contact_id = $contact_id");
 
-    // Remove Relations
-    mysqli_query($mysqli, "DELETE FROM contact_tags WHERE contact_id = $contact_id");
-    mysqli_query($mysqli, "DELETE FROM contact_assets WHERE contact_id = $contact_id");
-    mysqli_query($mysqli, "DELETE FROM contact_documents WHERE contact_id = $contact_id");
-    mysqli_query($mysqli, "DELETE FROM contact_files WHERE contact_id = $contact_id");
-    mysqli_query($mysqli, "DELETE FROM contact_credentials WHERE contact_id = $contact_id");
-    mysqli_query($mysqli, "DELETE FROM contact_notes WHERE contact_note_contact_id = $contact_id");
-
     //Logging
     logAction("Contact", "Delete", "$session_name deleted contact $contact_name", $client_id);
 
diff --git a/post/user/credential.php b/post/user/credential.php
index 056f11e0..49d07e06 100644
--- a/post/user/credential.php
+++ b/post/user/credential.php
@@ -134,13 +134,6 @@ if (isset($_GET['delete_credential'])) {
 
     mysqli_query($mysqli,"DELETE FROM credentials WHERE credential_id = $credential_id");
 
-    // Remove Relations
-    mysqli_query($mysqli,"DELETE FROM contact_credentials WHERE credential_id = $credential_id");
-    mysqli_query($mysqli,"DELETE FROM service_credentials WHERE credential_id = $credential_id");
-    mysqli_query($mysqli,"DELETE FROM software_credentials WHERE credential_id = $credential_id");
-    mysqli_query($mysqli,"DELETE FROM vendor_credentials WHERE credential_id = $credential_id");
-
-
     // Logging
     logAction("Credential", "Delete", "$session_name deleted credential $credential_name", $client_id);
 
@@ -303,12 +296,6 @@ if (isset($_POST['bulk_delete_credentials'])) {
 
             mysqli_query($mysqli, "DELETE FROM credentials WHERE credential_id = $credential_id AND credential_client_id = $client_id");
 
-            // Remove Relations
-            mysqli_query($mysqli,"DELETE FROM contact_credentials WHERE credential_id = $credential_id");
-            mysqli_query($mysqli,"DELETE FROM service_credentials WHERE credential_id = $credential_id");
-            mysqli_query($mysqli,"DELETE FROM software_credentials WHERE credential_id = $credential_id");
-            mysqli_query($mysqli,"DELETE FROM vendor_credentials WHERE credential_id = $credential_id");
-
             // Logging
             logAction("Credential", "Delete", "$session_name deleted credential $credential_name", $client_id);
 
diff --git a/post/user/document.php b/post/user/document.php
index 9c831086..48b14ffb 100644
--- a/post/user/document.php
+++ b/post/user/document.php
@@ -622,25 +622,6 @@ if (isset($_GET['delete_document_version'])) {
 
     mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id");
 
-    // Remove Associations
-    // File Association
-    mysqli_query($mysqli,"DELETE FROM document_files WHERE document_id = $document_id");
-
-    // Contact Associations
-    mysqli_query($mysqli,"DELETE FROM contact_documents WHERE document_id = $document_id");
-
-    // Asset Associations
-    mysqli_query($mysqli,"DELETE FROM asset_documents WHERE document_id = $document_id");
-
-    // Software Associations
-    mysqli_query($mysqli,"DELETE FROM software_documents WHERE document_id = $document_id");
-
-    // Vendor Associations
-    mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id");
-
-    // Service Associations
-    mysqli_query($mysqli,"DELETE FROM service_documents WHERE document_id = $document_id");
-
     //Logging
     logAction("Document Version", "Delete", "$session_name deleted document version $document_name", $client_id);
 
@@ -668,25 +649,6 @@ if (isset($_GET['delete_document'])) {
     // Delete all versions associated with the master document
     mysqli_query($mysqli,"DELETE FROM documents WHERE document_parent = $document_id");
 
-    // Remove Associations
-    // File Association
-    mysqli_query($mysqli,"DELETE FROM document_files WHERE document_id = $document_id");
-
-    // Contact Associations
-    mysqli_query($mysqli,"DELETE FROM contact_documents WHERE document_id = $document_id");
-
-    // Asset Associations
-    mysqli_query($mysqli,"DELETE FROM asset_documents WHERE document_id = $document_id");
-
-    // Software Associations
-    mysqli_query($mysqli,"DELETE FROM software_documents WHERE document_id = $document_id");
-
-    // Vendor Associations
-    mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id");
-
-    // Service Associations
-    mysqli_query($mysqli,"DELETE FROM service_documents WHERE document_id = $document_id");
-
     //Logging
     logAction("Document", "Delete", "$session_name deleted document $document_name and all versions", $client_id);
 
@@ -722,25 +684,6 @@ if (isset($_POST['bulk_delete_documents'])) {
             // Delete all versions associated with the master document
             mysqli_query($mysqli,"DELETE FROM documents WHERE document_parent = $document_id");
 
-            // Remove Associations
-            // File Association
-            mysqli_query($mysqli,"DELETE FROM document_files WHERE document_id = $document_id");
-
-            // Contact Associations
-            mysqli_query($mysqli,"DELETE FROM contact_documents WHERE document_id = $document_id");
-
-            // Asset Associations
-            mysqli_query($mysqli,"DELETE FROM asset_documents WHERE document_id = $document_id");
-
-            // Software Associations
-            mysqli_query($mysqli,"DELETE FROM software_documents WHERE document_id = $document_id");
-
-            // Vendor Associations
-            mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id");
-
-            // Service Associations
-            mysqli_query($mysqli,"DELETE FROM service_documents WHERE document_id = $document_id");
-
             //Logging
             logAction("Document", "Delete", "$session_name deleted document $document_name and all versions", $client_id);  
 
@@ -756,5 +699,3 @@ if (isset($_POST['bulk_delete_documents'])) {
     header("Location: " . $_SERVER["HTTP_REFERER"]);
 
 }
-
-
diff --git a/post/user/domain.php b/post/user/domain.php
index 3be8bb02..8091e0f0 100644
--- a/post/user/domain.php
+++ b/post/user/domain.php
@@ -206,8 +206,6 @@ if (isset($_GET['delete_domain'])) {
 
     mysqli_query($mysqli,"DELETE FROM domains WHERE domain_id = $domain_id");
 
-    mysqli_query($mysqli, "DELETE FROM domain_history WHERE domain_history_domain_id = $domain_id");#
-
     // Logging
     logAction("Domain", "Delete", "$session_name deleted domain $domain_name", $client_id);
 
diff --git a/post/user/file.php b/post/user/file.php
index 68b2305c..2c7bbd73 100644
--- a/post/user/file.php
+++ b/post/user/file.php
@@ -316,8 +316,6 @@ if (isset($_POST['delete_file'])) {
 
     mysqli_query($mysqli,"DELETE FROM files WHERE file_id = $file_id");
 
-    mysqli_query($mysqli,"DELETE FROM quote_files WHERE file_id = $file_id");
-
     //Logging
     logAction("File", "Delete", "$session_name deleted file $file_name", $client_id);
 
diff --git a/post/user/location.php b/post/user/location.php
index 6f44d167..a30958ec 100644
--- a/post/user/location.php
+++ b/post/user/location.php
@@ -185,10 +185,6 @@ if(isset($_GET['delete_location'])){
 
     mysqli_query($mysqli,"DELETE FROM locations WHERE location_id = $location_id");
 
-    // Tags
-    // Delete existing tags
-    mysqli_query($mysqli, "DELETE FROM location_tags WHERE location_id = $location_id");
-
     // Logging
     logAction("Location", "Delete", "$session_name deleted location $location_name", $client_id);
 
@@ -416,7 +412,7 @@ if(isset($_POST['export_locations_csv'])){
 
 }
 
-if(isset($_POST["import_locations_csv"])){
+if (isset($_POST["import_locations_csv"])) {
 
     enforceUserPermission('module_client', 2);
 
diff --git a/post/user/service.php b/post/user/service.php
index acc8fcf3..e314593a 100644
--- a/post/user/service.php
+++ b/post/user/service.php
@@ -183,15 +183,6 @@ if (isset($_GET['delete_service'])) {
     // Delete service
     mysqli_query($mysqli, "DELETE FROM services WHERE service_id = $service_id");
 
-    // Delete relations
-    // TODO: Convert this to a join delete
-    mysqli_query($mysqli, "DELETE FROM service_contacts WHERE service_id = $service_id");
-    mysqli_query($mysqli, "DELETE FROM service_vendors WHERE service_id = $service_id");
-    mysqli_query($mysqli, "DELETE FROM service_documents WHERE service_id = $service_id");
-    mysqli_query($mysqli, "DELETE FROM service_assets WHERE service_id = $service_id");
-    mysqli_query($mysqli, "DELETE FROM service_domains WHERE service_id = $service_id");
-    mysqli_query($mysqli, "DELETE FROM service_certificates WHERE service_id = $service_id");
-
     // Logging
     logAction("Service", "Delete", "$session_name deleted service $service_name", $client_id);
 
diff --git a/post/user/software.php b/post/user/software.php
index 58177a8e..f4699a7f 100644
--- a/post/user/software.php
+++ b/post/user/software.php
@@ -201,10 +201,6 @@ if (isset($_GET['delete_software'])) {
 
     mysqli_query($mysqli,"DELETE FROM software WHERE software_id = $software_id");
 
-    // Remove Software Relations
-    mysqli_query($mysqli,"DELETE FROM software_contacts WHERE software_id = $software_id");
-    mysqli_query($mysqli,"DELETE FROM software_assets WHERE software_id = $software_id");
-
     //Logging
     logAction("Software", "Delete", "$session_name deleted software $software_name and removed all device/user license associations", $client_id);
 
diff --git a/post/user/vendor.php b/post/user/vendor.php
index be4c0eb0..b68aaed2 100644
--- a/post/user/vendor.php
+++ b/post/user/vendor.php
@@ -143,12 +143,6 @@ if (isset($_GET['delete_vendor'])) {
 
     mysqli_query($mysqli,"DELETE FROM vendors WHERE vendor_id = $vendor_id");
 
-    // Remove Relations
-    mysqli_query($mysqli,"DELETE FROM vendor_files WHERE vendor_id = $vendor_id");
-    mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE vendor_id = $vendor_id");
-    mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE vendor_id = $vendor_id");
-    mysqli_query($mysqli,"DELETE FROM service_vendors WHERE vendor_id = $vendor_id");
-
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Vendor', log_action = 'Delete', log_description = '$session_name deleted vendor $vendor_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id");
 
@@ -263,12 +257,6 @@ if (isset($_POST['bulk_delete_vendors'])) {
 
             mysqli_query($mysqli, "DELETE FROM vendors WHERE vendor_id = $vendor_id AND vendor_client_id = $client_id");
 
-            // Remove Relations
-            mysqli_query($mysqli,"DELETE FROM vendor_files WHERE vendor_id = $vendor_id");
-            mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE vendor_id = $vendor_id");
-            mysqli_query($mysqli,"DELETE FROM vendor_logins WHERE vendor_id = $vendor_id");
-            mysqli_query($mysqli,"DELETE FROM service_vendors WHERE vendor_id = $vendor_id");
-
             // Logging
             logAction("Vendor", "Delete", "$session_name deleted vendor $vendor_name", $client_id);