Removed more from TODO.