Clean up cherry pick scrapnel