diff --git a/config_specs/workload.yaml b/config_specs/workload.yaml
index 77cf281..89c9ca2 100644
--- a/config_specs/workload.yaml
+++ b/config_specs/workload.yaml
@@ -71,25 +71,6 @@ data:
   options:
   - option
 
-  # Disable module streams.
-  # The following modules get disabled before any
-  # packages are installed, or before any modules
-  # are enabled.
-  # This is useful for switching default module
-  # streams off, for example.
-  modules_disable:
-  - module1:stream
-  - module2
-
-  # Enable module streams.
-  # The following modules get enabled before
-  # any packages get installed.
-  # So to analyze a module, enable it here first,
-  # and then list its packages in the "packages"
-  # section.
-  modules_enable:
-  - module:stream
-
   # Analyze a group
   groups:
   - core
diff --git a/feedback_pipeline.py b/feedback_pipeline.py
index 8a1a92f..25bd9b3 100755
--- a/feedback_pipeline.py
+++ b/feedback_pipeline.py
@@ -366,8 +366,6 @@ def _load_config_workload(document_id, document, settings):
                 "groups",
                 "labels",
                 "maintainer",
-                "modules_disable",
-                "modules_enabled",
                 "name",
                 "options",
                 "package_placeholders",
@@ -447,17 +445,6 @@ def _load_config_workload(document_id, document, settings):
         if "strict" in document["data"]["options"]:
             config["options"].append("strict")
     
-    # Disable module streams.
-    config["modules_disable"] = []
-    if "modules_disable" in document["data"]:
-        for module in document["data"]["modules_disable"]:
-            config["modules_disable"].append(module)
-    
-    # Enable module streams.
-    config["modules_enable"] = []
-    if "modules_enable" in document["data"]:
-        for module in document["data"]["modules_enable"]:
-            config["modules_enable"].append(module)
     
     # Comps groups
     config["groups"] = []
@@ -1887,8 +1874,6 @@ def _analyze_workload(self, workload_conf, env_conf, repo, arch):
         workload["pkg_placeholder_ids"] = []
         workload["srpm_placeholder_names"] = []
 
-        workload["enabled_modules"] = []
-
         workload["pkg_relations"] = []
 
         workload["errors"] = {}
@@ -1982,56 +1967,6 @@ def _analyze_workload(self, workload_conf, env_conf, repo, arch):
                     err_log(err)
                     raise RepoDownloadError(err)
             
-            # 36 %
-
-            # Disabling modules
-            if workload_conf["modules_disable"]:
-                try:
-                    #log("  Disabling modules...")
-                    module_base = dnf.module.module_base.ModuleBase(base)
-                    module_base.disable(workload_conf["modules_disable"])
-                except dnf.exceptions.MarkingErrors as err:
-                    workload["succeeded"] = False
-                    workload["errors"]["message"] = str(err)
-                    #log("  Failed!  (Error message will be on the workload results page.")
-                    #log("")
-                    return workload
-
-
-            # Enabling modules
-            if workload_conf["modules_enable"]:
-                try:
-                    #log("  Enabling modules...")
-                    module_base = dnf.module.module_base.ModuleBase(base)
-                    module_base.enable(workload_conf["modules_enable"])
-                except dnf.exceptions.MarkingErrors as err:
-                    workload["succeeded"] = False
-                    workload["errors"]["message"] = str(err)
-                    #log("  Failed!  (Error message will be on the workload results page.")
-                    #log("")
-                    return workload
-            
-            # Get a list of enabled modules
-            # The official DNF API doesn't support it. I got this from the DNF folks
-            # (thanks!) as a solution, but just keeping it in a generic try/except
-            # as it's not an official API. 
-            enabled_modules = set()
-            try:
-                all_modules = base._moduleContainer.getModulePackages()
-                for module in all_modules:
-                    if base._moduleContainer.isEnabled(module):
-                        module_name = module.getName()
-                        module_stream = module.getStream()
-                        module_nsv = "{module_name}:{module_stream}".format(
-                            module_name=module_name,
-                            module_stream=module_stream
-                        )
-                        enabled_modules.add(module_nsv)
-            except:
-                #log("  Something went wrong with getting a list of enabled modules. (This uses non-API DNF calls. Skipping.)")
-                enabled_modules = set()
-            workload["enabled_modules"] = list(enabled_modules)
-
             # 37 %
 
             # Packages
@@ -2579,7 +2514,6 @@ def _analyze_view(self, view_conf, arch, views):
         view["workload_ids"] = []
         view["pkgs"] = {}
         view["source_pkgs"] = {}
