Payment tool cleanup
Merge pull request #1 from nabinhait/paytool

Payment tool cleanup