Residual stresses formed during quenching leads to warping and hence scrapping of aerospace components. Rolling has been used to remove residual stresses in components with a constant cross section. Neutron diffraction measurements were performed at ILL of quenched as well as quenched followed by cold deformation. The measurements are used to verify simulations of quenching as well as rolling of AA7050 components as well as for the calibration of ultrasonic measurements for measuring residual stress in extra-large components in industrial production. Key words: Quenching, rolling, residual stress reduction, thermo-mechanical simulations, acoustoelastic effect