clean + add listener on model (but no check for now)