Remove core.match