Add manual deletion support and harden payment setup checks