Remove abandoned cherries and patched system/core

A better patch has been merged.