Separate remote service cleanup from resource deletion and ensure database removal completes despite cleanup errors. Update the disabled two-factor badge icon.