diff --git a/docs/nix/flake-module.nix b/docs/nix/flake-module.nix
index 9fd08108e..49acf3463 100644
--- a/docs/nix/flake-module.nix
+++ b/docs/nix/flake-module.nix
@@ -11,7 +11,7 @@
       ...
     }:
     let
-      buildClanOptions = self'.legacyPackages.clan-internals-docs;
+      clanOptions = self'.legacyPackages.clan-internals-docs;
       # Simply evaluated options (JSON)
       # { clanCore = «derivation JSON»; clanModules = { ${name} = «derivation JSON» }; }
       jsonDocs = pkgs.callPackage ./get-module-docs.nix {
@@ -99,7 +99,7 @@
             # Frontmatter format for clanModules
             export CLAN_MODULES_FRONTMATTER_DOCS=${clanModulesFrontmatter}/share/doc/nixos/options.json
 
-            export BUILD_CLAN_PATH=${buildClanOptions}/share/doc/nixos/options.json
+            export BUILD_CLAN_PATH=${clanOptions}/share/doc/nixos/options.json
 
             mkdir $out
 
diff --git a/lib/default.nix b/lib/default.nix
index 4606ecc83..45f03e65e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -21,7 +21,6 @@ lib.fix (
   {
 
     inherit (buildClanLib)
-      buildClan
       clan
       ;
     /**
diff --git a/lib/modules/default.nix b/lib/modules/default.nix
index 1c2625e16..bc19b66eb 100644
--- a/lib/modules/default.nix
+++ b/lib/modules/default.nix
@@ -5,32 +5,7 @@
   clan-core,
   ...
 }:
-rec {
-  buildClan =
-    module:
-    lib.warn ''
-      ==================== DEPRECATION NOTICE ====================
-      Please migrate 
-      from: 'clan = inputs.<clan-core>.lib.buildClan' 
-      to  : 'clan = inputs.<clan-core>.lib.clan'
-      in your flake.nix.
-
-      Please also migrate
-      from: 'inherit (clan) nixosConfigurations clanInternals; '
-      to  : "
-              inherit (clan.config) nixosConfigurations clanInternals;
-              clan = clan.config;
-            "
-      in your flake.nix.
-
-      Reason: 
-      - Improves consistency between flake-parts and non-flake-parts users.
-              
-      - It also allows us to use the top level attribute 'clan' to expose
-        attributes that can be used for cross-clan functionality.
-      ============================================================
-    '' (clan module).config;
-
+{
   clan =
     {
       self ? lib.warn "Argument: 'self' must be set" null, # Reference to the current flake
diff --git a/pkgs/clan-cli/clan_lib/persist/inventory_store.py b/pkgs/clan-cli/clan_lib/persist/inventory_store.py
index 17a010a23..d18fb7326 100644
--- a/pkgs/clan-cli/clan_lib/persist/inventory_store.py
+++ b/pkgs/clan-cli/clan_lib/persist/inventory_store.py
@@ -139,7 +139,7 @@ class InventoryStore:
     def _load_merged_inventory(self) -> InventorySnapshot:
         """
         Loads the evaluated inventory.
-        After all merge operations with eventual nix code in buildClan.
+        After all merge operations with eventual nix code in lib.clan.
 
         Evaluates clanInternals.inventoryClass.inventory with nix. Which is performant.