Removing TODO from RFC 3696