diff --git a/bucket/oraclejdk8.json b/bucket/oraclejdk8.json
deleted file mode 100644
index 36e08ad5b..000000000
--- a/bucket/oraclejdk8.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "description": "Oracle JDK 8",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u211-b12",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u211-b12/478a62b7d4e34b78b671c754eaaf38ab/jdk-8u211-windows-x64.exe#/dl.7z",
-            "hash": "f46be98d14a2b2d0451a005624b28e6b86a56fa96f580c4963b5eded2ba09fc3"
-        },
-        "32bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u211-b12/478a62b7d4e34b78b671c754eaaf38ab/jdk-8u211-windows-i586.exe#/dl.7z",
-            "hash": "9c3d428f04c5e1d205ad07d7e3b8b4ae03d1ef9e224b6aad377295103b091596"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_to": "tmp",
-    "installer": {
-        "script": [
-            "# Java Source (src.zip)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB9\\110\" \"$dir\"",
-            "# JDK (tools.zip)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB10\\111\" \"$dir\\tmp\"",
-            "extract_7zip \"$dir\\tmp\\tools.zip\" \"$dir\"",
-            "# Copyright (COPYRIGHT)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB11\\112\" \"$dir\"",
-            "# Convert .pack to .jar, and remove .pack",
-            "pushd \"$dir\"",
-            "ls \"$dir\" -recurse | ? name -match '^[^_].*?\\.(?i)pack$' | % {",
-            "    $name = $_.fullname -replace '\\.(?i)pack$', ''",
-            "    $pack = \"$name.pack\"",
-            "    $jar = \"$name.jar\"",
-            "    & \"bin\\unpack200.exe\" \"-r\" \"$pack\" \"$jar\"",
-            "}",
-            "rm -r tmp | out-null",
-            "popd"
-        ]
-    },
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/jdk-(?<short>[u\\d]+)-windows"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jdk-$matchShort-windows-x64.exe#/dl.7z"
-            },
-            "32bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jdk-$matchShort-windows-i586.exe#/dl.7z"
-            }
-        },
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}
diff --git a/bucket/oraclejdk8u.json b/bucket/oraclejdk8u.json
deleted file mode 100644
index 33b4ffad2..000000000
--- a/bucket/oraclejdk8u.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "description": "Oracle JDK 8 (PSU)",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u212-b10",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u212-b10/59066701cf1a433da9770636fbc4c9aa/jdk-8u212-windows-x64.exe#/dl.7z",
-            "hash": "330a6396fcc97c57a951170bb9ac5a00b75974da8f002cb7e62fdf09d15018c5"
-        },
-        "32bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u212-b10/59066701cf1a433da9770636fbc4c9aa/jdk-8u212-windows-i586.exe#/dl.7z",
-            "hash": "2ea45edb83303d87cabef2e872abb8a7c80da578e4e7a468bd27d9e3b8595b1b"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_to": "tmp",
-    "installer": {
-        "script": [
-            "# Java Source (src.zip)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB9\\110\" \"$dir\"",
-            "# JDK (tools.zip)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB10\\111\" \"$dir\\tmp\"",
-            "extract_7zip \"$dir\\tmp\\tools.zip\" \"$dir\"",
-            "# Copyright (COPYRIGHT)",
-            "extract_7zip \"$dir\\tmp\\.rsrc\\1033\\JAVA_CAB11\\112\" \"$dir\"",
-            "# Convert .pack to .jar, and remove .pack",
-            "pushd \"$dir\"",
-            "ls \"$dir\" -recurse | ? name -match '^[^_].*?\\.(?i)pack$' | % {",
-            "    $name = $_.fullname -replace '\\.(?i)pack$', ''",
-            "    $pack = \"$name.pack\"",
-            "    $jar = \"$name.jar\"",
-            "    & \"bin\\unpack200.exe\" \"-r\" \"$pack\" \"$jar\"",
-            "}",
-            "rm -r tmp | out-null",
-            "popd"
-        ]
-    },
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/jdk-(?<short>[u\\d]+)-windows",
-        "reverse": true
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jdk-$matchShort-windows-x64.exe#/dl.7z"
-            },
-            "32bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jdk-$matchShort-windows-i586.exe#/dl.7z"
-            }
-        },
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}
diff --git a/bucket/oraclejre8-server.json b/bucket/oraclejre8-server.json
deleted file mode 100644
index 1e1aca9bd..000000000
--- a/bucket/oraclejre8-server.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "description": "Oracle Server-JRE 8",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u211-b12",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u211-b12/478a62b7d4e34b78b671c754eaaf38ab/server-jre-8u211-windows-x64.tar.gz",
-            "hash": "11dabdae4f9f7d5ce9e004bc99ed4ecf6d616f45be36150616388620b60e77b9"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_dir": "jdk1.8.0_211",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/server-jre-(?<short>(?<release>[\\d]+)u(?<update>[\\d]+))-windows-x64.tar.gz"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/server-jre-$matchShort-windows-x64.tar.gz"
-            }
-        },
-        "extract_dir": "jdk1.$matchRelease.0_$matchUpdate",
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}
diff --git a/bucket/oraclejre8.json b/bucket/oraclejre8.json
deleted file mode 100644
index f4cdb8e1f..000000000
--- a/bucket/oraclejre8.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "description": "Oracle JRE 8",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u211-b12",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u211-b12/478a62b7d4e34b78b671c754eaaf38ab/jre-8u211-windows-x64.tar.gz",
-            "hash": "79fa21f4bc1e15e61432290247a0f7aead612f6a72117923fa6fe80c77232caf"
-        },
-        "32bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u211-b12/478a62b7d4e34b78b671c754eaaf38ab/jre-8u211-windows-i586.tar.gz",
-            "hash": "e56bc73d00ceacf0163cf12ee34b6e86bd923afe384944da4f91978918670e94"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_dir": "jre1.8.0_211",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/jre-(?<short>(?<release>[\\d]+)u(?<update>[\\d]+))-windows-x64.tar.gz"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-x64.tar.gz"
-            },
-            "32bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-i586.tar.gz"
-            }
-        },
-        "extract_dir": "jre1.$matchRelease.0_$matchUpdate",
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}
diff --git a/bucket/oraclejre8u-server.json b/bucket/oraclejre8u-server.json
deleted file mode 100644
index 48502f9c3..000000000
--- a/bucket/oraclejre8u-server.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "description": "Oracle Server-JRE 8 (PSU)",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u212-b10",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u212-b10/59066701cf1a433da9770636fbc4c9aa/server-jre-8u212-windows-x64.tar.gz",
-            "hash": "de4c50344ee37816ac4af90638622ed307c903e4ae82b635ba3b742269fb747f"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_dir": "jdk1.8.0_212",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/server-jre-(?<short>(?<release>[\\d]+)u(?<update>[\\d]+))-windows-x64.tar.gz",
-        "reverse": true
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/server-jre-$matchShort-windows-x64.tar.gz"
-            }
-        },
-        "extract_dir": "jdk1.$matchRelease.0_$matchUpdate",
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/server-jre8-downloads-2133154.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}
diff --git a/bucket/oraclejre8u.json b/bucket/oraclejre8u.json
deleted file mode 100644
index 63dcb40ba..000000000
--- a/bucket/oraclejre8u.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "description": "Oracle JRE 8 (PSU)",
-    "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
-    "version": "8u212-b10",
-    "license": "https://www.oracle.com/technetwork/java/javase/terms/license",
-    "architecture": {
-        "64bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u212-b10/59066701cf1a433da9770636fbc4c9aa/jre-8u212-windows-x64.tar.gz",
-            "hash": "c54e8c5b440ef7ad0b675c84d7691b277e1189601179865cc2269d01b9035ead"
-        },
-        "32bit": {
-            "url": "https://download.oracle.com/otn-pub/java/jdk/8u212-b10/59066701cf1a433da9770636fbc4c9aa/jre-8u212-windows-i586.tar.gz",
-            "hash": "333d0d84705fb68515596eca7e15ed1fc8ea5ed37ea49441f121df2f538e6777"
-        }
-    },
-    "cookie": {
-        "oraclelicense": "accept-securebackup-cookie"
-    },
-    "extract_dir": "jre1.8.0_212",
-    "env_add_path": "bin",
-    "env_set": {
-        "JAVA_HOME": "$dir"
-    },
-    "checkver": {
-        "url": "https://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html",
-        "re": "(?<version>[ub\\-\\d]+)/(?<random>[a-fA-F0-9]{32})/jre-(?<short>(?<release>[\\d]+)u(?<update>[\\d]+))-windows-x64.tar.gz",
-        "reverse": true
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-x64.tar.gz"
-            },
-            "32bit": {
-                "url": "https://download.oracle.com/otn-pub/java/jdk/$version/$matchRandom/jre-$matchShort-windows-i586.tar.gz"
-            }
-        },
-        "extract_dir": "jre1.$matchRelease.0_$matchUpdate",
-        "hash": {
-            "url": "https://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html",
-            "find": "$basename.*([a-fA-F0-9]{64})\"};"
-        }
-    }
-}