cleanup after cherry pick