Update README and TODOs to reflect cleanups.