-        view["modules"] = {}
 
         # Workloads
         for workload_id, workload in self.data["workloads"].items():
@@ -2681,27 +2615,6 @@ def _analyze_view(self, view_conf, arch, views):
 
                 # Build requires
                 view["source_pkgs"][srpm_id]["placeholder_directly_required_pkg_names"] = workload_conf["package_placeholders"]["srpms"][srpm_name]["buildrequires"]
-            
-            # Oh! And modules
-            for module_id in workload["enabled_modules"]:
-
-                # Initiate
-                if module_id not in view["modules"]:
-                    view["modules"][module_id] = {}
-                    view["modules"][module_id]["id"] = module_id
-                    view["modules"][module_id]["in_workload_ids_all"] = set()
-                    view["modules"][module_id]["in_workload_ids_req"] = set()
-                    view["modules"][module_id]["in_workload_ids_dep"] = set()
-                
-                # It's in this workload
-                view["modules"][module_id]["in_workload_ids_all"].add(workload_id)
-                
-                # Is it required?
-                if module_id in workload_conf["modules_enable"]:
-                    view["modules"][module_id]["in_workload_ids_req"].add(workload_id)
-                else:
-                    view["modules"][module_id]["in_workload_ids_dep"].add(workload_id)
-
         
         # If this is an addon view, remove all packages that are already in the parent view
         if view_conf["type"] == "addon":
@@ -2718,7 +2631,6 @@ def _analyze_view(self, view_conf, arch, views):
 
         # Done with packages!
         log("  Includes {} packages.".format(len(view["pkgs"])))
-        log("  Includes {} modules.".format(len(view["modules"])))
 
         # But not with source packages, that's an entirely different story!
         for pkg_id, pkg in view["pkgs"].items():
@@ -3295,8 +3207,6 @@ def _analyze_srpm_buildroots(self, pass_counter):
                     fake_workload_conf["labels"] = []
                     fake_workload_conf["id"] = srpm_id
                     fake_workload_conf["options"] = []
-                    fake_workload_conf["modules_disable"] = []
-                    fake_workload_conf["modules_enable"] = []
                     fake_workload_conf["packages"] = srpm["directly_required_pkg_names"]
                     fake_workload_conf["groups"] = []
                     fake_workload_conf["package_placeholders"] = {}
@@ -3839,8 +3749,6 @@ def _generate_views_all_arches(self):
 
                 view_all_arches["source_pkgs_by_name"] = {}
 
-                view_all_arches["modules"] = {}
-
                 view_all_arches["numbers"] = {}
                 view_all_arches["numbers"]["pkgs"] = {}
                 view_all_arches["numbers"]["pkgs"]["runtime"] = 0
@@ -4009,14 +3917,6 @@ def _generate_views_all_arches(self):
                         )
                         view_all_arches["source_pkgs_by_name"][source_name]["pkg_nevrs"].add(pkg_nevr)
                                             
-                    
-                    # Modules
-                    for module_id, module in view["modules"].items():
-
-                        if module_id not in view_all_arches["modules"]:
-                            view_all_arches["modules"][module_id] = {}
-                            view_all_arches["modules"][module_id]["id"] = module_id
-                            # ...
                 
 
                 # RPMs
@@ -4596,7 +4496,6 @@ def analyze_things(self):
             #    data["views"][view_id]["workload_ids"]
             #    data["views"][view_id]["pkgs"]
             #    data["views"][view_id]["source_pkgs"]
-            #    data["views"][view_id]["modules"]
             #
             log("")
             log("=====  Analyzing Views =====")
@@ -5796,38 +5695,6 @@ def view_placeholder_srpms(self, view_conf_id, arch):
         return placeholder_srpms
 
 
-    @lru_cache(maxsize = None)
-    def view_modules(self, view_conf_id, arch, maintainer=None):
-        workload_ids = self.workloads_in_view(view_conf_id, arch, maintainer)
-
-        modules = {}
-
-        for workload_id in workload_ids:
-            workload = self.data["workloads"][workload_id]
-            workload_conf_id = workload["workload_conf_id"]
-            workload_conf = self.configs["workloads"][workload_conf_id]
-
-            required_modules = workload_conf["modules_enable"]
-
-            for module_id in workload["enabled_modules"]:
-                if module_id not in modules:
-                    modules[module_id] = {}
-                    modules[module_id]["id"] = module_id
-                    modules[module_id]["q_in"] = set()
-                    modules[module_id]["q_required_in"] = set()
-                    modules[module_id]["q_dep_in"] = set()
-                
-                modules[module_id]["q_in"].add(workload_id)
-
-                if module_id in required_modules:
-                    modules[module_id]["q_required_in"].add(workload_id)
-                else:
-                    modules[module_id]["q_dep_in"].add(workload_id)
-                
-
-        return modules
-
-
     @lru_cache(maxsize = None)
     def view_maintainers(self, view_conf_id, arch):
         workload_ids = self.workloads_in_view(view_conf_id, arch)
