diff --git a/TODO b/TODO
index 2d8c6be8398b8131581a4027e908ce97ea32c693..60fad664883d31675486fe61417b901957a859d8 100644
--- a/TODO
+++ b/TODO
@@ -24,8 +24,9 @@ Version 1.5.0:
 * Remove byte-swapping functions from user space.
 * EoE:
     - Only execute one EoE handler per cycle.
+    - Mailbox protocol handlers.
+    - Mailbox state machine using toggle bits.
 * Implement 'ethercat foe_read --output-file ...'.
-* Fix unloading problem of ec_e100 driver.
 * Use ec_datagram_zero() where possible.
 * Fix arguments of reg_read.
 * Sign/Abs type for reg_ commands?
@@ -52,14 +53,12 @@ Future issues:
 
 * Segmented SDO downloads.
 * External memory for SDO transfers.
-* Bus information via userspace library (slaves, sync managers, PDOs, entries).
+* Bus information via userspace library (sync managers, PDOs, entries).
 * C++ implementation of the library.
 * Bus simulator interface.
 * Move master threads, slave handlers and state machines into a user
   space daemon.
 * Allow master requesting when in ORPHANED phase
-* Mailbox protocol handlers.
-* Mailbox state machine using toggle bits.
 * Mailbox gateway.
 * Separate CoE debugging.
 * Evaluate EEPROM contents after writing.
@@ -76,8 +75,6 @@ Future issues:
 
 Smaller issues:
 
-* Stop master thread at ecrt_master_request() to get rid of allow_* flags?
-* Clear sync managers in INIT.
 * Read out CRC counters.
 * Configure slave ports to automatically open on link detection.
 * Fix datagram errors on application loading/unloading.