cherries: remove merged cherries

Change-Id: I8feb3aa4b81bda81d8511501287378284b6773d8