Clean up 'Core changes'