Remove receiver, add listener