Clean up cherry pick