Removed some unnecessary RefCells from resolve