@@ -6315,12 +6182,6 @@ def _generate_view_pages(query):
         )
         _generate_html_page("view_sources", template_data, page_name, query.settings)
 
-        # Generate the modules page
-        page_name = "view-modules--{view_conf_id}".format(
-            view_conf_id=view_conf_id
-        )
-        _generate_html_page("view_modules", template_data, page_name, query.settings)
-
         # Generate the unwanted packages page
         page_name = "view-unwanted--{view_conf_id}".format(
             view_conf_id=view_conf_id
diff --git a/templates/config_workload.html b/templates/config_workload.html
index 7fcea29..a8011b4 100644
--- a/templates/config_workload.html
+++ b/templates/config_workload.html
@@ -52,26 +52,6 @@ <h5 class="card-header">
                 </div>
                 <div class="col-sm-3">
                     <dl>
-                        {% if workload_conf.modules_disable %}
-                        <dt> Modules to disable </dt>
-                        <dd>
-                            <ul class="list-unstyled list-packages">
-                                {% for module_stream in workload_conf.modules_disable | sort %}
-                                <li>{{module_stream}}</li>
-                                {% endfor %}
-                            </ul>
-                        </dd>
-                        {% endif %}
-                        {% if workload_conf.modules_enable %}
-                        <dt> Modules to enable </dt>
-                        <dd>
-                            <ul class="list-unstyled list-packages">
-                                {% for module_stream in workload_conf.modules_enable | sort %}
-                                <li>{{module_stream}}</li>
-                                {% endfor %}
-                            </ul>
-                        </dd>
-                        {% endif %}
                         <dt> Required Packages </dt>
                         <dd>
                             <ul class="list-unstyled list-packages">
@@ -143,4 +123,4 @@ <h5 class="card-header"> Results </h5>
     </div>
 <br>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/view_menu.html b/templates/view_menu.html
index 45670cb..c2f6108 100644
--- a/templates/view_menu.html
+++ b/templates/view_menu.html
@@ -8,9 +8,6 @@
     <li class="nav-item">
         <a class="nav-link {{view_menu_active_sources}}" href="view-sources--{{view_conf.id}}.html">Source Packages</a>
     </li>
-    <li class="nav-item">
-        <a class="nav-link {{view_menu_active_modules}}" href="view-modules--{{view_conf.id}}.html">Modules</a>
-    </li>
     <li class="nav-item">
         <a class="nav-link {{view_menu_active_unwanted}}" href="view-unwanted--{{view_conf.id}}.html">Unwanted Packages</a>
     </li>
@@ -46,4 +43,4 @@
         {% endfor %}
     </ul-->
 
-<hr>
\ No newline at end of file
+<hr>
diff --git a/templates/view_modules.html b/templates/view_modules.html
deleted file mode 100644
index 5cd6d8f..0000000
--- a/templates/view_modules.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "view.html" %}
-
-{% set view_menu_active_modules = "active" %}
-
-{% block view_content %}
-
-{% include "view_menu.html" %}
-
-<table id="table_packages" class="table-packages">
-    <thead>
-        <tr class="sort_control_row">
-            <th>Name</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for module_id in view_all_arches.modules %}
-        <tr>
-            <td>
-                {{module_id}}
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-
-<script>
-    $(document).ready(function () {
-
-        $('#table_packages').DataTable({
-            paging: false,
-            info: false,
-            initComplete: function () {
-                var input = $('.dataTables_filter input').unbind(),
-                    self = this.api(),
-                    $searchButton = $('<button>')
-                        .text('search')
-                        .click(function () {
-                            self.search(input.val()).draw();
-                        }),
-                    $clearButton = $('<button>')
-                        .text('clear')
-                        .click(function () {
-                            input.val('');
-                            $searchButton.click();
-                        });
-                $(document).keypress(function (event) {
-                    if (event.which == 13) {
-                        $searchButton.click();
-                    }
-                });
-
-                $('.dataTables_filter').append($searchButton, $clearButton);
-            }
-        });
-
-        var loadingDiv = document.getElementById("loading");
-        loadingDiv.parentNode.removeChild(loadingDiv);
-    });
-</script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/workload.html b/templates/workload.html
index 29c0210..5741c9d 100644
--- a/templates/workload.html
+++ b/templates/workload.html
@@ -104,26 +104,6 @@ <h5 class="card-header"> Size History </h5>
             <div class="card w-100">
                 <h5 class="card-header"> Additional info </h5>
                 <div class="card-body">
