Simplify things but removing code that doesn't focus on subscriptions to unsubscribe from #auto