cleanup the listener and registrar to match recent API changes