Deleted obsolete TODO comments