Work on removing payment methods. Clean up some functions.