diff --git a/db.sql b/db.sql
index a3948c95..47a5c546 100644
--- a/db.sql
+++ b/db.sql
@@ -204,11 +204,9 @@ DROP TABLE IF EXISTS `client_tags`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `client_tags` (
-  `client_tag_id` int(11) NOT NULL AUTO_INCREMENT,
   `client_id` int(11) NOT NULL,
   `tag_id` int(11) NOT NULL,
-  `client_tag_created_at` datetime NOT NULL,
-  PRIMARY KEY (`client_tag_id`)
+  PRIMARY KEY (`client_id`,`tag_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1156,4 +1154,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-12-22 13:35:39
+-- Dump completed on 2021-12-22 14:33:03
diff --git a/post.php b/post.php
index c28570b1..9a915f0a 100644
--- a/post.php
+++ b/post.php
@@ -320,6 +320,8 @@ if(isset($_GET['delete_user'])){
     mysqli_query($mysqli,"DELETE FROM tickets WHERE ticket_created_by = $user_id");
     mysqli_query($mysqli,"DELETE FROM tickets WHERE ticket_closed_by = $user_id");
     mysqli_query($mysqli,"DELETE FROM ticket_replies WHERE ticket_reply_by = $user_id");
+    mysqli_query($mysqli,"DELETE FROM user_companies WHERE user_id = $user_id");
+    mysqli_query($mysqli,"DELETE FROM user_clients WHERE user_id = $user_id");
 
     //logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'User', log_action = 'Deleted', log_description = '$user_id', log_created_at = NOW()");
@@ -536,6 +538,11 @@ if(isset($_GET['delete_company'])){
     mysqli_query($mysqli,"DELETE FROM trips WHERE company_id = $company_id");
     mysqli_query($mysqli,"DELETE FROM vendors WHERE company_id = $company_id");
     mysqli_query($mysqli,"DELETE FROM settings WHERE company_id = $company_id");
+    mysqli_query($mysqli,"DELETE FROM api_keys WHERE company_id = $company_id");
+    mysqli_query($mysqli,"DELETE FROM campaigns WHERE company_id = $company_id");
+    mysqli_query($mysqli,"DELETE FROM messages WHERE company_id = $company_id");
+    mysqli_query($mysqli,"DELETE FROM custom_links WHERE company_id = $company_id");
+    mysqli_query($mysqli,"DELETE FROM user_companies WHERE company_id = $company_id");
     
     //Delete Company Files
     removeDirectory('uploads/clients/$company_id');
@@ -947,7 +954,7 @@ if(isset($_POST['add_client'])){
 
     foreach($_POST['tags'] as $tag_id){
         intval($tag_id);
-        mysqli_query($mysqli,"INSERT INTO client_tags SET client_id = $client_id, tag_id = $tag_id, client_tag_created_at = NOW()");
+        mysqli_query($mysqli,"INSERT INTO client_tags SET client_id = $client_id, tag_id = $tag_id");
     }
 
     $_SESSION['alert_message'] = "Client added";