diff --git a/edit_client_modal.php b/edit_client_modal.php
index 200c7543..64cf16cd 100644
--- a/edit_client_modal.php
+++ b/edit_client_modal.php
@@ -9,20 +9,12 @@
       </div>
       <form action="post.php" method="post" autocomplete="off">
         <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
-        <input type="hidden" name="location_id" value="<?php echo $location_id; ?>">
-        <input type="hidden" name="contact_id" value="<?php echo $contact_id; ?>">
         <div class="modal-body bg-white">
           
           <ul class="nav nav-pills nav-justified mb-3">
             <li class="nav-item">
               <a class="nav-link active" data-toggle="pill" href="#pills-client-details<?php echo $client_id; ?>">Details</a>
             </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-client-address<?php echo $client_id; ?>">Address</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" data-toggle="pill" href="#pills-client-contact<?php echo $client_id; ?>">Contact</a>
-            </li>
             <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#pills-client-notes<?php echo $client_id; ?>">Notes</a>
             </li>
@@ -83,6 +75,16 @@
                 </div>
               </div>
 
+              <div class="form-group">
+                <label>Website</label>
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
+                  </div>
+                  <input type="text" class="form-control" name="website" placeholder="ex. google.com" value="<?php echo $client_website; ?>">
+                </div>
+              </div>
+
               <div class="form-group">
                 <label>Currency <strong class="text-danger">*</strong></label>
                 <div class="input-group">
@@ -114,136 +116,6 @@
               </div>
 
             </div>
-          
-            <div class="tab-pane fade" id="pills-client-address<?php echo $client_id; ?>">
-
-              <div class="form-group">
-                <label>Address</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="address" placeholder="Street Address" value="<?php echo $location_address; ?>">
-                </div>
-              </div>
-          
-              <div class="form-group">
-                <label>City</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-city"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="city" placeholder="City" value="<?php echo $location_city; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>State / Province</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="state" placeholder="State or Province" value="<?php echo $location_state; ?>">
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Zip / Postal Code</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fab fa-fw fa-usps"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="zip" placeholder="Zip or Postal Code" value="<?php echo $location_zip; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Country</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-flag"></i></span>
-                  </div>
-                  <select class="form-control select2" name="country">
-                    <option value="">- Country -</option>
-                    <?php foreach($countries_array as $country_name) { ?>
-                    <option <?php if($location_country == $country_name) { echo "selected"; } ?>><?php echo $country_name; ?></option>
-                    <?php } ?>
-                  </select>
-                </div>
-              </div>
-            
-            </div>
-
-            <div class="tab-pane fade" id="pills-client-contact<?php echo $client_id; ?>">
-
-              <div class="form-group">
-                <label>Primary Contact</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="contact" placeholder="Primary contact name" value="<?php echo $contact_name; ?>"> 
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Title</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="title" placeholder="Title" value="<?php echo $contact_title; ?>"> 
-                </div>
-              </div>
-
-              <label>Phone</label>
-              <div class="form-row">
-                <div class="col-8">
-                  <div class="form-group">
-                    <div class="input-group">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text"><i class="fa fa-fw fa-phone"></i></span>
-                      </div>
-                      <input type="text" class="form-control" name="phone" placeholder="Phone Number" value="<?php echo $contact_phone; ?>"> 
-                    </div>
-                  </div>
-                </div>
-                <div class="col-4">
-                  <input type="text" class="form-control" name="extension" placeholder="Extension" value="<?php echo $contact_extension; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Mobile</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-mobile-alt"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="mobile" placeholder="Mobile Number" value="<?php echo $contact_mobile; ?>"> 
-                </div>
-              </div>
-              
-              <div class="form-group">
-                <label>Email</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
-                  </div>
-                  <input type="email" class="form-control" name="email" placeholder="Email Address" value="<?php echo $contact_email; ?>">
-                </div>
-              </div>
-
-              <div class="form-group">
-                <label>Website</label>
-                <div class="input-group">
-                  <div class="input-group-prepend">
-                    <span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
-                  </div>
-                  <input type="text" class="form-control" name="website" placeholder="ex. google.com" value="<?php echo $client_website; ?>">
-                </div>
-              </div>
-            
-            </div>
 
             <div class="tab-pane fade" id="pills-client-notes<?php echo $client_id; ?>">
 
diff --git a/post.php b/post.php
index bf0b6b1f..7d4b26a3 100644
--- a/post.php
+++ b/post.php
@@ -1060,21 +1060,8 @@ if(isset($_POST['add_client'])){
 if(isset($_POST['edit_client'])){
 
     $client_id = intval($_POST['client_id']);
-    $location_id = intval($_POST['location_id']);
-    $contact_id = intval($_POST['contact_id']);
     $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name'])));
     $type = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['type'])));
-    $country = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['country'])));
-    $address = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['address'])));
-    $city = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['city'])));
-    $state = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['state'])));
-    $zip = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['zip'])));
-    $contact = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['contact'])));
-    $title = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['title'])));
-    $phone = preg_replace("/[^0-9]/", '',$_POST['phone']);
-    $extension = preg_replace("/[^0-9]/", '',$_POST['extension']);
-    $mobile = preg_replace("/[^0-9]/", '',$_POST['mobile']);
-    $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
     $website = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['website'])));
     $referral = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['referral'])));
     $currency_code = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code'])));
@@ -1083,22 +1070,6 @@ if(isset($_POST['edit_client'])){
 
     mysqli_query($mysqli,"UPDATE clients SET client_name = '$name', client_type = '$type', client_website = '$website', client_referral = '$referral', client_currency_code = '$currency_code', client_net_terms = $net_terms, client_notes = '$notes', client_updated_at = NOW() WHERE client_id = $client_id AND company_id = $session_company_id");
 
-    //Edit Primary Location
-    if($location_id > 0){
-        mysqli_query($mysqli,"UPDATE locations SET location_address = '$address', location_city = '$city', location_state = '$state', location_zip = '$zip', location_country = '$country', location_updated_at = NOW() WHERE location_id = $location_id");
-
-        //Logging
-        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Location', log_action = 'Modify', log_description = '$session_name modified primary location $address', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_client_id = $client_id, log_user_id = $session_user_id, company_id = $session_company_id");
-    }
-
-    //Edit Primary Contact
-    if($contact_id > 0){
-        mysqli_query($mysqli,"UPDATE contacts SET contact_name = '$contact', contact_title = '$title', contact_phone = '$phone', contact_extension = '$extension', contact_mobile = '$mobile', contact_email = '$email', contact_updated_at = NOW() WHERE contact_id = $contact_id");
-
-        //Logging
-        mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Contact', log_action = 'Modify', log_description = '$session_name modified $contact', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_created_at = NOW(), log_client_id = $client_id, log_user_id = $session_user_id, company_id = $session_company_id");
-    }
-
     //Tags
     //Delete existing tags
     mysqli_query($mysqli,"DELETE FROM client_tags WHERE client_id = $client_id");