OK, sounds good to me. I think this is ok to leave in resolve.