Do we still need this setting? I think you moved everything to Payment model?