Payment Method Class Cleanup