No need for this TODO now right? `.set` with a new visibility will emit a 'remove' event at the right time