Removed TODO comments and created separate .todo file.