diff --git a/headscale.py b/headscale.py
index 6f4943a..8d0b1cb 100644
--- a/headscale.py
+++ b/headscale.py
@@ -1,7 +1,7 @@
-import requests, json, os, sys
+import requests, json, os
 from os.path             import exists
 from cryptography.fernet import Fernet
-from datetime            import datetime, timedelta, date
+from datetime            import timedelta, date
 from dateutil            import parser
 from flask               import Flask
 
@@ -57,7 +57,7 @@ def expire_key(url, api_key):
                 'Authorization': 'Bearer '+str(api_key)
                 }
         )
-        return 0
+        return response.status_code
 
 # Checks if the key needs to be renewed
 # If it does, renews the key, then expires the old key
@@ -144,8 +144,6 @@ def register_machine(url, api_key, machine_key, user):
 
 # Sets the machines tags
 def set_machine_tags(url, api_key, machine_id, tags_list):
-    json_payload=json.dumps(tags_list)
-
     response = requests.post(
         str(url)+"/api/v1/machine/"+str(machine_id)+"/tags",
         data=tags_list,
diff --git a/helper.py b/helper.py
index 79c5883..e328286 100644
--- a/helper.py
+++ b/helper.py
@@ -1,6 +1,4 @@
-import sys, pytz, os, headscale, requests
-from datetime import datetime, timedelta, date
-from dateutil import parser
+import os, headscale, requests
 from flask    import Flask
 
 app = Flask(__name__)
@@ -87,7 +85,7 @@ def format_error_message(type, title, message):
         <ul class="collection">
         <li class="collection-item avatar">
     """
-
+    
     match type.lower():
         case "warning":
             icon  = """<i class="material-icons circle yellow">priority_high</i>"""
diff --git a/renderer.py b/renderer.py
index a91ff8c..b17e6ea 100644
--- a/renderer.py
+++ b/renderer.py
@@ -1,6 +1,6 @@
-import headscale, helper, json, sys, pytz, os, time, yaml
+import headscale, helper, pytz, os, yaml
 from flask    import Markup, render_template, Flask
-from datetime import datetime, timedelta, date
+from datetime import datetime
 from dateutil import parser
 
 # Threading to speed things up
@@ -425,14 +425,10 @@ def render_machines_cards():
 
 # Render the cards for the Users page:
 def render_users_cards():
-    url            = headscale.get_url()
-    api_key        = headscale.get_api_key()
+    url       = headscale.get_url()
+    api_key   = headscale.get_api_key()
     user_list = headscale.get_users(url, api_key)
 
-    # Set the current timezone and local time
-    timezone   = pytz.timezone(os.environ["TZ"] if os.environ["TZ"] else "UTC")
-    local_time = timezone.localize(datetime.now())
-
     content = "<div class='u-flex u-justify-space-evenly u-flex-wrap u-gap-1'>"
     for user in user_list["users"]:
         # Get all preAuth Keys in the user, only display if one exists:
@@ -505,8 +501,6 @@ def build_preauth_key_table(user_name):
         # Class for the javascript function to look for to toggle the hide function
         hide_expired = "expired-row" if not key_usable else ""
 
-        tooltip_expired   = "Expiration:  "+expiration_time
-
         btn_reusable      = "<i class='pulse material-icons tiny blue-text text-darken-1'>fiber_manual_record</i>"   if key["reusable"]  else ""
         btn_ephemeral     = "<i class='pulse material-icons tiny red-text text-darken-1'>fiber_manual_record</i>"    if key["ephemeral"] else ""
         btn_used          = "<i class='pulse material-icons tiny yellow-text text-darken-1'>fiber_manual_record</i>" if key["used"]      else ""
diff --git a/server.py b/server.py
index ef45a88..a9ff130 100644
--- a/server.py
+++ b/server.py
@@ -1,10 +1,6 @@
-import requests, json, renderer, headscale, helper, sys, pytz, os, time
+import json, renderer, headscale, helper, pytz, os
 from flask          import Flask, render_template, request, url_for, redirect, Markup
-from datetime       import datetime, timedelta, date
 from dateutil       import parser
-
-# Threading to speed things up
-from concurrent.futures import wait, ALL_COMPLETED
 from flask_executor import Executor
 
 # Global vars
@@ -88,7 +84,6 @@ def settings_page():
     # General error checks.  See the function for more info:
     if helper.startup_checks() != "Pass": return redirect(BASE_PATH+url_for('error_page'))
     url     = headscale.get_url()
-    api_key = headscale.get_api_key()
 
     return render_template(
         'settings.html', 
@@ -139,20 +134,15 @@ def test_key_page():
     key_info   = headscale.get_api_key_info(url, api_key)
 
     # Set the current timezone and local time
-    timezone = pytz.timezone(os.environ["TZ"] if os.environ["TZ"] else "UTC")
-    local_time      = timezone.localize(datetime.now())
+    timezone   = pytz.timezone(os.environ["TZ"] if os.environ["TZ"] else "UTC")
 
     # Format the dates for easy readability
     expiration_parse   = parser.parse(key_info['expiration'])
     expiration_local   = expiration_parse.astimezone(timezone)
-    expiration_delta   = expiration_local - local_time
-    expiration_print   = helper.pretty_print_duration(expiration_delta)
     expiration_time    = str(expiration_local.strftime('%A %m/%d/%Y, %H:%M:%S'))+" "+str(timezone)
 
     creation_parse     = parser.parse(key_info['createdAt'])
     creation_local     = creation_parse.astimezone(timezone)
-    creation_delta     = local_time - creation_local
-    creation_print     = helper.pretty_print_duration(creation_delta)
     creation_time      = str(creation_local.strftime('%A %m/%d/%Y, %H:%M:%S'))+" "+str(timezone)
     
     key_info['expiration'] = expiration_time