Clean up payment code