Fix stillHasSubscribers check after removal