-                    {% if workload_conf.modules_disable %}
-                    <dt> Disabled modules </dt>
-                    <dd>
-                        <ul class="list-unstyled list-packages">
-                            {% for module_stream in workload_conf.modules_disable | sort %}
-                            <li>{{module_stream}}</li>
-                            {% endfor %}
-                        </ul>
-                    </dd>
-                    {% endif %}
-                    {% if query.data.workloads[workload_id].enabled_modules %}
-                    <dt> Enabled modules </dt>
-                    <dd>
-                        <ul class="list-unstyled list-packages">
-                            {% for module_stream in query.data.workloads[workload_id].enabled_modules | sort %}
-                            <li>{{module_stream}}</li>
-                            {% endfor %}
-                        </ul>
-                    </dd>
-                    {% endif %}
                     <dl>
                         <dt>Configuration</dt>
                         <dd><a href="config-workload--{{workload_conf.id}}.html">{{workload_conf.id}}.yaml</a></dd>
@@ -261,4 +241,4 @@ <h5 class="card-header"> Additional info </h5>
             })
     });
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/types.txt b/types.txt
index 137c3ca..f116232 100644
--- a/types.txt
+++ b/types.txt
@@ -92,8 +92,6 @@ configs["workloads"][workload_conf_id]["id"]
 configs["workloads"][workload_conf_id]["name"]
 configs["workloads"][workload_conf_id]["description"]
 configs["workloads"][workload_conf_id]["maintainer"]
-configs["workloads"][workload_conf_id]["modules_disable"]
-configs["workloads"][workload_conf_id]["modules_enable"]
 configs["workloads"][workload_conf_id]["packages"]
 configs["workloads"][workload_conf_id]["labels"]
 configs["workloads"][workload_conf_id]["arch_packages"][arch]
@@ -106,7 +104,6 @@ data["workloads"][workload_id]["arch"]
 data["workloads"][workload_id]["pkg_env_ids"]
 data["workloads"][workload_id]["pkg_added_ids"]
 data["workloads"][workload_id]["pkg_placeholder_names"]
-data["workloads"][workload_id]["enabled_modules"]
 data["workloads"][workload_id]["pkg_relations"]
 data["workloads"][workload_id]["errors"]["non_existing_pkgs"]
 data["workloads"][workload_id]["errors"]["message"]
@@ -154,7 +151,6 @@ data["views_all_arches"][view_conf_id]["workloads"][workload_conf_id]
 data["views_all_arches"][view_conf_id]["pkgs_by_name"][pkg_name]
 data["views_all_arches"][view_conf_id]["pkgs_by_nevr"][pkg_nevr]
 data["views_all_arches"][view_conf_id]["source_pkgs_by_name"][srpm_name]
-data["views_all_arches"][view_conf_id]["modules"][module_id]
 
 
 data["views_all_arches"][view_conf_id]["pkgs_by_name"][pkg_name]...
@@ -211,7 +207,6 @@ data["views"][view_id]["arch"]
 data["views"][view_id]["workload_ids"]
 data["views"][view_id]["pkgs"]
 data["views"][view_id]["source_pkgs"]
-data["views"][view_id]["modules"]
 
 
 data["views"][view_id]["pkgs"][pkg_id][...]  <- everything from data["pkgs"][repo_id][arch][pkg_id]
@@ -270,12 +265,6 @@ data["views"][view_id]["source_pkgs"][srpm_id]["unwanted_runtime_in"]    <--,
 data["views"][view_id]["source_pkgs"][srpm_id]["unwanted_buildroot_in"]  <--=-- unwanted_ids
 
 
-data["views"][view_id]["modules"][module_id]["id"]
-data["views"][view_id]["modules"][module_id]["in_workload_ids_all"]
-data["views"][view_id]["modules"][module_id]["in_workload_ids_req"]
-data["views"][view_id]["modules"][module_id]["in_workload_ids_dep"]
-
-
 === Buildroot ===
 
 # This stores the direct build dependencies of SRPMs