Remove direct call to model in managers