Removed old code and updated TODO list (it's still not accurate).