Removed ToDo comments from code.