fix paymentserver teardown