Removed some things from TODO.