More clean up for payments