update patch (remove cm stuff)