remove some old .listen() code