diff --git a/README.md b/README.md
index 517bef0..5387e76 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,3 @@ Suggested names so far:
 * On the Air
 * DX Muster
 * UST (Unnamed Spotting Tool)
-
-### TODO - Setup instructions - checkout, config.yml, pip
-### TODO - systemd
-### TODO - nginx
\ No newline at end of file
diff --git a/main.py b/main.py
index 6def97f..e95ab98 100644
--- a/main.py
+++ b/main.py
@@ -34,8 +34,6 @@ def shutdown(sig, frame):
     cleanup_timer.stop()
 
 # Utility method to get a data provider based on its config entry.
-# TODO we could probably find a way to do this more neatly by iterating through classes in "providers" and getting their
-# names, if Python allows that sort of thing
 def get_provider_from_config(config_providers_entry):
     match config_providers_entry["type"]:
         case "POTA":
@@ -99,13 +97,3 @@ if __name__ == '__main__':
         for p in providers: status_data[p.name()] = {"status": p.status, "last_updated": p.last_update_time, "last_spot": p.last_spot_time}
         status_data["Cleanup Timer"] = {"status": cleanup_timer.status, "last_ran": cleanup_timer.last_cleanup_time}
         status_data["Web Server"] = {"status": web_server.status, "last_api_access": web_server.last_api_access_time, "last_page_access": web_server.last_page_access_time}
-
-
-
-# TODO NOTES FOR NGINX REVERSE PROXY
-# local cache time of 15 sec to avoid over burdening python?
-
-# TODO NOTES FOR FIELD SPOTTER
-# Still need to de-dupe spots
-# Still need to do QSY checking in FS because we can enable/disable showing them and don't want to re-query the API.
-# Filter comments, still do in FS or move that here?
\ No newline at end of file
diff --git a/providers/wwbota.py b/providers/wwbota.py
index cb0f1a3..d788aa3 100644
--- a/providers/wwbota.py
+++ b/providers/wwbota.py
@@ -5,7 +5,6 @@ from providers.http_provider import HTTPProvider
 
 
 # Provider for Worldwide Bunkers on the Air
-# todo switch to event source API as per Steve change to Field Spotter, if Python supports it
 class WWBOTA(HTTPProvider):
     POLL_INTERVAL_SEC = 120
     SPOTS_URL = "https://api.wwbota.org/spots/"
diff --git a/server/webserver.py b/server/webserver.py
index 00047c7..31e3a3c 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -107,9 +107,3 @@ class WebServer:
         if "limit" in query.keys():
             spots = spots[:int(query.get("limit"))]
         return spots
-
-
-# Todo serve Server-Sent Events to frontend? - see https://medium.com/@tdenton8772/streaming-api-design-using-python-and-javascript-1b0ce8adb703
-# Todo serve apidocs
-# Todo push spot API (to start with only to this server)
-# Todo current todos to fit issues
\ No newline at end of file
diff --git a/webassets/js/code.js b/webassets/js/code.js
index f4cdd9f..df2b347 100644
--- a/webassets/js/code.js
+++ b/webassets/js/code.js
@@ -1,8 +1,3 @@
-// TODO get all data into JS on first load
-// TODO populate table more nicely
-// TODO filtering & limit (applied via new request to server)
-// TODO look and feel
-
 $.getJSON('/api/spots', function(jsonData) {
     let headers = Object.keys(jsonData[0]);
     let table = $('<table>').append('<thead><tr></tr></thead><tbody></tbody>');