Remove payment method model
Merge branch 'hotfix/0.1.7'