diff --git a/neovim/overlays.nix b/neovim/overlays.nix
index d0c108e8..963fddbb 100644
--- a/neovim/overlays.nix
+++ b/neovim/overlays.nix
@@ -21,7 +21,6 @@
         };
         nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
           name = "nvim-dap-rr";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
             owner = "jonboh";
             repo = "nvim-dap-rr";
@@ -31,7 +30,6 @@
         };
         sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
           name = "sqls-nvim";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
             owner = "nanotee";
             repo = "sqls.nvim";
@@ -41,7 +39,6 @@
         };
         outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
           name = "outline-nvim";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
             owner = "hedyhli";
             repo = "outline.nvim";
@@ -78,7 +75,6 @@
         tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
           language = "nu";
           version = "0.0.1";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
             owner = "nushell";
             repo = "tree-sitter-nu";
@@ -88,52 +84,9 @@
         };
       };
   };
-  # rest-nvim-overlay = final: prev: let
-  #   rest-nvim-src = inputs.rest-nvim;
-  #   rest-nvim-luaPackage-override = luaself: luaprev: {
-  #     rest-nvim = luaself.callPackage (
-  #       {
-  #         luaOlder,
-  #         buildLuarocksPackage,
-  #         lua,
-  #         nvim-nio,
-  #         luarocks-nix,
-  #         lua-curl,
-  #         mimetypes,
-  #         xml2lua,
-  #       }:
-  #         buildLuarocksPackage {
-  #           pname = "rest.nvim";
-  #           version = "scm-1";
-  #           knownRockspec = "${rest-nvim-src}/rest.nvim-scm-1.rockspec";
-  #           src = rest-nvim-src;
-  #           propagatedBuildInputs = [lua luarocks-nix nvim-nio lua-curl mimetypes xml2lua];
-  #           disable = luaOlder "5.1";
-  #         }
-  #     ) {};
-  #   };
-  #   lua5_1 = prev.lua5_1.override {
-  #     packageOverrides = rest-nvim-luaPackage-override;
-  #   };
-  #   lua51Packages = final.lua5_1.pkgs;
-  # in {
-  #   inherit lua5_1 lua51Packages;
-  #   # vimPlugins =
-  #   #   prev.vimPlugins
-  #   #   // {
-  #   #     rest-nvim = final.neovimUtils.buildNeovimPlugin {
-  #   #       pname = "rest.nvim";
-  #   #       version = "scm-1";
-  #   #       src = rest-nvim-src;
-  #   #     };
-  #   #   };
-  #   # rest-nvim = final.vimPlugins.rest-nvim;
-  # };
 in [
-  # inputs.nnn.overlays.default
   inputs.nno.overlays.default
   inputs.nixvim.overlays.default
   vimPlugins
   tree-sitter-grammars
-  # rest-nvim-overlay
 ]
diff --git a/overlays.nix b/overlays.nix
index e29a05a2..4c7ed020 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -9,12 +9,10 @@
     };
   };
   misc-applications = final: prev: {
-    # kitty = inputs.nixpkgs-master.legacyPackages.kitty;
     goread = final.pkgs.buildGoModule {
       pname = "goread";
       version = "v1.6.4";
       vendorHash = "sha256-/kxEnw8l9S7WNMcPh1x7xqiQ3L61DSn6DCIvJlyrip0";
-      # TODO: Move to subflake
       src = final.pkgs.fetchFromGitHub {
         owner = "TypicalAM";
         repo = "goread";
@@ -26,7 +24,6 @@
     };
     music-player-git = inputs.music-player.packages.${prev.system}.default;
     davis = let
-      # TODO: Move to subflake
       davis-src = final.pkgs.fetchFromGitHub {
         owner = "SimonPersson";
         repo = "davis";
@@ -66,9 +63,7 @@
         cargoLock = {lockFile = "${inputs.openapi-tui}/Cargo.lock";};
         buildInputs = with final;
           pkgs.lib.optionals pkgs.stdenv.isDarwin [
-            pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
-            pkgs.darwin.apple_sdk.frameworks.Security
-            pkgs.darwin.apple_sdk.frameworks.CoreFoundation
+            pkgs.apple-sdk_13
           ]
           ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
             pkgs.openssl
@@ -77,8 +72,6 @@
         nativeBuildINputs = with final; [pkgs.pkg-config];
       };
     picat = let
-      # https://github.com/SimonPersson/picat
-      # TODO: Move to subflake
       picat-src = final.pkgs.fetchFromGitHub {
         owner = "SimonPersson";
         repo = "picat";
@@ -94,12 +87,6 @@
         src = picat-src;
         cargoLock = {lockFile = "${picat-src}/Cargo.lock";};
       };
-    pylyzer = prev.pylyzer.override {
-      rustPlatform = final.makeRustPlatform {
-        rustc = final.pkgs.rust-bin.stable."1.75.0".default;
-        cargo = final.pkgs.cargo;
-      };
-    };
     psst =
       if final.pkgs.stdenv.isLinux
       then
@@ -114,19 +101,15 @@
         final.rustPlatform.buildRustPackage rec {
           pname = "psst";
           version = "1";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
-            # https://github.com/jpochyla/psst
             owner = "jpochyla";
             repo = "psst";
             rev = "master";
             sha256 = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk";
           };
           buildInputs = with final; [
-            pkgs.darwin.apple_sdk.frameworks.CoreAudio
-            pkgs.darwin.apple_sdk.frameworks.AudioUnit
+            pkgs.apple-sdk_13
           ];
-          # nativeBuildInputs = buildInputs;
           cargoLock = {
             lockFile = "${src}/Cargo.lock";
             outputHashes = {