diff --git a/source/row_sve.cc b/source/row_sve.cc
index cf764b174..2322d39cc 100644
--- a/source/row_sve.cc
+++ b/source/row_sve.cc
@@ -1887,7 +1887,6 @@ void I210ToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "dup      z19.b, #255                             \n"  // A
@@ -1936,7 +1935,6 @@ void I210AlphaToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "subs     %w[width], %w[width], %w[vl]            \n"
@@ -1986,7 +1984,6 @@ void I210ToAR30Row_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   uint16_t limit = 0x3ff0;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
@@ -2033,7 +2030,6 @@ void P210ToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   int width_last_uv = width_last_y + (width_last_y & 1);
   uint32_t nv_uv_start = 0x03010301U;
   uint32_t nv_uv_step = 0x04040404U;
@@ -2088,7 +2084,6 @@ void P210ToAR30Row_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   int width_last_uv = width_last_y + (width_last_y & 1);
   uint32_t nv_uv_start = 0x03010301U;
   uint32_t nv_uv_step = 0x04040404U;
@@ -2144,7 +2139,6 @@ void I410ToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "dup      z19.b, #255                             \n"  // A
@@ -2193,7 +2187,6 @@ void I410AlphaToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "cmp      %w[width], %w[vl]                       \n"
@@ -2244,7 +2237,6 @@ void I410ToAR30Row_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   uint16_t limit = 0x3ff0;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
@@ -2290,7 +2282,6 @@ void P410ToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "dup      z19.b, #255                             \n"  // A
@@ -2341,7 +2332,6 @@ void P410ToAR30Row_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   uint16_t limit = 0x3ff0;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
@@ -2393,7 +2383,6 @@ void I212ToAR30Row_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   uint16_t limit = 0x3ff0;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
@@ -2440,7 +2429,6 @@ void I212ToARGBRow_SVE2(const uint16_t* src_y,
   uint64_t vl;
   asm("cnth %0" : "=r"(vl));
   int width_last_y = width & (vl - 1);
-  width_last_y = width_last_y == 0 ? vl : width_last_y;
   asm volatile(
       "ptrue    p0.b                                    \n" YUVTORGB_SVE_SETUP
       "dup      z19.b, #255                             \n"  // A