diff --git a/include/core/SkImageEncoder.h b/include/core/SkImageEncoder.h
index f2b0620..e4f746a 100644
--- a/include/core/SkImageEncoder.h
+++ b/include/core/SkImageEncoder.h
@@ -39,16 +39,4 @@
     return src.peekPixels(&pixmap) && SkEncodeImage(dst, pixmap, f, q);
 }
 
-//TODO(halcanary):  remove this code once all changes land.
-#ifdef SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
-class SkImageEncoder {
-public:
-    enum Type {
-        kPNG_Type     = (int)SkEncodedImageFormat::kPNG,
-    };
-    static bool EncodeStream(SkWStream* dst, const SkBitmap& bm, Type t, int quality) {
-        return SkEncodeImage(dst, bm, (SkEncodedImageFormat)t, quality);
-    }
-};
-#endif  // SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS
 #endif  // SkImageEncoder_DEFINED
diff --git a/public.bzl b/public.bzl
index ce01b7d..a6f9333 100644
--- a/public.bzl
+++ b/public.bzl
@@ -588,7 +588,6 @@
     # Turn on a few Google3-specific build fixes.
     "GOOGLE3",
     # Staging flags for API changes
-    "SK_SUPPORT_LEGACY_IMAGE_ENCODER_CLASS",
     # Temporarily Disable analytic AA for Google3
     "SK_NO_ANALYTIC_AA",
     "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",