diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 3dd7a189..9aab1887 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -383,7 +383,6 @@ def audio_test():
   """Run an OS-specific audio test."""
   if PLATFORM == 'Linux':
     audio_test_linux()
-  # TODO: Add tests for other OS
 
 
 def audio_test_linux():
diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index eca9a4db..1d9dbde6 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -385,7 +385,6 @@ class Disk(BaseObj):
       aligned = is_4k_aligned_macos(self.details)
     elif PLATFORM == 'Linux':
       aligned = is_4k_aligned_linux(self.path, self.details['phy-sec'])
-    #TODO: Add checks for other OS
 
     return aligned
 
diff --git a/scripts/wk/kit/ufd.py b/scripts/wk/kit/ufd.py
index 6df842de..9c792b3b 100644
--- a/scripts/wk/kit/ufd.py
+++ b/scripts/wk/kit/ufd.py
@@ -1,8 +1,5 @@
 """WizardKit: UFD Functions"""
 # vim: sts=2 sw=2 ts=2
-# TODO: Replace some lsblk usage with hw_obj?
-# TODO: Reduce imports if possible
-# TODO: Needs testing
 
 import logging
 import os
diff --git a/scripts/wk/net.py b/scripts/wk/net.py
index 8b930c3b..e8e763b5 100644
--- a/scripts/wk/net.py
+++ b/scripts/wk/net.py
@@ -181,7 +181,6 @@ def share_is_mounted(details):
       if row['source'] == f'//{details["Address"]}/{details["Share"]}':
         mounted = True
         break
-  #TODO: Check mount status under Windows
   #elif PLATFORM == 'Windows':
 
   # Done
diff --git a/scripts/wk/os/linux.py b/scripts/wk/os/linux.py
index 7c38a03f..e4aefab8 100644
--- a/scripts/wk/os/linux.py
+++ b/scripts/wk/os/linux.py
@@ -179,7 +179,6 @@ def running_as_root():
 
 def scan_corestorage_container(container, timeout=300):
   """Scan CoreStorage container for inner volumes, returns list."""
-  # TODO: Test Scanning CoreStorage containers
   detected_volumes = {}
   inner_volumes = []
   log_path = format_log_path(log_name=f'{container.path.name}_testdisk')
diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py
index f367e40f..7f17af37 100644
--- a/scripts/wk/os/win.py
+++ b/scripts/wk/os/win.py
@@ -15,7 +15,7 @@ from wk.std import GenericError, GenericWarning, sleep
 
 # STATIC VARIABLES
 LOG = logging.getLogger(__name__)
-OS_VERSION = float(platform.win32_ver()[0]) # TODO: Check if Win8.1 returns '8'
+OS_VERSION = float(platform.win32_ver()[0])
 REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
 SLMGR = pathlib.Path(f'{os.environ.get("SYSTEMROOT")}/System32/slmgr.vbs')