diff --git a/ugly_hacks/santiago/pgpprocessor.py b/ugly_hacks/santiago/pgpprocessor.py
index 778650716..7fd846057 100644
--- a/ugly_hacks/santiago/pgpprocessor.py
+++ b/ugly_hacks/santiago/pgpprocessor.py
@@ -3,8 +3,6 @@
 Right now, this includes the Unwrapper, wihch unwraps and verifies each layer of
 an onion-wrapped PGP message.
 
-FIXME: replace this with a real library.  Why doesn't gnupg do this?
-
 """
 from utilities import InvalidSignatureError
 import gnupg
diff --git a/ugly_hacks/santiago/protocols/https/controller.py b/ugly_hacks/santiago/protocols/https/controller.py
index 0632a1c7a..289e96568 100644
--- a/ugly_hacks/santiago/protocols/https/controller.py
+++ b/ugly_hacks/santiago/protocols/https/controller.py
@@ -1,10 +1,6 @@
 """The HTTPS Santiago listener and sender.
 
-TODO: add JSON output.
 FIXME: add real authentication.
-FIXME: sanitize or properly escape user input (XSS, attacks on the client).
-FIXME: make sure we never try to execute user input (injection, attacks on the
-       server).
 FIXME: all the Blammos.  They're terrible, unacceptable failures.
 FIXME correct direct key access everywhere.