diff --git a/TODO b/TODO
index 95bb6e0f..92299d7e 100644
--- a/TODO
+++ b/TODO
@@ -158,25 +158,6 @@ Wireless simulator
 Wireless daemon
 ===============
 
-- Let EAP methods configure timeouts
-
-  Different EAP methods might have different recommendations for various
-  timeouts.  E.g. retransmit timeout, overall timeout, etc.  The EAP framework
-  should be updated to enable EAP methods to configure these timeouts
-  accordingly.  A sane default should also be provided.
-
-  Priority: High
-  Complexity: C2
-
-- EAPoL should take EAP timeouts into consideration
-
-  EAPoL state machine currently uses its own (very short) timeout for the
-  4-Way handshake / session key generation.  This timeout does not take into
-  account the fact that EAP authentication might need to be performed first.
-
-  Priority: High
-  Complexity: C1
-
 - Add unit test data with 2nd RSNE in Authenticator 3/4 message
 
   The specification allows the AP to send a second RSN element in its 4-way