Remove TODO.  This object is not thread-shared