Remove unnecessary code from cherry pick