diff --git a/README.md b/README.md
index 015dba9..60d9298 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,8 @@ Collection of opinionated, integrated and shared NixOS modules.
 
 This includes features like:
 - Backend independent LDAP/OAuth2 abstraction with service integration
-- A continuation of environment.noXLibs named environment.noGraphicsPackages
 - Easy Postgres upgrades between major versions and installation of `pg_stat_statements` extension in all databases
-- Easy integration of Matrix Synapse, Element Web and extra oembed providers
+- Easy integration of Matrix Synapse, Element Web and extra Oembed providers
 - Configure extra dependencies in Nextcloud for the Recognize and Memories Apps and properly setup preview generation
 - Restricted nix remote builders which can only execute remote builds
 - More opinionated integrations on top of Portunus (Simple LDAP frontend), dex and oauth2-proxy
diff --git a/modules/default.nix b/modules/default.nix
index 4d01dcb..9d7dec3 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,5 +6,7 @@
   imports = [
     (lib.mkRemovedOptionModule ["debugging" "enable"] "Because we never really used it.")
     (lib.mkRemovedOptionModule ["environment" "noGraphicsPackages"] "Maintaining it out of tree got unviable after the kernel started to depend on a graphics library through ~5 packages.")
+    (lib.mkRemovedOptionModule ["haproxy" "compileWithAWSlc"] ''just set `services.haproxy.package = pkgs.haproxy.override { sslLibrary = "aws-lc"; };`'')
+    (lib.mkRemovedOptionModule ["haproxy" "recommendedDefaults"] "it wasn't used")
   ];
 }
diff --git a/modules/haproxy.nix b/modules/haproxy.nix
deleted file mode 100644
index 09bb3ff..00000000
--- a/modules/haproxy.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, libS, pkgs, ... }:
-
-let
-  cfg = config.services.haproxy;
-in
-{
-  options = {
-    services.haproxy = {
-      compileWithAWSlc = libS.mkOpinionatedOption "compile nginx with aws-lc as crypto library";
-
-      recommendedDefaults = libS.mkOpinionatedOption "set recommended default settings";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.haproxy = {
-      package = lib.mkIf cfg.compileWithAWSlc (pkgs.haproxy.override { sslLibrary = "aws-lc"; });
-
-      config = lib.mkBefore (''
-        global
-          ssl-default-bind-options ssl-min-ver TLSv1.2 no-tls-tickets
-      '' + lib.optionalString (!cfg.compileWithAWSlc) ''
-          ssl-dh-param-file ${config.security.dhparams.params.haproxy.path}
-      '');
-    };
-  };
-}