diff --git a/TODO.md b/TODO.md
index 63eb3710..948481da 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,13 +1,11 @@
 ## General
 
 - Make a server patch version of story flag fixer quest
-- Fix enemy flag mapping in v2/v3 crossplay and test
 - Handle items in crossplay - use the replacement table
 - Make proxy server handle all login commands on non-BB, including sending 9C when needed
 - Add $switchit command (activates switch flag(s) for nearest object, e.g. laser fence, door, fog collision)
 - Add a way to persist flags across connections, at least on v3, because of Meet User + B2 enable quest interactions - maybe update the quest to patch one of the login commands so the server can tell it's enabled
 - Handle MeetUserExtensions properly in 41 and C4 commands on the proxy (rewrite the embedded 19 command and put some metadata in the persistent config, perhaps)
-- Clean up ItemParameterTable implementation (see comment at the top of the class definition)
 - Make UI strings localizable (e.g. entries in menus, welcome message, etc.)
 
 ## PSO DC
@@ -31,5 +29,4 @@
 ## PSOBB
 
 - Make server-specified rare enemies work with maps loaded by the proxy
-- Record some BB tests
-- Add all necessary Guild Card number rewrites in BB commands on the proxy
+- Implement BB replay tests properly and record some