diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 474fba7..0472343 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -6,7 +6,7 @@ data:
     summary: An open, extensible IDE and application platform
     description: >-
         The Eclipse platform is designed for building integrated development
-        environments (IDEs), server-side applications, desktop applications, and
+        environments (IDEs), desktop applications, and
         everything in between.
     license:
         module:
@@ -19,19 +19,6 @@ data:
           requires:
               platform: ["el8"]
     profiles:
-        everything:
-            rpms:
-                - eclipse-ecf-core
-                - eclipse-ecf-runtime
-                - eclipse-emf-core
-                - eclipse-emf-runtime
-                - eclipse-emf-xsd
-                - eclipse-equinox-osgi
-                - eclipse-jdt
-                - eclipse-p2-discovery
-                - eclipse-pde
-                - eclipse-platform
-                - eclipse-swt
         java:
             rpms:
                 - eclipse-equinox-osgi
@@ -39,11 +26,6 @@ data:
                 - eclipse-pde
                 - eclipse-platform
                 - eclipse-swt
-        c:
-            rpms:
-                - eclipse-equinox-osgi
-                - eclipse-platform
-                - eclipse-swt
     api:
         rpms:
             - eclipse-ecf-core
@@ -144,7 +126,7 @@ data:
         rpms:
             eclipse:
                 buildorder: 40
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: stream-eclipse-rhel8-rhel-8.3.0
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
diff --git a/eclipse.yaml b/eclipse.yaml
deleted file mode 100644
index 34b1ef0..0000000
--- a/eclipse.yaml
+++ /dev/null
@@ -1,375 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: eclipse
-  stream: rhel8
-  summary: An open, extensible IDE and application platform
-  description: >-
-    The Eclipse platform is designed for building integrated development environments
-    (IDEs), server-side applications, desktop applications, and everything in between.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      eclipse: [rhel8]
-      platform: [el8.2.0]
-      tycho: [rhel8]
-    requires:
-      platform: [el8]
-  profiles:
-    c:
-      rpms:
-      - eclipse-equinox-osgi
-      - eclipse-platform
-      - eclipse-swt
-    everything:
-      rpms:
-      - eclipse-ecf-core
-      - eclipse-ecf-runtime
-      - eclipse-emf-core
-      - eclipse-emf-runtime
-      - eclipse-emf-xsd
-      - eclipse-equinox-osgi
-      - eclipse-jdt
-      - eclipse-p2-discovery
-      - eclipse-pde
-      - eclipse-platform
-      - eclipse-swt
-    java:
-      rpms:
-      - eclipse-equinox-osgi
-      - eclipse-jdt
-      - eclipse-pde
-      - eclipse-platform
-      - eclipse-swt
-  api:
-    rpms:
-    - eclipse-ecf-core
-    - eclipse-ecf-runtime
-    - eclipse-emf-core
-    - eclipse-emf-runtime
-    - eclipse-emf-xsd
-    - eclipse-equinox-osgi
-    - eclipse-jdt
-    - eclipse-p2-discovery
-    - eclipse-pde
-    - eclipse-platform
-    - eclipse-swt
-  filter:
-    rpms:
-    - apache-commons-compress-javadoc
-    - apache-commons-jxpath-javadoc
-    - apache-sshd-javadoc
-    - apiguardian-javadoc
-    - args4j-javadoc
-    - args4j-parent
-    - args4j-tools
-    - batik
-    - batik-demo
-    - batik-javadoc
-    - batik-rasterizer
-    - batik-slideshow
-    - batik-squiggle
-    - batik-svgpp
-    - batik-ttf2svg
-    - bouncycastle-javadoc
-    - eclipse-ecf-sdk
-    - eclipse-emf-sdk
-    - ed25519-java-javadoc
-    - felix-gogo-command-javadoc
-    - felix-gogo-runtime-javadoc
-    - felix-gogo-shell-javadoc
-    - felix-scr-javadoc
-    - glassfish-annotation-api-javadoc
-    - glassfish-el-javadoc
-    - glassfish-jsp-api-javadoc
-    - glassfish-jsp-javadoc
-    - glassfish-servlet-api-javadoc
-    - google-gson-javadoc
-    - hamcrest-demo
-    - hamcrest-javadoc
-    - icu4j-charset
-    - icu4j-javadoc
-    - icu4j-localespi
-    - javaewah-javadoc
-    - jetty
-    - jetty-client
-    - jetty-jaas
-    - jetty-javadoc
-    - jetty-jmx
-    - jetty-webapp
-    - jetty-xml
-    - jsch-javadoc
-    - junit-javadoc
-    - junit-manual
-    - junit5-guide
-    - junit5-javadoc
-    - jzlib-demo
-    - jzlib-javadoc
-    - lucene-backward-codecs
-    - lucene-classification
-    - lucene-codecs
-    - lucene-grouping
-    - lucene-highlighter
-    - lucene-javadoc
-    - lucene-join
-    - lucene-memory
-    - lucene-misc
-    - lucene-monitor
-    - lucene-suggest
-    - objectweb-asm-javadoc
-    - opentest4j-javadoc
-    - univocity-parsers-javadoc
-    - xml-commons-apis-javadoc
-    - xml-commons-apis-manual
-    - xmlgraphics-commons-javadoc
-    - xz-java-javadoc
-  buildopts:
-    rpms:
-      macros: >
-        %app_name_prefix Red Hat Eclipse
-
-        %_with_jp_minimal 1
-
-        %_without_contrib_tools 1
-
-        %_without_javahl 1
-
-        %_without_spring 1
-
-        %_without_tests 1
-
-        %_without_reflections 1
-
-        %_without_okcurl 1
-
-        %_without_snappy 1
-
-        %_without_hsqldb 1
-
-        %_without_junit5 1
-  components:
-    rpms:
-      apache-commons-compress:
-        rationale: 'Runtime dependency of jgit, jython.
-
-'
-        ref: 6e4d5d78098fa71eb667e2dac6ebd387ec618faf
-        buildorder: 20
-        arches: [x86_64]
-      apache-commons-jxpath:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: f2029064ca155227842526edd784ac2270ffbdb9
-        buildorder: 10
-        arches: [x86_64]
-      apiguardian:
-        rationale: 'Runtime dependency of eclipse, junit5.
-
-'
-        ref: bd67af7d08b51598a96c3b55d07b8a3e5b683603
-        buildorder: 10
-        arches: [x86_64]
-      batik:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 43efb322f4f5d2bc142db060297ecdb6be39de97
-        buildorder: 20
-        arches: [x86_64]
-      eclipse:
-        rationale: 'Module API.
-
-'
-        ref: c90b3ba0169bd7a0a7ac0553836d1fc7726c258b
-        buildorder: 40
-        arches: [aarch64, ppc64le, s390x, x86_64]
-      eclipse-ecf:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 97468babda357ed4096ab95e8b2facf6d5585ca1
-        buildorder: 30
-        arches: [aarch64, ppc64le, s390x, x86_64]
-      eclipse-emf:
-        rationale: 'Runtime dependency of eclipse, eclipse-ecf.
-
-'
-        ref: 33d181a4c07e8eee70a2959b5d9725f27d7d88c4
-        buildorder: 20
-        arches: [aarch64, ppc64le, s390x, x86_64]
-      felix-gogo-command:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: aeec8bb13eb1b4919c720cf80ec2d4622168bf64
-        buildorder: 20
-        arches: [x86_64]
-      felix-gogo-runtime:
-        rationale: "Runtime dependency of eclipse, felix-gogo-command,\n     felix-gogo-shell.\n"
-        ref: 2465bd2d5cd608b3a83d5b71a32fcf7ae9d26029
-        buildorder: 10
-        arches: [x86_64]
-      felix-gogo-shell:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 4bfef448dfecdb938824b1e0c56261a00e61fe5b
-        buildorder: 20
-        arches: [x86_64]
-      felix-scr:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: ecefdb1a8dae04c0614e3ed6f821e2e016fa8c48
-        buildorder: 30
-        arches: [x86_64]
-      glassfish-annotation-api:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 1083d7d7cfc5dda359c8765ff01d954e93853259
-        buildorder: 10
-        arches: [x86_64]
-      glassfish-el:
-        rationale: 'Runtime dependency of eclipse, glassfish-jsp-api.
-
-'
-        ref: 43d14dcd1e1467dfaae21d2799ba63de9964f314
-        buildorder: 10
-        arches: [x86_64]
-      glassfish-jsp:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: abd2f809e8398e3a8b63c3923a85bcedcc015c2b
-        buildorder: 30
-        arches: [x86_64]
-      glassfish-jsp-api:
-        rationale: 'Runtime dependency of eclipse, glassfish-jsp.
-
-'
-        ref: 765443e7bc1b2106079a09bec7583d5ae330265e
-        buildorder: 20
-        arches: [x86_64]
-      glassfish-servlet-api:
-        rationale: 'Runtime dependency of eclipse, glassfish-jsp-api, jetty.
-
-'
-        ref: 7a45c0e6812ea4ceeb62a8479c84f72fcd77a66c
-        buildorder: 10
-        arches: [x86_64]
-      google-gson:
-        rationale: "Runtime dependency of eclipse, eclipse-cdt, jgit,\n     eclipse-m2e-core,
-          eclipse-webtools.\n"
-        ref: 9cbf5fd682b8fa402440a6af35422adf9c5b856d
-        buildorder: 10
-        arches: [x86_64]
-      hamcrest:
-        rationale: 'Runtime dependency of eclipse, junit.
-
-'
-        ref: 548f497d476f9e1d231e65c3cecf0c5928c6e0d1
-        buildorder: 10
-        arches: [x86_64]
-      icu4j:
-        rationale: 'Runtime dependency of eclipse, jython.
-
-'
-        ref: b8f25ab8bb3c7f743d285bfe975b2e03cd60c775
-        buildorder: 10
-        arches: [x86_64]
-      jetty:
-        rationale: "Runtime dependency of eclipse, jgit,\n     eclipse-m2e-core, eclipse-webtools.\n"
-        ref: 1933b087775fe4596939ad1c23194e0a1d719315
-        buildorder: 20
-        arches: [x86_64]
-      jsch:
-        rationale: 'Runtime dependency of eclipse, jgit.
-
-'
-        ref: 8f937f64eba966bd36810516895dd3c03d2ae1c3
-        buildorder: 20
-        arches: [x86_64]
-      junit:
-        rationale: 'Runtime dependency of eclipse, junit5.
-
-'
-        ref: 95722ed6bd4031b7511ff7162f7121c4ff4e9124
-        buildorder: 20
-        arches: [x86_64]
-      junit5:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 0408e29c68d668a98b72ca9eb6e72b41f8cdbc6d
-        buildorder: 30
-        arches: [x86_64]
-      jzlib:
-        rationale: 'Runtime dependency of jgit, jsch.
-
-'
-        ref: 47c36097a8c63a1ba6ebbdf8c0ef87c95984f3ad
-        buildorder: 10
-        arches: [x86_64]
-      lucene:
-        rationale: 'Runtime dependency of eclipse, eclipse-m2e-core, maven-indexer.
-
-'
-        ref: ec607a3e5de1f970df2d09843fc63c0e3c975845
-        buildorder: 10
-        arches: [x86_64]
-      objectweb-asm:
-        rationale: 'Runtime dependency of eclipse, eclipse-ecf, jython.
-
-'
-        ref: a296040d2cf37c56e165f468d85c3e6baa555730
-        buildorder: 10
-        arches: [x86_64]
-      opentest4j:
-        rationale: 'Runtime dependency of eclipse, junit5.
-
-'
-        ref: 98b2cea5fb161a913c840a09b077d2e58305bdfa
-        buildorder: 10
-        arches: [x86_64]
-      sat4j:
-        rationale: 'Runtime dependency of eclipse.
-
-'
-        ref: 513789fe8af28acd2e77b0868423bd941959d61e
-        buildorder: 10
-        arches: [x86_64]
-      univocity-parsers:
-        rationale: 'Runtime dependency of junit5.
-
-'
-        ref: 3d6f30fd26baa78170058440a672fdbfc1cd69eb
-        buildorder: 10
-        arches: [x86_64]
-      xml-commons-apis:
-        rationale: 'Runtime dependency of batik, eclipse, eclipse-emf.
-
-'
-        ref: 0b7fc3ad633cd139e562024f06a57cee08219ea6
-        buildorder: 10
-        arches: [x86_64]
-      xmlgraphics-commons:
-        rationale: 'Runtime dependency of batik.
-
-'
-        ref: 19cc9dca26e62ff106b3106e30179cc83539cc92
-        buildorder: 10
-        arches: [x86_64]
-      xz-java:
-        rationale: 'Runtime dependency of eclipse, apache-commons-compress.
-
-'
-        ref: 9f01c11287e83d29a83b4bbd9618f2cbb90abdde
-        buildorder: 10
-        arches: [x86_64]
-...
-