Removed some unneeded todo items.