diff --git a/include-all-srcs.patch b/include-all-srcs.patch
deleted file mode 100644
index 16abb45..0000000
--- a/include-all-srcs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- jdk8/jdk/make/CreateJars.gmk
-+++ jdk8/jdk/make/CreateJars.gmk
-@@ -569,38 +569,12 @@
- ##########################################################################################
- 
- SRC_ZIP_INCLUDES = \
--    com/sun/corba \
--    com/sun/image/codec/jpeg \
--    com/sun/imageio \
--    com/sun/java_cup \
--    com/sun/javadoc \
--    com/sun/java/swing \
--    com/sun/jmx \
--    com/sun/naming \
--    com/sun/org/apache \
--    com/sun/security/auth \
--    com/sun/security/jgss \
--    com/sun/source \
-+    com \
-     java \
--    javax/accessibility \
--    javax/annotation \
--    javax/imageio \
--    javax/lang \
--    javax/management \
--    javax/naming \
--    javax/print \
--    javax/rmi \
--    javax/script \
--    javax/security \
--    javax/sound \
--    javax/sql \
--    javax/swing \
--    javax/tools \
--    javax/xml \
--    org/ietf \
--    org/omg \
--    org/w3c/dom \
--    org/xml/sax \
-+    javax \
-+    jdk \
-+    org \
-+    sun \
-     #
- 
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-@@ -632,7 +606,6 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
-     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
-     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
--    EXCLUDES := javax/swing/beaninfo, \
-     SUFFIXES := .java .c .h, \
-     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
-     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/openj9-fix-build.patch b/openj9-fix-build.patch
deleted file mode 100644
index aae1b7f..0000000
--- a/openj9-fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/closed/OpenJ9.gmk
-+++ b/closed/OpenJ9.gmk
-@@ -579,7 +579,7 @@ JPP_BASE_DIR := $(call FixPath,$(OPENJ9_TOPDIR))
- JPP_DEST     := $(call FixPath,$(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes)
- JPP_JAR      := $(call FixPath,$(OPENJ9_VM_BUILD_DIR)/sourcetools/lib/jpp.jar)
- 
--$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
-+$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource) build-openj9-tools
- 	@$(ECHO) Generating J9JCL sources
- 	@$(MKDIR) -p $(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes
- 	$(BOOT_JDK)/bin/java \