Resolve issues with single payment methods, clean up configuration and provide way to modify