CLSN-284: moving payment to billing