Should we also remove the listener on up?