Balanced: Fix handling of 500 errors
Remove billing fields from Universal