Remove billing fields