Remove TODO issue concerning wrapping shared_ptr