Removed TODO items that don't seem too useful.