cleanup a few things in QR Handler