diff --git a/old_nushell/Cargo_old.lock b/old_nushell/Cargo_old.lock
deleted file mode 100644
index 595c1f5a7..000000000
--- a/old_nushell/Cargo_old.lock
+++ /dev/null
@@ -1,5359 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.3",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "ansi_colours"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60e2fb6138a49ad9f1cb3c6d8f8ccbdd5e62b4dab317c1b435a47ecd7da1d28f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
-
-[[package]]
-name = "arrayvec"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-dependencies = [
- "nodrop",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "arrow-format"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7da2d9660bfaebbdb0a44a33b3bd1dcb5a952fafa02c0dfc6a51ea471fef2a"
-dependencies = [
- "flatbuffers",
-]
-
-[[package]]
-name = "arrow2"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d873e2775c3d87a4e8d77aa544cbd43f34a0779d5164c59e7c6a1dd0678eb395"
-dependencies = [
- "ahash",
- "arrow-format",
- "base64",
- "chrono",
- "csv",
- "futures 0.3.18",
- "hash_hasher",
- "indexmap",
- "lexical-core",
- "multiversion",
- "num-traits",
- "parquet2",
- "serde",
- "serde_json",
- "simdutf8",
- "streaming-iterator",
- "strength_reduce",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625"
-dependencies = [
- "async-stream-impl",
- "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.51"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "backtrace"
-version = "0.3.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "miniz_oxide 0.4.4",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "bat"
-version = "0.18.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a069bad29696ecaa51ac79d3eb87abe3b65c7808ab2b3836afd9bd6c4009362"
-dependencies = [
- "ansi_colours",
- "ansi_term",
- "bugreport",
- "clircle",
- "console",
- "content_inspector",
- "encoding",
- "error-chain",
- "git2",
- "globset",
- "grep-cli",
- "path_abs",
- "semver 0.11.0",
- "serde",
- "serde_yaml",
- "shell-words",
- "syntect",
- "unicode-width",
-]
-
-[[package]]
-name = "bigdecimal"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744"
-dependencies = [
- "num-bigint 0.4.3",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-
-[[package]]
-name = "bitpacking"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7"
-dependencies = [
- "crunchy",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71cb90ade945043d3d53597b2fc359bb063db8ade2bcffe7997351d0756e9d50"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bson"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff58d466782b57e0001c8e97c6a70c01c2359d7e13e257a83654c0b783ecc139"
-dependencies = [
- "ahash",
- "base64",
- "chrono",
- "hex",
- "indexmap",
- "lazy_static",
- "rand 0.8.4",
- "serde",
- "serde_bytes",
- "serde_json",
- "uuid",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bugreport"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0014b4b2b4f63bfe69c3838470121290cc437fdc79785d408a761a21e8b2404c"
-dependencies = [
- "git-version",
- "shell-escape",
- "sys-info",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
-
-[[package]]
-name = "byte-unit"
-version = "4.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ffc5b0ec7d7a6949e3f21fd63ba5af4cffdc2ba1e0b7bf62b481458c4ae7f"
-dependencies = [
- "utf8-width",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "bzip2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "calamine"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b86ca78da4bdce5ac0f0bdbc0218ad14232f1e668376e044233f64c527cf5abb"
-dependencies = [
- "byteorder",
- "codepage",
- "encoding_rs",
- "log",
- "quick-xml 0.19.0",
- "serde",
- "zip",
-]
-
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
-[[package]]
-name = "cc"
-version = "1.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "serde",
- "time 0.1.44",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "chrono-humanize"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eddc119501d583fd930cb92144e605f44e0252c38dd89d9247fffa1993375cb"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "chrono-tz"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
-dependencies = [
- "chrono",
- "parse-zoneinfo",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "4.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db8340083d28acb43451166543b98c838299b7e0863621be53a338adceea0ed"
-dependencies = [
- "error-code",
- "str-buf",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "clircle"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e68bbd985a63de680ab4d1ad77b6306611a8f961b282c8b5ab513e6de934e396"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "serde",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "codepage"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0e9222c0cdf2c6ac27d73f664f9520266fa911c3106329d359f8861cb8bde9"
-dependencies = [
- "encoding_rs",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "serde",
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "comfy-table"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a488ea8a8e295a53c7a4514b78a2e54bcff33adf99c15aced97b2a2062d4f8"
-dependencies = [
- "crossterm",
- "strum",
- "strum_macros",
-]
-
-[[package]]
-name = "common-path"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
-
-[[package]]
-name = "console"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "regex",
- "terminal_size",
- "unicode-width",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "const-sha1"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d"
-
-[[package]]
-name = "content_inspector"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c"
-dependencies = [
- "bitflags",
- "crossterm_winapi",
- "lazy_static",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
-[[package]]
-name = "cssparser"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "matches",
- "phf",
- "proc-macro2",
- "quote",
- "smallvec",
- "syn",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "cstr_core"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ba9efe9e1e736671d5a03f006afc4e7e3f32503e2077e0bcaf519c0c8c1d3"
-dependencies = [
- "cty",
- "memchr",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ctrlc"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377c9b002a72a0b2c1a18c62e2f3864bdfea4a015e3683a96e24aa45dd6c02d1"
-dependencies = [
- "nix",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
-name = "derive-new"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "directories-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
-dependencies = [
- "libc",
- "redox_users",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "dtparse"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13276c5dbd7f365e00efe6631242772fe6615e1899df84d1f6ce3ae7b48209f6"
-dependencies = [
- "chrono",
- "chrono-tz",
- "lazy_static",
- "num-traits",
- "rust_decimal",
-]
-
-[[package]]
-name = "dunce"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
-
-[[package]]
-name = "ego-tree"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "eml-parser"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031fe36712cec8b81c5b76b555666ce855a4dfc2dcc35bb907046bf2ef545578"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-dependencies = [
- "encoding-index-japanese",
- "encoding-index-korean",
- "encoding-index-simpchinese",
- "encoding-index-singlebyte",
- "encoding-index-tradchinese",
-]
-
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-dependencies = [
- "encoding_index_tests",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "error-code"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5115567ac25674e0043e472be13d14e537f37ea8aa4bdc4aef0c89add1db1ff"
-dependencies = [
- "libc",
- "str-buf",
-]
-
-[[package]]
-name = "failure"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
-dependencies = [
- "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "fd-lock"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc110fe50727d46a428eed832df40affe9bf74d077cac1bf3f2718e823f14c5"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "filesize"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d741e2415d4e2e5bd1c1d00409d1a8865a57892c2d689b504365655d237d43"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "flatbuffers"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4c5738bcd7fad10315029c50026f83c9da5e4a21f8ed66826f43e0e2bde5f6"
-dependencies = [
- "bitflags",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
-dependencies = [
- "cfg-if 1.0.0",
- "crc32fast",
- "libc",
- "miniz_oxide 0.4.4",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "fs_extra"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
-
-[[package]]
-name = "futf"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
-
-[[package]]
-name = "futures-task"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
-
-[[package]]
-name = "futures-util"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
-dependencies = [
- "futures 0.1.31",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "tokio-io",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gimli"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
-
-[[package]]
-name = "git-version"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"
-dependencies = [
- "git-version-macro",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "git-version-macro"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "git2"
-version = "0.13.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
-[[package]]
-name = "gjson"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4599d0e9dce476280e2da1f334811e2b26d63a6b000e13b7b50cc980bae49698"
-
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "globset"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
-[[package]]
-name = "grep-cli"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dd110c34bb4460d0de5062413b773e385cbf8a85a63fc535590110a09e79e8a"
-dependencies = [
- "atty",
- "bstr",
- "globset",
- "lazy_static",
- "log",
- "regex",
- "same-file",
- "termcolor",
- "winapi-util",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hamcrest2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f837c62de05dc9cc71ff6486cd85de8856a330395ae338a04bfcefe5e91075"
-dependencies = [
- "num 0.2.1",
- "regex",
-]
-
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "hash_hasher"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74721d007512d0cb3338cd20f0654ac913920061a4c4d0d8708edb3f2a698c0c"
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
- "rayon",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "heapless"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1ad878e07405df82b695089e63d278244344f80e764074d0bdfe99b89460f3"
-dependencies = [
- "hash32",
- "spin",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac",
- "digest",
-]
-
-[[package]]
-name = "hmac-sha1"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1333fad8d94b82cab989da428b0b36a3435db3870d85e971a1d6dc0a8576722"
-dependencies = [
- "sha1",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "htmlescape"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
-
-[[package]]
-name = "http"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
-dependencies = [
- "bytes 1.1.0",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
-dependencies = [
- "bytes 1.1.0",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c"
-dependencies = [
- "bytes 1.1.0",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes 1.1.0",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "ical"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9f7215ad0d77e69644570dee000c7678a47ba7441062c1b5f918adde0d73cf"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "jpeg-decoder",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
-dependencies = [
- "autocfg",
- "hashbrown",
- "serde",
-]
-
-[[package]]
-name = "insta"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15226a375927344c78d39dc6b49e2d5562a5b0705e26a589093c6792e52eed8e"
-dependencies = [
- "console",
- "lazy_static",
- "serde",
- "serde_json",
- "serde_yaml",
- "similar",
- "uuid",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "integer-encoding"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8"
-dependencies = [
- "async-trait",
- "futures-util",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
-
-[[package]]
-name = "is_debug"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89"
-
-[[package]]
-name = "is_executable"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-
-[[package]]
-name = "js-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "lexical"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34e981f88d060a67815388470172638f1af16b3a12e581cb75142f190161bf9"
-dependencies = [
- "lexical-core",
-]
-
-[[package]]
-name = "lexical-core"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a3926d8f156019890be4abe5fd3785e0cff1001e06f59c597641fd513a5a284"
-dependencies = [
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-parse-float"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4d066d004fa762d9da995ed21aa8845bb9f6e4265f540d716fb4b315197bf0e"
-dependencies = [
- "lexical-parse-integer",
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-parse-integer"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2c92badda8cc0fc4f3d3cc1c30aaefafb830510c8781ce4e8669881f3ed53ac"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-util"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff669ccaae16ee33af90dc51125755efed17f1309626ba5c12052512b11e291"
-dependencies = [
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-float"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5186948c7b297abaaa51560f2581dae625e5ce7dfc2d8fdc56345adb6dc576"
-dependencies = [
- "lexical-util",
- "lexical-write-integer",
- "static_assertions",
-]
-
-[[package]]
-name = "lexical-write-integer"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece956492e0e40fd95ef8658a34d53a3b8c2015762fdcaaff2167b28de1f56ef"
-dependencies = [
- "lexical-util",
- "static_assertions",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.12.26+1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-dependencies = [
- "safemem",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-dependencies = [
- "serde",
- "serde_test",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "lz4"
-version = "1.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
-dependencies = [
- "libc",
- "lz4-sys",
-]
-
-[[package]]
-name = "lz4-sys"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "md-5"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15"
-dependencies = [
- "block-buffer",
- "digest",
- "opaque-debug",
-]
-
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "memmap2"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4647a11b578fead29cdbb34d4adef8dd3dc35b876c9c6d5240d83f205abfe96e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "meval"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
-dependencies = [
- "fnv",
- "nom",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg",
-]
-
-[[package]]
-name = "mio"
-version = "0.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "mp4"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85660d4d88b9318d95396943adc4a254b3ed8bf1de917e6f093abda1ccf0bec0"
-dependencies = [
- "byteorder",
- "bytes 0.5.6",
- "num-rational 0.3.2",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "multiversion"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025c962a3dd3cc5e0e520aa9c612201d127dcdf28616974961a649dca64f5373"
-dependencies = [
- "multiversion-macros",
-]
-
-[[package]]
-name = "multiversion-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a3e2bde382ebf960c1f3e79689fa5941625fe9bf694a1cb64af3e85faff3af"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "neso"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b3c31defbcb081163db18437fd88c2a267cb3e26f7bd5e4b186e4b1b38fe8c8"
-dependencies = [
- "bincode",
- "cfg-if 0.1.10",
- "log",
- "serde",
- "serde_derive",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nibble_vec"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
-dependencies = [
- "smallvec",
-]
-
-[[package]]
-name = "nix"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nom"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
-
-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "nu"
-version = "0.43.0"
-dependencies = [
- "ctrlc",
- "futures 0.3.18",
- "hamcrest2",
- "itertools",
- "nu-cli",
- "nu-command",
- "nu-completion",
- "nu-data",
- "nu-engine",
- "nu-errors",
- "nu-parser",
- "nu-path",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "nu-value-ext",
- "nu_plugin_binaryview",
- "nu_plugin_chart",
- "nu_plugin_from_bson",
- "nu_plugin_from_sqlite",
- "nu_plugin_inc",
- "nu_plugin_match",
- "nu_plugin_query_json",
- "nu_plugin_s3",
- "nu_plugin_selector",
- "nu_plugin_start",
- "nu_plugin_textview",
- "nu_plugin_to_bson",
- "nu_plugin_to_sqlite",
- "nu_plugin_tree",
- "nu_plugin_xpath",
- "rstest",
- "serial_test",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.43.0"
-dependencies = [
- "doc-comment",
- "overload",
- "regex",
- "serde",
- "serde_json",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "nu-cli"
-version = "0.43.0"
-dependencies = [
- "ctrlc",
- "indexmap",
- "lazy_static",
- "log",
- "nu-ansi-term",
- "nu-command",
- "nu-completion",
- "nu-data",
- "nu-engine",
- "nu-errors",
- "nu-parser",
- "nu-path",
- "nu-protocol",
- "nu-source",
- "nu-stream",
- "pretty_env_logger",
- "rustyline",
- "serde",
- "serde_yaml",
- "shadow-rs",
- "strip-ansi-escapes",
-]
-
-[[package]]
-name = "nu-command"
-version = "0.43.0"
-dependencies = [
- "base64",
- "bigdecimal",
- "calamine",
- "chrono",
- "chrono-tz",
- "crossterm",
- "csv",
- "ctrlc",
- "derive-new",
- "digest",
- "dirs-next",
- "dtparse",
- "eml-parser",
- "encoding_rs",
- "filesize",
- "futures 0.3.18",
- "glob",
- "hamcrest2",
- "heck 0.4.0",
- "htmlescape",
- "ical",
- "indexmap",
- "itertools",
- "lazy_static",
- "log",
- "md-5",
- "meval",
- "mime",
- "nu-ansi-term",
- "nu-data",
- "nu-engine",
- "nu-errors",
- "nu-json",
- "nu-parser",
- "nu-path",
- "nu-plugin",
- "nu-pretty-hex",
- "nu-protocol",
- "nu-serde",
- "nu-source",
- "nu-stream",
- "nu-table",
- "nu-test-support",
- "nu-value-ext",
- "num-bigint 0.4.3",
- "num-format",
- "num-traits",
- "parking_lot",
- "polars",
- "quick-xml 0.22.0",
- "quickcheck",
- "quickcheck_macros",
- "rand 0.8.4",
- "regex",
- "reqwest",
- "roxmltree",
- "rust-embed",
- "rustyline",
- "serde",
- "serde_ini",
- "serde_json",
- "serde_urlencoded",
- "serde_yaml",
- "sha2",
- "shadow-rs",
- "strip-ansi-escapes",
- "sysinfo",
- "term",
- "term_size",
- "thiserror",
- "titlecase",
- "tokio",
- "toml",
- "trash",
- "umask",
- "unicode-segmentation",
- "url",
- "users",
- "uuid",
- "which",
- "zip",
-]
-
-[[package]]
-name = "nu-completion"
-version = "0.43.0"
-dependencies = [
- "indexmap",
- "is_executable",
- "nu-data",
- "nu-engine",
- "nu-parser",
- "nu-path",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "parking_lot",
-]
-
-[[package]]
-name = "nu-data"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "byte-unit",
- "chrono",
- "common-path",
- "derive-new",
- "directories-next",
- "getset",
- "indexmap",
- "log",
- "nu-ansi-term",
- "nu-errors",
- "nu-path",
- "nu-protocol",
- "nu-source",
- "nu-table",
- "nu-test-support",
- "nu-value-ext",
- "num-bigint 0.4.3",
- "num-format",
- "num-traits",
- "serde",
- "sha2",
- "sys-locale",
- "toml",
-]
-
-[[package]]
-name = "nu-engine"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "bytes 1.1.0",
- "chrono",
- "codespan-reporting",
- "derive-new",
- "dirs-next",
- "encoding_rs",
- "filesize",
- "fs_extra",
- "getset",
- "glob",
- "hamcrest2",
- "indexmap",
- "itertools",
- "lazy_static",
- "log",
- "nu-ansi-term",
- "nu-data",
- "nu-errors",
- "nu-parser",
- "nu-path",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "nu-stream",
- "nu-test-support",
- "nu-value-ext",
- "num-bigint 0.4.3",
- "parking_lot",
- "rayon",
- "serde",
- "serde_json",
- "tempfile",
- "term_size",
- "termcolor",
- "trash",
- "umask",
- "users",
- "which",
-]
-
-[[package]]
-name = "nu-errors"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "codespan-reporting",
- "derive-new",
- "getset",
- "glob",
- "nu-ansi-term",
- "nu-source",
- "num-bigint 0.4.3",
- "num-traits",
- "serde",
- "serde_json",
- "serde_yaml",
- "toml",
-]
-
-[[package]]
-name = "nu-json"
-version = "0.43.0"
-dependencies = [
- "lazy_static",
- "linked-hash-map",
- "nu-path",
- "nu-test-support",
- "num-traits",
- "regex",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "nu-parser"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "derive-new",
- "indexmap",
- "itertools",
- "log",
- "nu-data",
- "nu-errors",
- "nu-path",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "num-bigint 0.4.3",
- "smart-default",
-]
-
-[[package]]
-name = "nu-path"
-version = "0.43.0"
-dependencies = [
- "dirs-next",
- "dunce",
-]
-
-[[package]]
-name = "nu-plugin"
-version = "0.43.0"
-dependencies = [
- "indexmap",
- "nu-errors",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "nu-value-ext",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "nu-pretty-hex"
-version = "0.43.0"
-dependencies = [
- "heapless",
- "nu-ansi-term",
- "rand 0.8.4",
-]
-
-[[package]]
-name = "nu-protocol"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "byte-unit",
- "chrono",
- "chrono-humanize",
- "derive-new",
- "getset",
- "indexmap",
- "log",
- "nu-errors",
- "nu-source",
- "num-bigint 0.4.3",
- "num-integer",
- "num-traits",
- "polars",
- "serde",
- "serde_bytes",
-]
-
-[[package]]
-name = "nu-serde"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "insta",
- "nu-protocol",
- "nu-source",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "nu-source"
-version = "0.43.0"
-dependencies = [
- "derive-new",
- "getset",
- "pretty",
- "serde",
- "termcolor",
-]
-
-[[package]]
-name = "nu-stream"
-version = "0.43.0"
-dependencies = [
- "nu-errors",
- "nu-protocol",
- "nu-source",
-]
-
-[[package]]
-name = "nu-table"
-version = "0.43.0"
-dependencies = [
- "atty",
- "nu-ansi-term",
- "regex",
- "strip-ansi-escapes",
- "unicode-width",
-]
-
-[[package]]
-name = "nu-test-support"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "chrono",
- "getset",
- "glob",
- "hamcrest2",
- "indexmap",
- "nu-errors",
- "nu-path",
- "nu-protocol",
- "nu-source",
- "num-bigint 0.4.3",
- "tempfile",
-]
-
-[[package]]
-name = "nu-value-ext"
-version = "0.43.0"
-dependencies = [
- "indexmap",
- "itertools",
- "nu-errors",
- "nu-protocol",
- "nu-source",
- "num-traits",
-]
-
-[[package]]
-name = "nu_plugin_binaryview"
-version = "0.43.0"
-dependencies = [
- "crossterm",
- "image",
- "neso",
- "nu-ansi-term",
- "nu-errors",
- "nu-plugin",
- "nu-pretty-hex",
- "nu-protocol",
- "nu-source",
- "rawkey",
-]
-
-[[package]]
-name = "nu_plugin_chart"
-version = "0.43.0"
-dependencies = [
- "crossterm",
- "nu-data",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "nu-value-ext",
- "tui",
-]
-
-[[package]]
-name = "nu_plugin_from_bson"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "bson",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
-]
-
-[[package]]
-name = "nu_plugin_from_mp4"
-version = "0.43.0"
-dependencies = [
- "mp4",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "tempfile",
-]
-
-[[package]]
-name = "nu_plugin_from_sqlite"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "rusqlite",
- "tempfile",
-]
-
-[[package]]
-name = "nu_plugin_inc"
-version = "0.43.0"
-dependencies = [
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "nu-value-ext",
- "semver 0.11.0",
-]
-
-[[package]]
-name = "nu_plugin_match"
-version = "0.43.0"
-dependencies = [
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "regex",
-]
-
-[[package]]
-name = "nu_plugin_query_json"
-version = "0.43.0"
-dependencies = [
- "gjson",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
-]
-
-[[package]]
-name = "nu_plugin_s3"
-version = "0.43.0"
-dependencies = [
- "futures 0.3.18",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "s3handler",
-]
-
-[[package]]
-name = "nu_plugin_selector"
-version = "0.43.0"
-dependencies = [
- "indexmap",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "scraper",
-]
-
-[[package]]
-name = "nu_plugin_start"
-version = "0.43.0"
-dependencies = [
- "glob",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "open",
- "url",
- "webbrowser",
-]
-
-[[package]]
-name = "nu_plugin_textview"
-version = "0.43.0"
-dependencies = [
- "bat",
- "nu-data",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "term_size",
- "url",
-]
-
-[[package]]
-name = "nu_plugin_to_bson"
-version = "0.43.0"
-dependencies = [
- "bson",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "num-traits",
-]
-
-[[package]]
-name = "nu_plugin_to_sqlite"
-version = "0.43.0"
-dependencies = [
- "hex",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "rusqlite",
- "tempfile",
-]
-
-[[package]]
-name = "nu_plugin_tree"
-version = "0.43.0"
-dependencies = [
- "derive-new",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "ptree",
-]
-
-[[package]]
-name = "nu_plugin_xpath"
-version = "0.43.0"
-dependencies = [
- "bigdecimal",
- "indexmap",
- "nu-errors",
- "nu-plugin",
- "nu-protocol",
- "nu-source",
- "nu-test-support",
- "sxd-document",
- "sxd-xpath",
-]
-
-[[package]]
-name = "num"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
-dependencies = [
- "num-bigint 0.2.6",
- "num-complex 0.2.4",
- "num-integer",
- "num-iter",
- "num-rational 0.2.4",
- "num-traits",
-]
-
-[[package]]
-name = "num"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
-dependencies = [
- "num-bigint 0.4.3",
- "num-complex 0.4.0",
- "num-integer",
- "num-iter",
- "num-rational 0.4.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-format"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465"
-dependencies = [
- "arrayvec 0.4.12",
- "itoa",
- "num-bigint 0.2.6",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
-dependencies = [
- "autocfg",
- "num-bigint 0.2.6",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-bigint 0.3.3",
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
-dependencies = [
- "autocfg",
- "num-bigint 0.4.3",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
-[[package]]
-name = "object"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
-
-[[package]]
-name = "onig"
-version = "6.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225"
-dependencies = [
- "bitflags",
- "lazy_static",
- "libc",
- "onig_sys",
-]
-
-[[package]]
-name = "onig_sys"
-version = "69.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd3eee045c84695b53b20255bb7317063df090b68e18bfac0abb6c39cf7f33e"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "open"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcea7a30d6b81a2423cc59c43554880feff7b57d12916f231a79f8d6d9470201"
-dependencies = [
- "pathdiff",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "parquet-format-async-temp"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03abc2f9c83fe9ceec83f47c76cc071bfd56caba33794340330f35623ab1f544"
-dependencies = [
- "async-trait",
- "byteorder",
- "futures 0.3.18",
- "integer-encoding",
- "ordered-float",
-]
-
-[[package]]
-name = "parquet2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db82df54cdd88931d29b850190915b9069bb93fba8e1aefc0d59d8ca81603d6d"
-dependencies = [
- "async-stream",
- "bitpacking",
- "brotli",
- "flate2",
- "futures 0.3.18",
- "lz4",
- "parquet-format-async-temp",
- "snap",
- "streaming-decompression",
- "zstd",
-]
-
-[[package]]
-name = "parse-zoneinfo"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41"
-dependencies = [
- "regex",
-]
-
-[[package]]
-name = "path_abs"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ef02f6342ac01d8a93b65f96db53fe68a92a15f41144f97fb00a9e669633c3"
-dependencies = [
- "std_prelude",
-]
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "peresil"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658886ed52e196e850cfbbfddab9eaa7f6d90dd0929e264c31e5cec07e09e57"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_macros",
- "phf_shared",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
-
-[[package]]
-name = "plist"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"
-dependencies = [
- "base64",
- "indexmap",
- "line-wrap",
- "serde",
- "time 0.3.5",
- "xml-rs",
-]
-
-[[package]]
-name = "png"
-version = "0.16.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
-dependencies = [
- "bitflags",
- "crc32fast",
- "deflate",
- "miniz_oxide 0.3.7",
-]
-
-[[package]]
-name = "polars"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c94a25d46e93b64eac7848c028a545dc08fa01e148e4942c5442b3843c3a598"
-dependencies = [
- "polars-core",
- "polars-io",
- "polars-lazy",
-]
-
-[[package]]
-name = "polars-arrow"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc4488d2f2d6b901bb6e5728e58966013a272cae48861070b676215a79b4a99"
-dependencies = [
- "arrow2",
- "num 0.4.0",
- "thiserror",
-]
-
-[[package]]
-name = "polars-core"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6771524063d742a08163d96875ca5df71dff7113f27da58db5ec5fa164165bf6"
-dependencies = [
- "ahash",
- "anyhow",
- "arrow2",
- "chrono",
- "comfy-table",
- "hashbrown",
- "itertools",
- "lazy_static",
- "num 0.4.0",
- "num_cpus",
- "polars-arrow",
- "rand 0.7.3",
- "rand_distr",
- "rayon",
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "unsafe_unwrap",
-]
-
-[[package]]
-name = "polars-io"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a5f5f51525043ee7befd49e586e6919345237826a5f17b53956f8242100957"
-dependencies = [
- "ahash",
- "anyhow",
- "arrow2",
- "csv-core",
- "dirs",
- "lazy_static",
- "lexical",
- "memchr",
- "memmap2",
- "num 0.4.0",
- "num_cpus",
- "polars-arrow",
- "polars-core",
- "rayon",
- "regex",
- "simdutf8",
-]
-
-[[package]]
-name = "polars-lazy"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da3ea647e2fa59d1bbbf90929c5d10ef6a9018aac256d1c6d0e8248211804b61"
-dependencies = [
- "ahash",
- "itertools",
- "polars-arrow",
- "polars-core",
- "polars-io",
- "rayon",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "pretty"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3"
-dependencies = [
- "typed-arena",
-]
-
-[[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
-dependencies = [
- "env_logger 0.7.1",
- "log",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "ptree"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0de80796b316aec75344095a6d2ef68ec9b8f573b9e7adc821149ba3598e270"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-xml"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d72d5477478f85bd00b6521780dfba1ec6cdaadcf90b8b181c36d7de561f9b"
-dependencies = [
- "encoding_rs",
- "memchr",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quickcheck"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
-dependencies = [
- "env_logger 0.8.4",
- "log",
- "rand 0.8.4",
-]
-
-[[package]]
-name = "quickcheck_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radix_trie"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "rand_pcg",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
- "rand_hc 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom 0.2.3",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rawkey"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ad6efac35ef044d565b23f0d111d76aa21ab2e86934b1225f7071d42e58ebad"
-dependencies = [
- "readkey",
- "user32-sys",
- "winapi 0.3.9",
- "x11",
-]
-
-[[package]]
-name = "rayon"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "readkey"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d401b6d6a1725a59f1b4e813275d289dff3ad09c72b373a10a7a8217ba3146"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
-dependencies = [
- "getrandom 0.2.3",
- "redox_syscall",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5"
-dependencies = [
- "base64",
- "bytes 1.1.0",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log",
- "mime",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "result"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560"
-
-[[package]]
-name = "roxmltree"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b"
-dependencies = [
- "xmlparser",
-]
-
-[[package]]
-name = "rstest"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "041bb0202c14f6a158bbbf086afb03d0c6e975c2dec7d4912f8061ed44f290af"
-dependencies = [
- "cfg-if 1.0.0",
- "proc-macro2",
- "quote",
- "rustc_version 0.3.3",
- "syn",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7"
-dependencies = [
- "bitflags",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "memchr",
- "smallvec",
-]
-
-[[package]]
-name = "rust-embed"
-version = "5.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523"
-dependencies = [
- "rust-embed-impl",
- "rust-embed-utils",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-impl"
-version = "5.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66"
-dependencies = [
- "proc-macro2",
- "quote",
- "rust-embed-utils",
- "syn",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-utils"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d"
-dependencies = [
- "walkdir",
-]
-
-[[package]]
-name = "rust_decimal"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a93c95e3d5c1d997e6e4ba9bda898f4e1d73934cd05510c972f10087d0ef00c1"
-dependencies = [
- "byteorder",
- "lazy_static",
- "num 0.2.1",
- "serde",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.4",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088"
-
-[[package]]
-name = "rustyline"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790487c3881a63489ae77126f57048b42d62d3b2bafbf37453ea19eedb6340d6"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "clipboard-win",
- "dirs-next",
- "fd-lock",
- "libc",
- "log",
- "memchr",
- "nix",
- "radix_trie",
- "scopeguard",
- "smallvec",
- "unicode-segmentation",
- "unicode-width",
- "utf8parse",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
-
-[[package]]
-name = "s3handler"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b9590f1cae0b8b38aceabab05885c754416b6d33089c244a25441ae997fdb1"
-dependencies = [
- "async-trait",
- "base64",
- "bytes 1.1.0",
- "chrono",
- "dyn-clone",
- "failure",
- "failure_derive",
- "futures 0.3.18",
- "hex",
- "hmac",
- "hmac-sha1",
- "log",
- "md5",
- "mime_guess",
- "quick-xml 0.22.0",
- "regex",
- "reqwest",
- "rustc-serialize",
- "serde",
- "serde_derive",
- "serde_json",
- "sha2",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scraper"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e02aa790c80c2e494130dec6a522033b6a23603ffc06360e9fe6c611ea2c12"
-dependencies = [
- "cssparser",
- "ego-tree",
- "getopts",
- "html5ever",
- "matches",
- "selectors",
- "smallvec",
- "tendril",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "selectors"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
-dependencies = [
- "bitflags",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "matches",
- "phf",
- "phf_codegen",
- "precomputed-hash",
- "servo_arc",
- "smallvec",
- "thin-slice",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_ini"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb236687e2bb073a7521c021949be944641e671b8505a94069ca37b656c81139"
-dependencies = [
- "result",
- "serde",
- "void",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_test"
-version = "1.0.130"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82178225dbdeae2d5d190e8649287db6a3a32c6d24da22ae3146325aa353e4c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af"
-dependencies = [
- "dtoa",
- "indexmap",
- "serde",
- "yaml-rust",
-]
-
-[[package]]
-name = "serial_test"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"
-dependencies = [
- "lazy_static",
- "parking_lot",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "sha1"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
-
-[[package]]
-name = "sha2"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
-dependencies = [
- "block-buffer",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
- "opaque-debug",
-]
-
-[[package]]
-name = "shadow-rs"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8935e920eb80ff8f5a5bced990325d12f6cc1015154a3852c6a23cf5bd71c447"
-dependencies = [
- "chrono",
- "git2",
- "is_debug",
-]
-
-[[package]]
-name = "shell-escape"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
-
-[[package]]
-name = "shell-words"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074"
-
-[[package]]
-name = "signal-hook"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
-dependencies = [
- "libc",
- "mio",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simdutf8"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559"
-
-[[package]]
-name = "similar"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
-
-[[package]]
-name = "siphasher"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
-
-[[package]]
-name = "slab"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
-
-[[package]]
-name = "smallvec"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
-
-[[package]]
-name = "smart-default"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "snap"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
-
-[[package]]
-name = "socket2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "std_prelude"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8207e78455ffdf55661170876f88daf85356e4edd54e0a3dbc79586ca1e50cbe"
-
-[[package]]
-name = "str-buf"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44a3643b4ff9caf57abcee9c2c621d6c03d9135e0d8b589bd9afb5992cb176a"
-
-[[package]]
-name = "streaming-decompression"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bc687acd5dc742c4a7094f2927a8614a68e4743ef682e7a2f9f0f711656cc92"
-dependencies = [
- "fallible-streaming-iterator",
-]
-
-[[package]]
-name = "streaming-iterator"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "303235c177994a476226b80d076bd333b7b560fb05bd242a10609d11b07f81f5"
-
-[[package]]
-name = "strength_reduce"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ff2f71c82567c565ba4b3009a9350a96a7269eaa4001ebedae926230bc2254"
-
-[[package]]
-name = "string_cache"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
-dependencies = [
- "lazy_static",
- "new_debug_unreachable",
- "parking_lot",
- "phf_shared",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "strip-ansi-escapes"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8"
-dependencies = [
- "vte",
-]
-
-[[package]]
-name = "strum"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
-
-[[package]]
-name = "strum_macros"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "sxd-document"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d82f37be9faf1b10a82c4bd492b74f698e40082f0f40de38ab275f31d42078"
-dependencies = [
- "peresil",
- "typed-arena",
-]
-
-[[package]]
-name = "sxd-xpath"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36e39da5d30887b5690e29de4c5ebb8ddff64ebd9933f98a01daaa4fd11b36ea"
-dependencies = [
- "peresil",
- "quick-error",
- "sxd-document",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "syntect"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031"
-dependencies = [
- "bincode",
- "bitflags",
- "flate2",
- "fnv",
- "lazy_static",
- "lazycell",
- "onig",
- "plist",
- "regex-syntax",
- "serde",
- "serde_derive",
- "serde_json",
- "walkdir",
- "yaml-rust",
-]
-
-[[package]]
-name = "sys-info"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "sys-locale"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91f89ebb59fa30d4f65fafc2d68e94f6975256fd87e812dd99cb6e020c8563df"
-dependencies = [
- "cc",
- "cstr_core",
- "libc",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e757000a4bed2b1be9be65a3f418b9696adf30bb419214c73997422de73a591"
-dependencies = [
- "cfg-if 1.0.0",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "rand 0.8.4",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "term_size"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "thin-slice"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
-
-[[package]]
-name = "thiserror"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
-dependencies = [
- "itoa",
- "libc",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "titlecase"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f565e410cfc24c2f2a89960b023ca192689d7f77d3f8d4f4af50c2d8affe1117"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
-[[package]]
-name = "tokio"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
-dependencies = [
- "autocfg",
- "bytes 1.1.0",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "pin-project-lite",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
-dependencies = [
- "bytes 1.1.0",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "trash"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3ebb6cb2db7947ab9f65dec9f7c5dbe01042b708f564242dcfb6d5cb2957cbc"
-dependencies = [
- "chrono",
- "libc",
- "log",
- "objc",
- "scopeguard",
- "url",
- "windows",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "tui"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71"
-dependencies = [
- "bitflags",
- "cassowary",
- "crossterm",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "typed-arena"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
-
-[[package]]
-name = "typenum"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "umask"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982efbf70ec4d28f7862062c03dd1a4def601a5079e0faf1edc55f2ad0f6fe46"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "unsafe_unwrap"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1230ec65f13e0f9b28d789da20d2d419511893ea9dac2c1f4ef67b8b14e5da80"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "user32-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "users"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
-dependencies = [
- "libc",
- "log",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8-width"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom 0.2.3",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
-[[package]]
-name = "vte"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
-dependencies = [
- "arrayvec 0.5.2",
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte_generate_state_changes"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
-
-[[package]]
-name = "web-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webbrowser"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecad156490d6b620308ed411cfee90d280b3cbd13e189ea0d3fada8acc89158a"
-dependencies = [
- "web-sys",
- "widestring",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "which"
-version = "4.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
-dependencies = [
- "either",
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "widestring"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "361f3533a83ee1a28c9be59683f40043db02dbedf6479ce8795657386195c97f"
-dependencies = [
- "const-sha1",
- "windows_gen",
- "windows_macros",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6"
-dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"
-
-[[package]]
-name = "windows_gen"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54154dbc515d58723f6b6053c12f1065da7389f733660581b2391bd1af480452"
-dependencies = [
- "syn",
-]
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"
-
-[[package]]
-name = "windows_macros"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f7794c652845dc466cb8dc1b86c08345707c8144bc53e9086430047c7d33b76"
-dependencies = [
- "syn",
- "windows_gen",
-]
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"
-
-[[package]]
-name = "winreg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "x11"
-version = "2.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd0565fa8bfba8c5efe02725b14dff114c866724eff2cfd44d76cea74bcd87a"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
-
-[[package]]
-name = "xmlparser"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "zip"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
-dependencies = [
- "byteorder",
- "bzip2",
- "crc32fast",
- "flate2",
- "thiserror",
- "time 0.1.44",
-]
-
-[[package]]
-name = "zstd"
-version = "0.9.0+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "4.1.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "1.6.1+zstd.1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/old_nushell/Cargo_old.toml b/old_nushell/Cargo_old.toml
deleted file mode 100644
index a83162319..000000000
--- a/old_nushell/Cargo_old.toml
+++ /dev/null
@@ -1,229 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-default-run = "nu"
-description = "A new type of shell"
-documentation = "https://www.nushell.sh/book/"
-edition = "2018"
-exclude = ["images"]
-homepage = "https://www.nushell.sh"
-license = "MIT"
-name = "nu"
-readme = "README.md"
-repository = "https://github.com/nushell/nushell"
-version = "0.43.0"
-
-[workspace]
-members = ["crates/*/"]
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-nu-cli = { version = "0.43.0", path="./crates/nu-cli", default-features=false }
-nu-command = { version = "0.43.0", path="./crates/nu-command" }
-nu-completion = { version = "0.43.0", path="./crates/nu-completion" }
-nu-data = { version = "0.43.0", path="./crates/nu-data" }
-nu-engine = { version = "0.43.0", path="./crates/nu-engine" }
-nu-errors = { version = "0.43.0", path="./crates/nu-errors" }
-nu-parser = { version = "0.43.0", path="./crates/nu-parser" }
-nu-path = { version = "0.43.0", path="./crates/nu-path" }
-nu-plugin = { version = "0.43.0", path="./crates/nu-plugin" }
-nu-protocol = { version = "0.43.0", path="./crates/nu-protocol" }
-nu-source = { version = "0.43.0", path="./crates/nu-source" }
-nu-value-ext = { version = "0.43.0", path="./crates/nu-value-ext" }
-
-nu_plugin_binaryview = { version = "0.43.0", path="./crates/nu_plugin_binaryview", optional=true }
-nu_plugin_chart = { version = "0.43.0", path="./crates/nu_plugin_chart", optional=true }
-nu_plugin_from_bson = { version = "0.43.0", path="./crates/nu_plugin_from_bson", optional=true }
-nu_plugin_from_sqlite = { version = "0.43.0", path="./crates/nu_plugin_from_sqlite", optional=true }
-nu_plugin_inc = { version = "0.43.0", path="./crates/nu_plugin_inc", optional=true }
-nu_plugin_match = { version = "0.43.0", path="./crates/nu_plugin_match", optional=true }
-nu_plugin_query_json = { version = "0.43.0", path="./crates/nu_plugin_query_json", optional=true }
-nu_plugin_s3 = { version = "0.43.0", path="./crates/nu_plugin_s3", optional=true }
-nu_plugin_selector = { version = "0.43.0", path="./crates/nu_plugin_selector", optional=true }
-nu_plugin_start = { version = "0.43.0", path="./crates/nu_plugin_start", optional=true }
-nu_plugin_textview = { version = "0.43.0", path="./crates/nu_plugin_textview", optional=true }
-nu_plugin_to_bson = { version = "0.43.0", path="./crates/nu_plugin_to_bson", optional=true }
-nu_plugin_to_sqlite = { version = "0.43.0", path="./crates/nu_plugin_to_sqlite", optional=true }
-nu_plugin_tree = { version = "0.43.0", path="./crates/nu_plugin_tree", optional=true }
-nu_plugin_xpath = { version = "0.43.0", path="./crates/nu_plugin_xpath", optional=true }
-
-# Required to bootstrap the main binary
-ctrlc = { version="3.1.7", optional=true }
-futures = { version="0.3.12", features=["compat", "io-compat"] }
-itertools = "0.10.0"
-
-[dev-dependencies]
-nu-test-support = { version = "0.43.0", path="./crates/nu-test-support" }
-serial_test = "0.5.1"
-hamcrest2 = "0.3.0"
-rstest = "0.10.0"
-
-[build-dependencies]
-
-[features]
-fetch-support = ["nu-command/fetch", "nu-command/post"]
-sys-support = ["nu-command/sys", "nu-command/ps"]
-ctrlc-support = ["nu-cli/ctrlc", "nu-command/ctrlc"]
-rustyline-support = ["nu-cli/rustyline-support", "nu-command/rustyline-support"]
-term-support = ["nu-command/term"]
-uuid-support = ["nu-command/uuid_crate"]
-which-support = ["nu-command/which", "nu-engine/which"]
-
-default = [
-    "nu-cli/shadow-rs",
-    "sys-support",
-    "ctrlc-support",
-    "which-support",
-    "term-support",
-    "rustyline-support",
-    "match",
-    "fetch-support",
-    "zip-support",
-    "dataframe",
-]
-
-stable = ["default"]
-extra = [
-    "default",
-    "binaryview",
-    "inc",
-    "tree",
-    "textview",
-    "trash-support",
-    "uuid-support",
-    "start",
-    "bson",
-    "sqlite",
-    "s3",
-    "chart",
-    "xpath",
-    "selector",
-    "query-json",
-]
-
-wasi = ["inc", "match", "match", "tree", "rustyline-support"]
-
-# Stable (Default)
-inc = ["nu_plugin_inc"]
-match = ["nu_plugin_match"]
-textview = ["nu_plugin_textview"]
-
-# Extra
-binaryview = ["nu_plugin_binaryview"]
-bson = ["nu_plugin_from_bson", "nu_plugin_to_bson"]
-chart = ["nu_plugin_chart"]
-query-json = ["nu_plugin_query_json"]
-s3 = ["nu_plugin_s3"]
-selector = ["nu_plugin_selector"]
-sqlite = ["nu_plugin_from_sqlite", "nu_plugin_to_sqlite"]
-start = ["nu_plugin_start"]
-trash-support = [
-    "nu-command/trash-support",
-    "nu-engine/trash-support",
-]
-tree = ["nu_plugin_tree"]
-xpath = ["nu_plugin_xpath"]
-zip-support = ["nu-command/zip"]
-
-#dataframe feature for nushell
-dataframe = [
-    "nu-engine/dataframe",
-    "nu-protocol/dataframe",
-    "nu-command/dataframe",
-    "nu-value-ext/dataframe",
-    "nu-data/dataframe",
-    "nu_plugin_to_bson/dataframe",
-]
-
-[profile.release]
-opt-level = "s"  # Optimize for size.
-
-# Core plugins that ship with `cargo install nu` by default
-# Currently, Cargo limits us to installing only one binary
-# unless we use [[bin]], so we use this as a workaround
-[[bin]]
-name = "nu_plugin_core_textview"
-path = "src/plugins/nu_plugin_core_textview.rs"
-required-features = ["textview"]
-
-[[bin]]
-name = "nu_plugin_core_inc"
-path = "src/plugins/nu_plugin_core_inc.rs"
-required-features = ["inc"]
-
-[[bin]]
-name = "nu_plugin_core_match"
-path = "src/plugins/nu_plugin_core_match.rs"
-required-features = ["match"]
-
-# Extra plugins
-
-[[bin]]
-name = "nu_plugin_extra_binaryview"
-path = "src/plugins/nu_plugin_extra_binaryview.rs"
-required-features = ["binaryview"]
-
-[[bin]]
-name = "nu_plugin_extra_tree"
-path = "src/plugins/nu_plugin_extra_tree.rs"
-required-features = ["tree"]
-
-[[bin]]
-name = "nu_plugin_extra_query_json"
-path = "src/plugins/nu_plugin_extra_query_json.rs"
-required-features = ["query-json"]
-
-[[bin]]
-name = "nu_plugin_extra_start"
-path = "src/plugins/nu_plugin_extra_start.rs"
-required-features = ["start"]
-
-[[bin]]
-name = "nu_plugin_extra_s3"
-path = "src/plugins/nu_plugin_extra_s3.rs"
-required-features = ["s3"]
-
-[[bin]]
-name = "nu_plugin_extra_chart_bar"
-path = "src/plugins/nu_plugin_extra_chart_bar.rs"
-required-features = ["chart"]
-
-[[bin]]
-name = "nu_plugin_extra_chart_line"
-path = "src/plugins/nu_plugin_extra_chart_line.rs"
-required-features = ["chart"]
-
-[[bin]]
-name = "nu_plugin_extra_xpath"
-path = "src/plugins/nu_plugin_extra_xpath.rs"
-required-features = ["xpath"]
-
-[[bin]]
-name = "nu_plugin_extra_selector"
-path = "src/plugins/nu_plugin_extra_selector.rs"
-required-features = ["selector"]
-
-[[bin]]
-name = "nu_plugin_extra_from_bson"
-path = "src/plugins/nu_plugin_extra_from_bson.rs"
-required-features = ["bson"]
-
-[[bin]]
-name = "nu_plugin_extra_to_bson"
-path = "src/plugins/nu_plugin_extra_to_bson.rs"
-required-features = ["bson"]
-
-[[bin]]
-name = "nu_plugin_extra_from_sqlite"
-path = "src/plugins/nu_plugin_extra_from_sqlite.rs"
-required-features = ["sqlite"]
-
-[[bin]]
-name = "nu_plugin_extra_to_sqlite"
-path = "src/plugins/nu_plugin_extra_to_sqlite.rs"
-required-features = ["sqlite"]
-
-# Main nu binary
-[[bin]]
-name = "nu"
-path = "src/main.rs"
diff --git a/old_nushell/README.md b/old_nushell/README.md
deleted file mode 100644
index ea2da1fb1..000000000
--- a/old_nushell/README.md
+++ /dev/null
@@ -1,283 +0,0 @@
-# README
-
-[![Crates.io](https://img.shields.io/crates/v/nu.svg)](https://crates.io/crates/nu)
-[![Build Status](https://dev.azure.com/nushell/nushell/_apis/build/status/nushell.nushell?branchName=main)](https://dev.azure.com/nushell/nushell/_build/latest?definitionId=2&branchName=main)
-[![Discord](https://img.shields.io/discord/601130461678272522.svg?logo=discord)](https://discord.gg/NtAbbGn)
-[![The Changelog #363](https://img.shields.io/badge/The%20Changelog-%23363-61c192.svg)](https://changelog.com/podcast/363)
-[![@nu_shell](https://img.shields.io/badge/twitter-@nu_shell-1DA1F3?style=flat-square)](https://twitter.com/nu_shell)
-![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nushell/nushell)
-![GitHub contributors](https://img.shields.io/github/contributors/nushell/nushell)
-
-## Nushell
-
-A new type of shell.
-
-![Example of nushell](images/nushell-autocomplete5.gif "Example of nushell")
-
-## Status
-
-This project has reached a minimum-viable product level of quality.
-While contributors dogfood it as their daily driver, it may be unstable for some commands.
-Future releases will work to fill out missing features and improve stability.
-Its design is also subject to change as it matures.
-
-Nu comes with a set of built-in commands (listed below).
-If a command is unknown, the command will shell-out and execute it (using cmd on Windows or bash on Linux and macOS), correctly passing through stdin, stdout, and stderr, so things like your daily git workflows and even `vim` will work just fine.
-
-## Learning more
-
-There are a few good resources to learn about Nu.
-There is a [book](https://www.nushell.sh/book/) about Nu that is currently in progress.
-The book focuses on using Nu and its core concepts.
-
-If you're a developer who would like to contribute to Nu, we're also working on a [book for developers](https://www.nushell.sh/contributor-book/) to help you get started.
-There are also [good first issues](https://github.com/nushell/nushell/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) to help you dive in.
-
-We also have an active [Discord](https://discord.gg/NtAbbGn) and [Twitter](https://twitter.com/nu_shell) if you'd like to come and chat with us.
-
-You can also find information on more specific topics in our [cookbook](https://www.nushell.sh/cookbook/).
-
-## Installation
-
-### Local
-
-Up-to-date installation instructions can be found in the [installation chapter of the book](https://www.nushell.sh/book/installation.html). **Windows users**: please note that Nu works on Windows 10 and does not currently have Windows 7/8.1 support.
-
-To build Nu, you will need to use the **latest stable (1.51 or later)** version of the compiler.
-
-Required dependencies:
-
--   pkg-config and libssl (only needed on Linux)
-    -   On Debian/Ubuntu: `apt install pkg-config libssl-dev`
-
-Optional dependencies:
-
--   To use Nu with all possible optional features enabled, you'll also need the following:
-    -   On Linux (on Debian/Ubuntu): `apt install libxcb-composite0-dev libx11-dev`
-
-To install Nu via cargo (make sure you have installed [rustup](https://rustup.rs/) and the latest stable compiler via `rustup install stable`):
-
-```shell
-cargo install nu
-```
-
-To install Nu via the [Windows Package Manager](https://aka.ms/winget-cli):
-
-```shell
-winget install nushell
-```
-
-You can also build Nu yourself with all the bells and whistles (be sure to have installed the [dependencies](https://www.nushell.sh/book/installation.html#dependencies) for your platform), once you have checked out this repo with git:
-
-```shell
-cargo build --workspace --features=extra
-```
-### Packaging status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/nushell.svg)](https://repology.org/project/nushell/versions)
-
-#### Fedora
-
-[COPR repo](https://copr.fedorainfracloud.org/coprs/atim/nushell/): `sudo dnf copr enable atim/nushell -y && sudo dnf install nushell -y`
-
-## Philosophy
-
-Nu draws inspiration from projects like PowerShell, functional programming languages, and modern CLI tools.
-Rather than thinking of files and services as raw streams of text, Nu looks at each input as something with structure.
-For example, when you list the contents of a directory, what you get back is a table of rows, where each row represents an item in that directory.
-These values can be piped through a series of steps, in a series of commands called a 'pipeline'.
-
-### Pipelines
-
-In Unix, it's common to pipe between commands to split up a sophisticated command over multiple steps.
-Nu takes this a step further and builds heavily on the idea of _pipelines_.
-Just as the Unix philosophy, Nu allows commands to output to stdout and read from stdin.
-Additionally, commands can output structured data (you can think of this as a third kind of stream).
-Commands that work in the pipeline fit into one of three categories:
-
--   Commands that produce a stream (e.g., `ls`)
--   Commands that filter a stream (eg, `where type == "Dir"`)
--   Commands that consume the output of the pipeline (e.g., `autoview`)
-
-Commands are separated by the pipe symbol (`|`) to denote a pipeline flowing left to right.
-
-```shell
-> ls | where type == "Dir" | autoview
-───┬────────┬──────┬───────┬──────────────
- # │ name   │ type │ size  │ modified
-───┼────────┼──────┼───────┼──────────────
- 0 │ assets │ Dir  │ 128 B │ 5 months ago
- 1 │ crates │ Dir  │ 704 B │ 50 mins ago
- 2 │ debian │ Dir  │ 352 B │ 5 months ago
- 3 │ docs   │ Dir  │ 192 B │ 50 mins ago
- 4 │ images │ Dir  │ 160 B │ 5 months ago
- 5 │ src    │ Dir  │ 128 B │ 1 day ago
- 6 │ target │ Dir  │ 160 B │ 5 days ago
- 7 │ tests  │ Dir  │ 192 B │ 3 months ago
-───┴────────┴──────┴───────┴──────────────
-```
-
-Because most of the time you'll want to see the output of a pipeline, `autoview` is assumed.
-We could have also written the above:
-
-```shell
-> ls | where type == Dir
-```
-
-Being able to use the same commands and compose them differently is an important philosophy in Nu.
-For example, we could use the built-in `ps` command to get a list of the running processes, using the same `where` as above.
-
-```shell
-> ps | where cpu > 0
-───┬────────┬───────────────────┬──────────┬─────────┬──────────┬──────────
- # │ pid    │ name              │ status   │ cpu     │ mem      │ virtual
-───┼────────┼───────────────────┼──────────┼─────────┼──────────┼──────────
- 0 │    435 │ irq/142-SYNA327   │ Sleeping │  7.5699 │      0 B │      0 B
- 1 │   1609 │ pulseaudio        │ Sleeping │  6.5605 │  10.6 MB │   2.3 GB
- 2 │   1625 │ gnome-shell       │ Sleeping │  6.5684 │ 639.6 MB │   7.3 GB
- 3 │   2202 │ Web Content       │ Sleeping │  6.8157 │ 320.8 MB │   3.0 GB
- 4 │ 328788 │ nu_plugin_core_ps │ Sleeping │ 92.5750 │   5.9 MB │ 633.2 MB
-───┴────────┴───────────────────┴──────────┴─────────┴──────────┴──────────
-```
-
-### Opening files
-
-Nu can load file and URL contents as raw text or structured data (if it recognizes the format).
-For example, you can load a .toml file as structured data and explore it:
-
-```shell
-> open Cargo.toml
-────────────────────┬───────────────────────────
- bin                │ [table 18 rows]
- build-dependencies │ [row serde toml]
- dependencies       │ [row 29 columns]
- dev-dependencies   │ [row nu-test-support]
- features           │ [row 19 columns]
- package            │ [row 12 columns]
- workspace          │ [row members]
-────────────────────┴───────────────────────────
-```
-
-We can pipeline this into a command that gets the contents of one of the columns:
-
-```shell
-> open Cargo.toml | get package
-───────────────┬────────────────────────────────────
- authors       │ [table 1 rows]
- default-run   │ nu
- description   │ A new type of shell
- documentation │ https://www.nushell.sh/book/
- edition       │ 2018
- exclude       │ [table 1 rows]
- homepage      │ https://www.nushell.sh
- license       │ MIT
- name          │ nu
- readme        │ README.md
- repository    │ https://github.com/nushell/nushell
- version       │ 0.32.0
-───────────────┴────────────────────────────────────
-```
-
-Finally, we can use commands outside of Nu once we have the data we want:
-
-```shell
-> open Cargo.toml | get package.version
-0.32.0
-```
-
-### Configuration
-
-Nu has early support for configuring the shell. You can refer to the book for a list of [all supported variables](https://www.nushell.sh/book/configuration.html).
-
-To set one of these variables, you can use `config set`. For example:
-
-```shell
-> config set line_editor.edit_mode "vi"
-> config set path $nu.path
-```
-
-### Shells
-
-Nu will work inside of a single directory and allow you to navigate around your filesystem by default.
-Nu also offers a way of adding additional working directories that you can jump between, allowing you to work in multiple directories simultaneously.
-
-To do so, use the `enter` command, which will allow you to create a new "shell" and enter it at the specified path.
-You can toggle between this new shell and the original shell with the `p` (for previous) and `n` (for next), allowing you to navigate around a ring buffer of shells.
-Once you're done with a shell, you can `exit` it and remove it from the ring buffer.
-
-Finally, to get a list of all the current shells, you can use the `shells` command.
-
-### Plugins
-
-Nu supports plugins that offer additional functionality to the shell and follow the same structured data model that built-in commands use.
-This allows you to extend nu for your needs.
-
-There are a few examples in the `plugins` directory.
-
-Plugins are binaries that are available in your path and follow a `nu_plugin_*` naming convention.
-These binaries interact with nu via a simple JSON-RPC protocol where the command identifies itself and passes along its configuration, making it available for use.
-If the plugin is a filter, data streams to it one element at a time, and it can stream data back in return via stdin/stdout.
-If the plugin is a sink, it is given the full vector of final data and is given free reign over stdin/stdout to use as it pleases.
-
-## Goals
-
-Nu adheres closely to a set of goals that make up its design philosophy. As features are added, they are checked against these goals.
-
--   First and foremost, Nu is cross-platform. Commands and techniques should carry between platforms and offer consistent first-class support for Windows, macOS, and Linux.
-
--   Nu ensures direct compatibility with existing platform-specific executables that make up people's workflows.
-
--   Nu's workflow and tools should have the usability in day-to-day experience of using a shell in 2019 (and beyond).
-
--   Nu views data as both structured and unstructured. It is a structured shell like PowerShell.
-
--   Finally, Nu views data functionally. Rather than using mutation, pipelines act as a means to load, change, and save data without mutable state.
-
-## Commands
-
-You can find a list of Nu commands, complete with documentation, in [quick command references](https://www.nushell.sh/book/command_reference.html).
-
-## Progress
-
-Nu is in heavy development and will naturally change as it matures and people use it. The chart below isn't meant to be exhaustive, but rather helps give an idea for some of the areas of development and their relative completion:
-
-| Features      | Not started | Prototype | MVP | Preview | Mature | Notes                                                                |
-| ------------- | :---------: | :-------: | :-: | :-----: | :----: | -------------------------------------------------------------------- |
-| Aliases       |             |           |  X  |         |        | Aliases allow for shortening large commands, while passing flags     |
-| Notebook      |             |     X     |     |         |        | Initial jupyter support, but it loses state and lacks features       |
-| File ops      |             |           |  X  |         |        | cp, mv, rm, mkdir have some support, but lacking others              |
-| Environment   |             |           |  X  |         |        | Temporary environment and scoped environment variables               |
-| Shells        |             |     X     |     |         |        | Basic value and file shells, but no opt-in/opt-out for commands      |
-| Protocol      |             |           |  X  |         |        | Streaming protocol is serviceable                                    |
-| Plugins       |             |     X     |     |         |        | Plugins work on one row at a time, lack batching and expression eval |
-| Errors        |             |           |  X  |         |        | Error reporting works, but could use usability polish                |
-| Documentation |             |           |  X  |         |        | Book updated to latest release, including usage examples             |
-| Paging        |             |     X     |     |         |        | Textview has paging, but we'd like paging for tables                 |
-| Functions     |             |           |  X  |         |        | Functions and aliases are supported                                  |
-| Variables     |             |           |  X  |         |        | Nu supports variables and environment variables                      |
-| Completions   |             |           |  X  |         |        | Completions for filepaths                                            |
-| Type-checking |             |           |  X  |         |        | Commands check basic types, but input/output isn't checked           |
-
-## Officially Supported By
-
-Please submit an issue or PR to be added to this list.
-
-###   Integrations
--   [zoxide](https://github.com/ajeetdsouza/zoxide)
--   [starship](https://github.com/starship/starship)
-###   Mentions
--   [The Python Launcher for Unix](https://github.com/brettcannon/python-launcher#how-do-i-get-a-table-of-python-executables-in-nushell)
-
-## Contributing
-
-See [Contributing](CONTRIBUTING.md) for details.
-
-Thanks to all the people who already contributed!
-
-<a href="https://github.com/nushell/nushell/graphs/contributors">
-  <img src="https://contributors-img.web.app/image?repo=nushell/nushell" />
-</a>
-
-## License
-
-The project is made available under the MIT license. See the `LICENSE` file for more information.
diff --git a/old_nushell/crates/README.md b/old_nushell/crates/README.md
deleted file mode 100644
index ca1e44bcc..000000000
--- a/old_nushell/crates/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Nushell core libraries and plugins
-
-These sub-crates form both the foundation for Nu and a set of plugins which extend Nu with additional functionality.
-
-Foundational libraries are split into two kinds of crates:
-
-* Core crates - those crates that work together to build the Nushell language engine
-* Support crates - a set of crates that support the engine with additional features like JSON support, ANSI support, and more.
-
-Plugins are likewise also split into two types:
-
-* Core plugins - plugins that provide part of the default experience of Nu, including access to the system properties, processes, and web-connectivity features.
-* Extra plugins - these plugins run a wide range of different capabilities like working with different file types, charting, viewing binary data, and more.
diff --git a/old_nushell/crates/nu-ansi-term/.gitignore b/old_nushell/crates/nu-ansi-term/.gitignore
deleted file mode 100644
index f2f9e58ec..000000000
--- a/old_nushell/crates/nu-ansi-term/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target
-Cargo.lock
\ No newline at end of file
diff --git a/old_nushell/crates/nu-ansi-term/Cargo.toml b/old_nushell/crates/nu-ansi-term/Cargo.toml
deleted file mode 100644
index 00d744d7a..000000000
--- a/old_nushell/crates/nu-ansi-term/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-authors = [
-    "ogham@bsago.me",
-    "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>",
-    "Josh Triplett <josh@joshtriplett.org>",
-    "The Nu Project Contributors",
-]
-description = "Library for ANSI terminal colors and styles (bold, underline)"
-edition = "2018"
-license = "MIT"
-name = "nu-ansi-term"
-version = "0.43.0"
-
-[lib]
-doctest = false
-# name = "nu-ansi-term"
-
-[features]
-derive_serde_style = ["serde"]
-
-[dependencies]
-overload = "0.1.1"
-serde = { version="1.0.90", features=["derive"], optional=true }
-
-# [dependencies.serde]
-# version = "1.0.90"
-# features = ["derive"]
-# optional = true
-
-[target.'cfg(target_os="windows")'.dependencies.winapi]
-version = "0.3.4"
-features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"]
-
-[dev-dependencies]
-doc-comment = "0.3"
-regex = "1.1.9"
-
-[dev-dependencies.serde_json]
-version = "1.0.39"
diff --git a/old_nushell/crates/nu-ansi-term/LICENCE b/old_nushell/crates/nu-ansi-term/LICENCE
deleted file mode 100644
index 3228cc99b..000000000
--- a/old_nushell/crates/nu-ansi-term/LICENCE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Benjamin Sago
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/old_nushell/crates/nu-ansi-term/README.md b/old_nushell/crates/nu-ansi-term/README.md
deleted file mode 100644
index 8143bb4d3..000000000
--- a/old_nushell/crates/nu-ansi-term/README.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# nu-ansi-term
-
-> This is a copy of rust-ansi-term but with Color change to Color and light foreground colors added (90-97) as well as light background colors added (100-107).
-
-This is a library for controlling colors and formatting, such as red bold text or blue underlined text, on ANSI terminals.
-
-### [View the Rustdoc](https://docs.rs/nu_ansi_term/)
-
-# Installation
-
-This crate works with [Cargo](http://crates.io). Add the following to your `Cargo.toml` dependencies section:
-
-```toml
-[dependencies]
-nu_ansi_term = "0.13"
-```
-
-## Basic usage
-
-There are three main types in this crate that you need to be concerned with: `ANSIString`, `Style`, and `Color`.
-
-A `Style` holds stylistic information: foreground and background colors, whether the text should be bold, or blinking, or other properties.
-The `Color` enum represents the available colors.
-And an `ANSIString` is a string paired with a `Style`.
-
-`Color` is also available as an alias to `Color`.
-
-To format a string, call the `paint` method on a `Style` or a `Color`, passing in the string you want to format as the argument.
-For example, here’s how to get some red text:
-
-```rust
-use nu_ansi_term::Color::Red;
-
-println!("This is in red: {}", Red.paint("a red string"));
-```
-
-It’s important to note that the `paint` method does _not_ actually return a string with the ANSI control characters surrounding it.
-Instead, it returns an `ANSIString` value that has a `Display` implementation that, when formatted, returns the characters.
-This allows strings to be printed with a minimum of `String` allocations being performed behind the scenes.
-
-If you _do_ want to get at the escape codes, then you can convert the `ANSIString` to a string as you would any other `Display` value:
-
-```rust
-use nu_ansi_term::Color::Red;
-
-let red_string = Red.paint("a red string").to_string();
-```
-
-**Note for Windows 10 users:** On Windows 10, the application must enable ANSI support first:
-
-```rust,ignore
-let enabled = nu_ansi_term::enable_ansi_support();
-```
-
-## Bold, underline, background, and other styles
-
-For anything more complex than plain foreground color changes, you need to construct `Style` values themselves, rather than beginning with a `Color`.
-You can do this by chaining methods based on a new `Style`, created with `Style::new()`.
-Each method creates a new style that has that specific property set.
-For example:
-
-```rust
-use nu_ansi_term::Style;
-
-println!("How about some {} and {}?",
-         Style::new().bold().paint("bold"),
-         Style::new().underline().paint("underline"));
-```
-
-For brevity, these methods have also been implemented for `Color` values, so you can give your styles a foreground color without having to begin with an empty `Style` value:
-
-```rust
-use nu_ansi_term::Color::{Blue, Yellow};
-
-println!("Demonstrating {} and {}!",
-         Blue.bold().paint("blue bold"),
-         Yellow.underline().paint("yellow underline"));
-
-println!("Yellow on blue: {}", Yellow.on(Blue).paint("wow!"));
-```
-
-The complete list of styles you can use are:
-`bold`, `dimmed`, `italic`, `underline`, `blink`, `reverse`, `hidden`, and `on` for background colors.
-
-In some cases, you may find it easier to change the foreground on an existing `Style` rather than starting from the appropriate `Color`.
-You can do this using the `fg` method:
-
-```rust
-use nu_ansi_term::Style;
-use nu_ansi_term::Color::{Blue, Cyan, Yellow};
-
-println!("Yellow on blue: {}", Style::new().on(Blue).fg(Yellow).paint("yow!"));
-println!("Also yellow on blue: {}", Cyan.on(Blue).fg(Yellow).paint("zow!"));
-```
-
-You can turn a `Color` into a `Style` with the `normal` method.
-This will produce the exact same `ANSIString` as if you just used the `paint` method on the `Color` directly, but it’s useful in certain cases: for example, you may have a method that returns `Styles`, and need to represent both the “red bold” and “red, but not bold” styles with values of the same type. The `Style` struct also has a `Default` implementation if you want to have a style with _nothing_ set.
-
-```rust
-use nu_ansi_term::Style;
-use nu_ansi_term::Color::Red;
-
-Red.normal().paint("yet another red string");
-Style::default().paint("a completely regular string");
-```
-
-## Extended colors
-
-You can access the extended range of 256 colors by using the `Color::Fixed` variant, which takes an argument of the color number to use.
-This can be included wherever you would use a `Color`:
-
-```rust
-use nu_ansi_term::Color::Fixed;
-
-Fixed(134).paint("A sort of light purple");
-Fixed(221).on(Fixed(124)).paint("Mustard in the ketchup");
-```
-
-The first sixteen of these values are the same as the normal and bold standard color variants.
-There’s nothing stopping you from using these as `Fixed` colors instead, but there’s nothing to be gained by doing so either.
-
-You can also access full 24-bit color by using the `Color::RGB` variant, which takes separate `u8` arguments for red, green, and blue:
-
-```rust
-use nu_ansi_term::Color::RGB;
-
-RGB(70, 130, 180).paint("Steel blue");
-```
-
-## Combining successive coloured strings
-
-The benefit of writing ANSI escape codes to the terminal is that they _stack_: you do not need to end every coloured string with a reset code if the text that follows it is of a similar style.
-For example, if you want to have some blue text followed by some blue bold text, it’s possible to send the ANSI code for blue, followed by the ANSI code for bold, and finishing with a reset code without having to have an extra one between the two strings.
-
-This crate can optimise the ANSI codes that get printed in situations like this, making life easier for your terminal renderer.
-The `ANSIStrings` struct takes a slice of several `ANSIString` values, and will iterate over each of them, printing only the codes for the styles that need to be updated as part of its formatting routine.
-
-The following code snippet uses this to enclose a binary number displayed in red bold text inside some red, but not bold, brackets:
-
-```rust
-use nu_ansi_term::Color::Red;
-use nu_ansi_term::{ANSIString, ANSIStrings};
-
-let some_value = format!("{:b}", 42);
-let strings: &[ANSIString<'static>] = &[
-    Red.paint("["),
-    Red.bold().paint(some_value),
-    Red.paint("]"),
-];
-
-println!("Value: {}", ANSIStrings(strings));
-```
-
-There are several things to note here.
-Firstly, the `paint` method can take _either_ an owned `String` or a borrowed `&str`.
-Internally, an `ANSIString` holds a copy-on-write (`Cow`) string value to deal with both owned and borrowed strings at the same time.
-This is used here to display a `String`, the result of the `format!` call, using the same mechanism as some statically-available `&str` slices.
-Secondly, that the `ANSIStrings` value works in the same way as its singular counterpart, with a `Display` implementation that only performs the formatting when required.
-
-## Byte strings
-
-This library also supports formatting `[u8]` byte strings; this supports applications working with text in an unknown encoding.
-`Style` and `Color` support painting `[u8]` values, resulting in an `ANSIByteString`.
-This type does not implement `Display`, as it may not contain UTF-8, but it does provide a method `write_to` to write the result to any value that implements `Write`:
-
-```rust
-use nu_ansi_term::Color::Green;
-
-Green.paint("user data".as_bytes()).write_to(&mut std::io::stdout()).unwrap();
-```
-
-Similarly, the type `ANSIByteStrings` supports writing a list of `ANSIByteString` values with minimal escape sequences:
-
-```rust
-use nu_ansi_term::Color::Green;
-use nu_ansi_term::ANSIByteStrings;
-
-ANSIByteStrings(&[
-    Green.paint("user data 1\n".as_bytes()),
-    Green.bold().paint("user data 2\n".as_bytes()),
-]).write_to(&mut std::io::stdout()).unwrap();
-```
diff --git a/old_nushell/crates/nu-ansi-term/examples/256_colors.rs b/old_nushell/crates/nu-ansi-term/examples/256_colors.rs
deleted file mode 100644
index 4766dcdb6..000000000
--- a/old_nushell/crates/nu-ansi-term/examples/256_colors.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-extern crate nu_ansi_term;
-use nu_ansi_term::Color;
-
-// This example prints out the 256 colors.
-// They're arranged like this:
-//
-// - 0 to 8 are the eight standard colors.
-// - 9 to 15 are the eight bold colors.
-// - 16 to 231 are six blocks of six-by-six color squares.
-// - 232 to 255 are shades of grey.
-
-fn main() {
-    // First two lines
-    for c in 0..8 {
-        glow(c, c != 0);
-        print!(" ");
-    }
-    println!();
-    for c in 8..16 {
-        glow(c, c != 8);
-        print!(" ");
-    }
-    println!("\n");
-
-    // Six lines of the first three squares
-    for row in 0..6 {
-        for square in 0..3 {
-            for column in 0..6 {
-                glow(16 + square * 36 + row * 6 + column, row >= 3);
-                print!(" ");
-            }
-
-            print!("  ");
-        }
-
-        println!();
-    }
-    println!();
-
-    // Six more lines of the other three squares
-    for row in 0..6 {
-        for square in 0..3 {
-            for column in 0..6 {
-                glow(124 + square * 36 + row * 6 + column, row >= 3);
-                print!(" ");
-            }
-
-            print!("  ");
-        }
-
-        println!();
-    }
-    println!();
-
-    // The last greyscale lines
-    for c in 232..=243 {
-        glow(c, false);
-        print!(" ");
-    }
-    println!();
-    for c in 244..=255 {
-        glow(c, true);
-        print!(" ");
-    }
-    println!();
-}
-
-fn glow(c: u8, light_bg: bool) {
-    let base = if light_bg { Color::Black } else { Color::White };
-    let style = base.on(Color::Fixed(c));
-    print!("{}", style.paint(&format!(" {:3} ", c)));
-}
diff --git a/old_nushell/crates/nu-ansi-term/examples/basic_colors.rs b/old_nushell/crates/nu-ansi-term/examples/basic_colors.rs
deleted file mode 100644
index 3c2b6817f..000000000
--- a/old_nushell/crates/nu-ansi-term/examples/basic_colors.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-extern crate nu_ansi_term;
-use nu_ansi_term::{Color::*, Style};
-
-// This example prints out the 16 basic colors.
-
-fn main() {
-    let normal = Style::default();
-
-    println!("{} {}", normal.paint("Normal"), normal.bold().paint("bold"));
-    println!("{} {}", Black.paint("Black"), Black.bold().paint("bold"));
-    println!("{} {}", Red.paint("Red"), Red.bold().paint("bold"));
-    println!("{} {}", Green.paint("Green"), Green.bold().paint("bold"));
-    println!("{} {}", Yellow.paint("Yellow"), Yellow.bold().paint("bold"));
-    println!("{} {}", Blue.paint("Blue"), Blue.bold().paint("bold"));
-    println!("{} {}", Purple.paint("Purple"), Purple.bold().paint("bold"));
-    println!("{} {}", Cyan.paint("Cyan"), Cyan.bold().paint("bold"));
-    println!("{} {}", White.paint("White"), White.bold().paint("bold"));
-}
diff --git a/old_nushell/crates/nu-ansi-term/examples/gradient_colors.rs b/old_nushell/crates/nu-ansi-term/examples/gradient_colors.rs
deleted file mode 100644
index 1c9583865..000000000
--- a/old_nushell/crates/nu-ansi-term/examples/gradient_colors.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use nu_ansi_term::{build_all_gradient_text, Color, Gradient, Rgb, TargetGround};
-
-fn main() {
-    let text = "lorem ipsum quia dolor sit amet, consectetur, adipisci velit";
-
-    // a gradient from hex colors
-    let start = Rgb::from_hex(0x40c9ff);
-    let end = Rgb::from_hex(0xe81cff);
-    let grad0 = Gradient::new(start, end);
-
-    // a gradient from color::rgb()
-    let start = Color::Rgb(64, 201, 255);
-    let end = Color::Rgb(232, 28, 255);
-    let gradient = Gradient::from_color_rgb(start, end);
-
-    // a slightly different gradient
-    let start2 = Color::Rgb(128, 64, 255);
-    let end2 = Color::Rgb(0, 28, 255);
-    let gradient2 = Gradient::from_color_rgb(start2, end2);
-
-    // reverse the gradient
-    let gradient3 = gradient.reverse();
-
-    let build_fg = gradient.build(text, TargetGround::Foreground);
-    println!("{}", build_fg);
-    let build_bg = gradient.build(text, TargetGround::Background);
-    println!("{}", build_bg);
-    let bgt = build_all_gradient_text(text, gradient, gradient2);
-    println!("{}", bgt);
-    let bgt2 = build_all_gradient_text(text, gradient, gradient3);
-    println!("{}", bgt2);
-
-    println!(
-        "{}",
-        grad0.build("nushell is awesome", TargetGround::Foreground)
-    );
-}
diff --git a/old_nushell/crates/nu-ansi-term/examples/rgb_colors.rs b/old_nushell/crates/nu-ansi-term/examples/rgb_colors.rs
deleted file mode 100644
index 4657d401f..000000000
--- a/old_nushell/crates/nu-ansi-term/examples/rgb_colors.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-extern crate nu_ansi_term;
-use nu_ansi_term::{Color, Style};
-
-// This example prints out a color gradient in a grid by calculating each
-// character’s red, green, and blue components, and using 24-bit color codes
-// to display them.
-
-const WIDTH: i32 = 80;
-const HEIGHT: i32 = 24;
-
-fn main() {
-    for row in 0..HEIGHT {
-        for col in 0..WIDTH {
-            let r = (row * 255 / HEIGHT) as u8;
-            let g = (col * 255 / WIDTH) as u8;
-            let b = 128;
-
-            print!("{}", Style::default().on(Color::Rgb(r, g, b)).paint(" "));
-        }
-
-        println!();
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/ansi.rs b/old_nushell/crates/nu-ansi-term/src/ansi.rs
deleted file mode 100644
index 8f2454dba..000000000
--- a/old_nushell/crates/nu-ansi-term/src/ansi.rs
+++ /dev/null
@@ -1,405 +0,0 @@
-#![allow(missing_docs)]
-use crate::style::{Color, Style};
-use crate::write::AnyWrite;
-use std::fmt;
-
-impl Style {
-    /// Write any bytes that go *before* a piece of text to the given writer.
-    fn write_prefix<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        // If there are actually no styles here, then don’t write *any* codes
-        // as the prefix. An empty ANSI code may not affect the terminal
-        // output at all, but a user may just want a code-free string.
-        if self.is_plain() {
-            return Ok(());
-        }
-
-        // Write the codes’ prefix, then write numbers, separated by
-        // semicolons, for each text style we want to apply.
-        write!(f, "\x1B[")?;
-        let mut written_anything = false;
-
-        {
-            let mut write_char = |c| {
-                if written_anything {
-                    write!(f, ";")?;
-                }
-                written_anything = true;
-                write!(f, "{}", c)?;
-                Ok(())
-            };
-
-            if self.is_bold {
-                write_char('1')?
-            }
-            if self.is_dimmed {
-                write_char('2')?
-            }
-            if self.is_italic {
-                write_char('3')?
-            }
-            if self.is_underline {
-                write_char('4')?
-            }
-            if self.is_blink {
-                write_char('5')?
-            }
-            if self.is_reverse {
-                write_char('7')?
-            }
-            if self.is_hidden {
-                write_char('8')?
-            }
-            if self.is_strikethrough {
-                write_char('9')?
-            }
-        }
-
-        // The foreground and background colors, if specified, need to be
-        // handled specially because the number codes are more complicated.
-        // (see `write_background_code` and `write_foreground_code`)
-        if let Some(bg) = self.background {
-            if written_anything {
-                write!(f, ";")?;
-            }
-            written_anything = true;
-            bg.write_background_code(f)?;
-        }
-
-        if let Some(fg) = self.foreground {
-            if written_anything {
-                write!(f, ";")?;
-            }
-            fg.write_foreground_code(f)?;
-        }
-
-        // All the codes end with an `m`, because reasons.
-        write!(f, "m")?;
-
-        Ok(())
-    }
-
-    /// Write any bytes that go *after* a piece of text to the given writer.
-    fn write_suffix<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        if self.is_plain() {
-            Ok(())
-        } else {
-            write!(f, "{}", RESET)
-        }
-    }
-}
-
-/// The code to send to reset all styles and return to `Style::default()`.
-pub static RESET: &str = "\x1B[0m";
-
-impl Color {
-    fn write_foreground_code<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        match self {
-            Color::Black => write!(f, "30"),
-            Color::Red => write!(f, "31"),
-            Color::Green => write!(f, "32"),
-            Color::Yellow => write!(f, "33"),
-            Color::Blue => write!(f, "34"),
-            Color::Purple => write!(f, "35"),
-            Color::Magenta => write!(f, "35"),
-            Color::Cyan => write!(f, "36"),
-            Color::White => write!(f, "37"),
-            Color::Fixed(num) => write!(f, "38;5;{}", num),
-            Color::Rgb(r, g, b) => write!(f, "38;2;{};{};{}", r, g, b),
-            Color::DarkGray => write!(f, "90"),
-            Color::LightRed => write!(f, "91"),
-            Color::LightGreen => write!(f, "92"),
-            Color::LightYellow => write!(f, "93"),
-            Color::LightBlue => write!(f, "94"),
-            Color::LightPurple => write!(f, "95"),
-            Color::LightMagenta => write!(f, "95"),
-            Color::LightCyan => write!(f, "96"),
-            Color::LightGray => write!(f, "97"),
-        }
-    }
-
-    fn write_background_code<W: AnyWrite + ?Sized>(&self, f: &mut W) -> Result<(), W::Error> {
-        match self {
-            Color::Black => write!(f, "40"),
-            Color::Red => write!(f, "41"),
-            Color::Green => write!(f, "42"),
-            Color::Yellow => write!(f, "43"),
-            Color::Blue => write!(f, "44"),
-            Color::Purple => write!(f, "45"),
-            Color::Magenta => write!(f, "45"),
-            Color::Cyan => write!(f, "46"),
-            Color::White => write!(f, "47"),
-            Color::Fixed(num) => write!(f, "48;5;{}", num),
-            Color::Rgb(r, g, b) => write!(f, "48;2;{};{};{}", r, g, b),
-            Color::DarkGray => write!(f, "100"),
-            Color::LightRed => write!(f, "101"),
-            Color::LightGreen => write!(f, "102"),
-            Color::LightYellow => write!(f, "103"),
-            Color::LightBlue => write!(f, "104"),
-            Color::LightPurple => write!(f, "105"),
-            Color::LightMagenta => write!(f, "105"),
-            Color::LightCyan => write!(f, "106"),
-            Color::LightGray => write!(f, "107"),
-        }
-    }
-}
-
-/// Like `ANSIString`, but only displays the style prefix.
-///
-/// This type implements the `Display` trait, meaning it can be written to a
-/// `std::fmt` formatting without doing any extra allocation, and written to a
-/// string with the `.to_string()` method. For examples, see
-/// [`Style::prefix`](struct.Style.html#method.prefix).
-#[derive(Clone, Copy, Debug)]
-pub struct Prefix(Style);
-
-/// Like `ANSIString`, but only displays the difference between two
-/// styles.
-///
-/// This type implements the `Display` trait, meaning it can be written to a
-/// `std::fmt` formatting without doing any extra allocation, and written to a
-/// string with the `.to_string()` method. For examples, see
-/// [`Style::infix`](struct.Style.html#method.infix).
-#[derive(Clone, Copy, Debug)]
-pub struct Infix(Style, Style);
-
-/// Like `ANSIString`, but only displays the style suffix.
-///
-/// This type implements the `Display` trait, meaning it can be written to a
-/// `std::fmt` formatting without doing any extra allocation, and written to a
-/// string with the `.to_string()` method. For examples, see
-/// [`Style::suffix`](struct.Style.html#method.suffix).
-#[derive(Clone, Copy, Debug)]
-pub struct Suffix(Style);
-
-impl Style {
-    /// The prefix bytes for this style. These are the bytes that tell the
-    /// terminal to use a different color or font style.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color::Blue};
-    ///
-    /// let style = Style::default().bold();
-    /// assert_eq!("\x1b[1m",
-    ///            style.prefix().to_string());
-    ///
-    /// let style = Blue.bold();
-    /// assert_eq!("\x1b[1;34m",
-    ///            style.prefix().to_string());
-    ///
-    /// let style = Style::default();
-    /// assert_eq!("",
-    ///            style.prefix().to_string());
-    /// ```
-    pub fn prefix(self) -> Prefix {
-        Prefix(self)
-    }
-
-    /// The infix bytes between this style and `next` style. These are the bytes
-    /// that tell the terminal to change the style to `next`. These may include
-    /// a reset followed by the next color and style, depending on the two styles.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color::Green};
-    ///
-    /// let style = Style::default().bold();
-    /// assert_eq!("\x1b[32m",
-    ///            style.infix(Green.bold()).to_string());
-    ///
-    /// let style = Green.normal();
-    /// assert_eq!("\x1b[1m",
-    ///            style.infix(Green.bold()).to_string());
-    ///
-    /// let style = Style::default();
-    /// assert_eq!("",
-    ///            style.infix(style).to_string());
-    /// ```
-    pub fn infix(self, next: Style) -> Infix {
-        Infix(self, next)
-    }
-
-    /// The suffix for this style. These are the bytes that tell the terminal
-    /// to reset back to its normal color and font style.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color::Green};
-    ///
-    /// let style = Style::default().bold();
-    /// assert_eq!("\x1b[0m",
-    ///            style.suffix().to_string());
-    ///
-    /// let style = Green.normal().bold();
-    /// assert_eq!("\x1b[0m",
-    ///            style.suffix().to_string());
-    ///
-    /// let style = Style::default();
-    /// assert_eq!("",
-    ///            style.suffix().to_string());
-    /// ```
-    pub fn suffix(self) -> Suffix {
-        Suffix(self)
-    }
-}
-
-impl Color {
-    /// The prefix bytes for this color as a `Style`. These are the bytes
-    /// that tell the terminal to use a different color or font style.
-    ///
-    /// See also [`Style::prefix`](struct.Style.html#method.prefix).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color::Green;
-    ///
-    /// assert_eq!("\x1b[0m",
-    ///            Green.suffix().to_string());
-    /// ```
-    pub fn prefix(self) -> Prefix {
-        Prefix(self.normal())
-    }
-
-    /// The infix bytes between this color and `next` color. These are the bytes
-    /// that tell the terminal to use the `next` color, or to do nothing if
-    /// the two colors are equal.
-    ///
-    /// See also [`Style::infix`](struct.Style.html#method.infix).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color::{Red, Yellow};
-    ///
-    /// assert_eq!("\x1b[33m",
-    ///            Red.infix(Yellow).to_string());
-    /// ```
-    pub fn infix(self, next: Color) -> Infix {
-        Infix(self.normal(), next.normal())
-    }
-
-    /// The suffix for this color as a `Style`. These are the bytes that
-    /// tell the terminal to reset back to its normal color and font style.
-    ///
-    /// See also [`Style::suffix`](struct.Style.html#method.suffix).
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color::Purple;
-    ///
-    /// assert_eq!("\x1b[0m",
-    ///            Purple.suffix().to_string());
-    /// ```
-    pub fn suffix(self) -> Suffix {
-        Suffix(self.normal())
-    }
-}
-
-impl fmt::Display for Prefix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut dyn fmt::Write = f;
-        self.0.write_prefix(f)
-    }
-}
-
-impl fmt::Display for Infix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use crate::difference::Difference;
-
-        match Difference::between(&self.0, &self.1) {
-            Difference::ExtraStyles(style) => {
-                let f: &mut dyn fmt::Write = f;
-                style.write_prefix(f)
-            }
-            Difference::Reset => {
-                let f: &mut dyn fmt::Write = f;
-                write!(f, "{}{}", RESET, self.1.prefix())
-            }
-            Difference::Empty => {
-                Ok(()) // nothing to write
-            }
-        }
-    }
-}
-
-impl fmt::Display for Suffix {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut dyn fmt::Write = f;
-        self.0.write_suffix(f)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::style::Color::*;
-    use crate::style::Style;
-
-    macro_rules! test {
-        ($name: ident: $style: expr; $input: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($style.paint($input).to_string(), $result.to_string());
-
-                let mut v = Vec::new();
-                $style.paint($input.as_bytes()).write_to(&mut v).unwrap();
-                assert_eq!(v.as_slice(), $result.as_bytes());
-            }
-        };
-    }
-
-    test!(plain:                 Style::default();                  "text/plain" => "text/plain");
-    test!(red:                   Red;                               "hi" => "\x1B[31mhi\x1B[0m");
-    test!(black:                 Black.normal();                    "hi" => "\x1B[30mhi\x1B[0m");
-    test!(yellow_bold:           Yellow.bold();                     "hi" => "\x1B[1;33mhi\x1B[0m");
-    test!(yellow_bold_2:         Yellow.normal().bold();            "hi" => "\x1B[1;33mhi\x1B[0m");
-    test!(blue_underline:        Blue.underline();                  "hi" => "\x1B[4;34mhi\x1B[0m");
-    test!(green_bold_ul:         Green.bold().underline();          "hi" => "\x1B[1;4;32mhi\x1B[0m");
-    test!(green_bold_ul_2:       Green.underline().bold();          "hi" => "\x1B[1;4;32mhi\x1B[0m");
-    test!(purple_on_white:       Purple.on(White);                  "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(purple_on_white_2:     Purple.normal().on(White);         "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(yellow_on_blue:        Style::new().on(Blue).fg(Yellow);  "hi" => "\x1B[44;33mhi\x1B[0m");
-    test!(magenta_on_white:      Magenta.on(White);                  "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(magenta_on_white_2:    Magenta.normal().on(White);         "hi" => "\x1B[47;35mhi\x1B[0m");
-    test!(yellow_on_blue_2:      Cyan.on(Blue).fg(Yellow);          "hi" => "\x1B[44;33mhi\x1B[0m");
-    test!(cyan_bold_on_white:    Cyan.bold().on(White);             "hi" => "\x1B[1;47;36mhi\x1B[0m");
-    test!(cyan_ul_on_white:      Cyan.underline().on(White);        "hi" => "\x1B[4;47;36mhi\x1B[0m");
-    test!(cyan_bold_ul_on_white: Cyan.bold().underline().on(White); "hi" => "\x1B[1;4;47;36mhi\x1B[0m");
-    test!(cyan_ul_bold_on_white: Cyan.underline().bold().on(White); "hi" => "\x1B[1;4;47;36mhi\x1B[0m");
-    test!(fixed:                 Fixed(100);                        "hi" => "\x1B[38;5;100mhi\x1B[0m");
-    test!(fixed_on_purple:       Fixed(100).on(Purple);             "hi" => "\x1B[45;38;5;100mhi\x1B[0m");
-    test!(fixed_on_fixed:        Fixed(100).on(Fixed(200));         "hi" => "\x1B[48;5;200;38;5;100mhi\x1B[0m");
-    test!(rgb:                   Rgb(70,130,180);                   "hi" => "\x1B[38;2;70;130;180mhi\x1B[0m");
-    test!(rgb_on_blue:           Rgb(70,130,180).on(Blue);          "hi" => "\x1B[44;38;2;70;130;180mhi\x1B[0m");
-    test!(blue_on_rgb:           Blue.on(Rgb(70,130,180));          "hi" => "\x1B[48;2;70;130;180;34mhi\x1B[0m");
-    test!(rgb_on_rgb:            Rgb(70,130,180).on(Rgb(5,10,15));  "hi" => "\x1B[48;2;5;10;15;38;2;70;130;180mhi\x1B[0m");
-    test!(bold:                  Style::new().bold();               "hi" => "\x1B[1mhi\x1B[0m");
-    test!(underline:             Style::new().underline();          "hi" => "\x1B[4mhi\x1B[0m");
-    test!(bunderline:            Style::new().bold().underline();   "hi" => "\x1B[1;4mhi\x1B[0m");
-    test!(dimmed:                Style::new().dimmed();             "hi" => "\x1B[2mhi\x1B[0m");
-    test!(italic:                Style::new().italic();             "hi" => "\x1B[3mhi\x1B[0m");
-    test!(blink:                 Style::new().blink();              "hi" => "\x1B[5mhi\x1B[0m");
-    test!(reverse:               Style::new().reverse();            "hi" => "\x1B[7mhi\x1B[0m");
-    test!(hidden:                Style::new().hidden();             "hi" => "\x1B[8mhi\x1B[0m");
-    test!(stricken:              Style::new().strikethrough();      "hi" => "\x1B[9mhi\x1B[0m");
-    test!(lr_on_lr:              LightRed.on(LightRed);             "hi" => "\x1B[101;91mhi\x1B[0m");
-
-    #[test]
-    fn test_infix() {
-        assert_eq!(
-            Style::new().dimmed().infix(Style::new()).to_string(),
-            "\x1B[0m"
-        );
-        assert_eq!(
-            White.dimmed().infix(White.normal()).to_string(),
-            "\x1B[0m\x1B[37m"
-        );
-        assert_eq!(White.normal().infix(White.bold()).to_string(), "\x1B[1m");
-        assert_eq!(White.normal().infix(Blue.normal()).to_string(), "\x1B[34m");
-        assert_eq!(Blue.bold().infix(Blue.bold()).to_string(), "");
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/debug.rs b/old_nushell/crates/nu-ansi-term/src/debug.rs
deleted file mode 100644
index 1dcde52be..000000000
--- a/old_nushell/crates/nu-ansi-term/src/debug.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use crate::style::Style;
-use std::fmt;
-
-/// Styles have a special `Debug` implementation that only shows the fields that
-/// are set. Fields that haven’t been touched aren’t included in the output.
-///
-/// This behaviour gets bypassed when using the alternate formatting mode
-/// `format!("{:#?}")`.
-///
-///     use nu_ansi_term::Color::{Red, Blue};
-///     assert_eq!("Style { fg(Red), on(Blue), bold, italic }",
-///                format!("{:?}", Red.on(Blue).bold().italic()));
-impl fmt::Debug for Style {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        if fmt.alternate() {
-            fmt.debug_struct("Style")
-                .field("foreground", &self.foreground)
-                .field("background", &self.background)
-                .field("blink", &self.is_blink)
-                .field("bold", &self.is_bold)
-                .field("dimmed", &self.is_dimmed)
-                .field("hidden", &self.is_hidden)
-                .field("italic", &self.is_italic)
-                .field("reverse", &self.is_reverse)
-                .field("strikethrough", &self.is_strikethrough)
-                .field("underline", &self.is_underline)
-                .finish()
-        } else if self.is_plain() {
-            fmt.write_str("Style {}")
-        } else {
-            fmt.write_str("Style { ")?;
-
-            let mut written_anything = false;
-
-            if let Some(fg) = self.foreground {
-                if written_anything {
-                    fmt.write_str(", ")?
-                }
-                written_anything = true;
-                write!(fmt, "fg({:?})", fg)?
-            }
-
-            if let Some(bg) = self.background {
-                if written_anything {
-                    fmt.write_str(", ")?
-                }
-                written_anything = true;
-                write!(fmt, "on({:?})", bg)?
-            }
-
-            {
-                let mut write_flag = |name| {
-                    if written_anything {
-                        fmt.write_str(", ")?
-                    }
-                    written_anything = true;
-                    fmt.write_str(name)
-                };
-
-                if self.is_blink {
-                    write_flag("blink")?
-                }
-                if self.is_bold {
-                    write_flag("bold")?
-                }
-                if self.is_dimmed {
-                    write_flag("dimmed")?
-                }
-                if self.is_hidden {
-                    write_flag("hidden")?
-                }
-                if self.is_italic {
-                    write_flag("italic")?
-                }
-                if self.is_reverse {
-                    write_flag("reverse")?
-                }
-                if self.is_strikethrough {
-                    write_flag("strikethrough")?
-                }
-                if self.is_underline {
-                    write_flag("underline")?
-                }
-            }
-
-            write!(fmt, " }}")
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::style::Color::*;
-    use crate::style::Style;
-
-    fn style() -> Style {
-        Style::new()
-    }
-
-    macro_rules! test {
-        ($name: ident: $obj: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($result, format!("{:?}", $obj));
-            }
-        };
-    }
-
-    test!(empty:   style()                  => "Style {}");
-    test!(bold:    style().bold()           => "Style { bold }");
-    test!(italic:  style().italic()         => "Style { italic }");
-    test!(both:    style().bold().italic()  => "Style { bold, italic }");
-
-    test!(red:     Red.normal()                     => "Style { fg(Red) }");
-    test!(redblue: Red.normal().on(Rgb(3, 2, 4))    => "Style { fg(Red), on(Rgb(3, 2, 4)) }");
-
-    test!(everything:
-            Red.on(Blue).blink().bold().dimmed().hidden().italic().reverse().strikethrough().underline() =>
-            "Style { fg(Red), on(Blue), blink, bold, dimmed, hidden, italic, reverse, strikethrough, underline }");
-
-    #[test]
-    fn long_and_detailed() {
-        extern crate regex;
-        let expected_debug = "Style { fg(Blue), bold }";
-        let expected_pretty_repat = r##"(?x)
-        Style\s+\{\s+
-            foreground:\s+Some\(\s+
-                Blue,?\s+
-            \),\s+
-            background:\s+None,\s+
-            blink:\s+false,\s+
-            bold:\s+true,\s+
-            dimmed:\s+false,\s+
-            hidden:\s+false,\s+
-            italic:\s+false,\s+
-            reverse:\s+false,\s+
-            strikethrough:\s+
-            false,\s+
-            underline:\s+false,?\s+
-            \}"##;
-        let re = regex::Regex::new(expected_pretty_repat).unwrap();
-
-        let style = Blue.bold();
-        let style_fmt_debug = format!("{:?}", style);
-        let style_fmt_pretty = format!("{:#?}", style);
-        println!("style_fmt_debug:\n{}", style_fmt_debug);
-        println!("style_fmt_pretty:\n{}", style_fmt_pretty);
-
-        assert_eq!(expected_debug, style_fmt_debug);
-        assert!(re.is_match(&style_fmt_pretty));
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/difference.rs b/old_nushell/crates/nu-ansi-term/src/difference.rs
deleted file mode 100644
index beee8ea25..000000000
--- a/old_nushell/crates/nu-ansi-term/src/difference.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use super::Style;
-
-/// When printing out one colored string followed by another, use one of
-/// these rules to figure out which *extra* control codes need to be sent.
-#[derive(PartialEq, Clone, Copy, Debug)]
-pub enum Difference {
-    /// Print out the control codes specified by this style to end up looking
-    /// like the second string's styles.
-    ExtraStyles(Style),
-
-    /// Converting between these two is impossible, so just send a reset
-    /// command and then the second string's styles.
-    Reset,
-
-    /// The before style is exactly the same as the after style, so no further
-    /// control codes need to be printed.
-    Empty,
-}
-
-impl Difference {
-    /// Compute the 'style difference' required to turn an existing style into
-    /// the given, second style.
-    ///
-    /// For example, to turn green text into green bold text, it's redundant
-    /// to write a reset command then a second green+bold command, instead of
-    /// just writing one bold command. This method should see that both styles
-    /// use the foreground color green, and reduce it to a single command.
-    ///
-    /// This method returns an enum value because it's not actually always
-    /// possible to turn one style into another: for example, text could be
-    /// made bold and underlined, but you can't remove the bold property
-    /// without also removing the underline property. So when this has to
-    /// happen, this function returns None, meaning that the entire set of
-    /// styles should be reset and begun again.
-    pub fn between(first: &Style, next: &Style) -> Difference {
-        use self::Difference::*;
-
-        // XXX(Havvy): This algorithm is kind of hard to replicate without
-        // having the Plain/Foreground enum variants, so I'm just leaving
-        // it commented out for now, and defaulting to Reset.
-
-        if first == next {
-            return Empty;
-        }
-
-        // Cannot un-bold, so must Reset.
-        if first.is_bold && !next.is_bold {
-            return Reset;
-        }
-
-        if first.is_dimmed && !next.is_dimmed {
-            return Reset;
-        }
-
-        if first.is_italic && !next.is_italic {
-            return Reset;
-        }
-
-        // Cannot un-underline, so must Reset.
-        if first.is_underline && !next.is_underline {
-            return Reset;
-        }
-
-        if first.is_blink && !next.is_blink {
-            return Reset;
-        }
-
-        if first.is_reverse && !next.is_reverse {
-            return Reset;
-        }
-
-        if first.is_hidden && !next.is_hidden {
-            return Reset;
-        }
-
-        if first.is_strikethrough && !next.is_strikethrough {
-            return Reset;
-        }
-
-        // Cannot go from foreground to no foreground, so must Reset.
-        if first.foreground.is_some() && next.foreground.is_none() {
-            return Reset;
-        }
-
-        // Cannot go from background to no background, so must Reset.
-        if first.background.is_some() && next.background.is_none() {
-            return Reset;
-        }
-
-        let mut extra_styles = Style::default();
-
-        if first.is_bold != next.is_bold {
-            extra_styles.is_bold = true;
-        }
-
-        if first.is_dimmed != next.is_dimmed {
-            extra_styles.is_dimmed = true;
-        }
-
-        if first.is_italic != next.is_italic {
-            extra_styles.is_italic = true;
-        }
-
-        if first.is_underline != next.is_underline {
-            extra_styles.is_underline = true;
-        }
-
-        if first.is_blink != next.is_blink {
-            extra_styles.is_blink = true;
-        }
-
-        if first.is_reverse != next.is_reverse {
-            extra_styles.is_reverse = true;
-        }
-
-        if first.is_hidden != next.is_hidden {
-            extra_styles.is_hidden = true;
-        }
-
-        if first.is_strikethrough != next.is_strikethrough {
-            extra_styles.is_strikethrough = true;
-        }
-
-        if first.foreground != next.foreground {
-            extra_styles.foreground = next.foreground;
-        }
-
-        if first.background != next.background {
-            extra_styles.background = next.background;
-        }
-
-        ExtraStyles(extra_styles)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Difference::*;
-    use super::*;
-    use crate::style::Color::*;
-    use crate::style::Style;
-
-    fn style() -> Style {
-        Style::new()
-    }
-
-    macro_rules! test {
-        ($name: ident: $first: expr; $next: expr => $result: expr) => {
-            #[test]
-            fn $name() {
-                assert_eq!($result, Difference::between(&$first, &$next));
-            }
-        };
-    }
-
-    test!(nothing:    Green.normal(); Green.normal()  => Empty);
-    test!(uppercase:  Green.normal(); Green.bold()    => ExtraStyles(style().bold()));
-    test!(lowercase:  Green.bold();   Green.normal()  => Reset);
-    test!(nothing2:   Green.bold();   Green.bold()    => Empty);
-
-    test!(color_change: Red.normal(); Blue.normal() => ExtraStyles(Blue.normal()));
-
-    test!(addition_of_blink:          style(); style().blink()          => ExtraStyles(style().blink()));
-    test!(addition_of_dimmed:         style(); style().dimmed()         => ExtraStyles(style().dimmed()));
-    test!(addition_of_hidden:         style(); style().hidden()         => ExtraStyles(style().hidden()));
-    test!(addition_of_reverse:        style(); style().reverse()        => ExtraStyles(style().reverse()));
-    test!(addition_of_strikethrough:  style(); style().strikethrough()  => ExtraStyles(style().strikethrough()));
-
-    test!(removal_of_strikethrough:   style().strikethrough(); style()  => Reset);
-    test!(removal_of_reverse:         style().reverse();       style()  => Reset);
-    test!(removal_of_hidden:          style().hidden();        style()  => Reset);
-    test!(removal_of_dimmed:          style().dimmed();        style()  => Reset);
-    test!(removal_of_blink:           style().blink();         style()  => Reset);
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/display.rs b/old_nushell/crates/nu-ansi-term/src/display.rs
deleted file mode 100644
index db5221f35..000000000
--- a/old_nushell/crates/nu-ansi-term/src/display.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-use crate::ansi::RESET;
-use crate::difference::Difference;
-use crate::style::{Color, Style};
-use crate::write::AnyWrite;
-use std::borrow::Cow;
-use std::fmt;
-use std::io;
-use std::ops::Deref;
-
-/// An `ANSIGenericString` includes a generic string type and a `Style` to
-/// display that string.  `ANSIString` and `ANSIByteString` are aliases for
-/// this type on `str` and `\[u8]`, respectively.
-#[derive(PartialEq, Debug)]
-pub struct AnsiGenericString<'a, S: 'a + ToOwned + ?Sized>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-{
-    style: Style,
-    string: Cow<'a, S>,
-}
-
-/// Cloning an `ANSIGenericString` will clone its underlying string.
-///
-/// # Examples
-///
-/// ```
-/// use nu_ansi_term::ANSIString;
-///
-/// let plain_string = ANSIString::from("a plain string");
-/// let clone_string = plain_string.clone();
-/// assert_eq!(clone_string, plain_string);
-/// ```
-impl<'a, S: 'a + ToOwned + ?Sized> Clone for AnsiGenericString<'a, S>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-{
-    fn clone(&self) -> AnsiGenericString<'a, S> {
-        AnsiGenericString {
-            style: self.style,
-            string: self.string.clone(),
-        }
-    }
-}
-
-// You might think that the hand-written Clone impl above is the same as the
-// one that gets generated with #[derive]. But it’s not *quite* the same!
-//
-// `str` is not Clone, and the derived Clone implementation puts a Clone
-// constraint on the S type parameter (generated using --pretty=expanded):
-//
-//                  ↓_________________↓
-//     impl <'a, S: ::std::clone::Clone + 'a + ToOwned + ?Sized> ::std::clone::Clone
-//     for ANSIGenericString<'a, S> where
-//     <S as ToOwned>::Owned: fmt::Debug { ... }
-//
-// This resulted in compile errors when you tried to derive Clone on a type
-// that used it:
-//
-//     #[derive(PartialEq, Debug, Clone, Default)]
-//     pub struct TextCellContents(Vec<ANSIString<'static>>);
-//                                 ^^^^^^^^^^^^^^^^^^^^^^^^^
-//     error[E0277]: the trait `std::clone::Clone` is not implemented for `str`
-//
-// The hand-written impl above can ignore that constraint and still compile.
-
-/// An ANSI String is a string coupled with the `Style` to display it
-/// in a terminal.
-///
-/// Although not technically a string itself, it can be turned into
-/// one with the `to_string` method.
-///
-/// # Examples
-///
-/// ```
-/// use nu_ansi_term::ANSIString;
-/// use nu_ansi_term::Color::Red;
-///
-/// let red_string = Red.paint("a red string");
-/// println!("{}", red_string);
-/// ```
-///
-/// ```
-/// use nu_ansi_term::ANSIString;
-///
-/// let plain_string = ANSIString::from("a plain string");
-/// assert_eq!(&*plain_string, "a plain string");
-/// ```
-pub type AnsiString<'a> = AnsiGenericString<'a, str>;
-
-/// An `AnsiByteString` represents a formatted series of bytes.  Use
-/// `AnsiByteString` when styling text with an unknown encoding.
-pub type AnsiByteString<'a> = AnsiGenericString<'a, [u8]>;
-
-impl<'a, I, S: 'a + ToOwned + ?Sized> From<I> for AnsiGenericString<'a, S>
-where
-    I: Into<Cow<'a, S>>,
-    <S as ToOwned>::Owned: fmt::Debug,
-{
-    fn from(input: I) -> AnsiGenericString<'a, S> {
-        AnsiGenericString {
-            string: input.into(),
-            style: Style::default(),
-        }
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> AnsiGenericString<'a, S>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-{
-    /// Directly access the style
-    pub fn style_ref(&self) -> &Style {
-        &self.style
-    }
-
-    /// Directly access the style mutably
-    pub fn style_ref_mut(&mut self) -> &mut Style {
-        &mut self.style
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> Deref for AnsiGenericString<'a, S>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-{
-    type Target = S;
-
-    fn deref(&self) -> &S {
-        self.string.deref()
-    }
-}
-
-/// A set of `AnsiGenericStrings`s collected together, in order to be
-/// written with a minimum of control characters.
-#[derive(Debug, PartialEq)]
-pub struct AnsiGenericStrings<'a, S: 'a + ToOwned + ?Sized>(pub &'a [AnsiGenericString<'a, S>])
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-    S: PartialEq;
-
-/// A set of `AnsiString`s collected together, in order to be written with a
-/// minimum of control characters.
-pub type AnsiStrings<'a> = AnsiGenericStrings<'a, str>;
-
-/// A function to construct an `AnsiStrings` instance.
-#[allow(non_snake_case)]
-pub fn AnsiStrings<'a>(arg: &'a [AnsiString<'a>]) -> AnsiStrings<'a> {
-    AnsiGenericStrings(arg)
-}
-
-/// A set of `AnsiByteString`s collected together, in order to be
-/// written with a minimum of control characters.
-pub type AnsiByteStrings<'a> = AnsiGenericStrings<'a, [u8]>;
-
-/// A function to construct an `ANSIByteStrings` instance.
-#[allow(non_snake_case)]
-pub fn ANSIByteStrings<'a>(arg: &'a [AnsiByteString<'a>]) -> AnsiByteStrings<'a> {
-    AnsiGenericStrings(arg)
-}
-
-// ---- paint functions ----
-
-impl Style {
-    /// Paints the given text with this color, returning an ANSI string.
-    #[must_use]
-    pub fn paint<'a, I, S: 'a + ToOwned + ?Sized>(self, input: I) -> AnsiGenericString<'a, S>
-    where
-        I: Into<Cow<'a, S>>,
-        <S as ToOwned>::Owned: fmt::Debug,
-    {
-        AnsiGenericString {
-            string: input.into(),
-            style: self,
-        }
-    }
-}
-
-impl Color {
-    /// Paints the given text with this color, returning an ANSI string.
-    /// This is a short-cut so you don’t have to use `Blue.normal()` just
-    /// to get blue text.
-    ///
-    /// ```
-    /// use nu_ansi_term::Color::Blue;
-    /// println!("{}", Blue.paint("da ba dee"));
-    /// ```
-    #[must_use]
-    pub fn paint<'a, I, S: 'a + ToOwned + ?Sized>(self, input: I) -> AnsiGenericString<'a, S>
-    where
-        I: Into<Cow<'a, S>>,
-        <S as ToOwned>::Owned: fmt::Debug,
-    {
-        AnsiGenericString {
-            string: input.into(),
-            style: self.normal(),
-        }
-    }
-}
-
-// ---- writers for individual ANSI strings ----
-
-impl<'a> fmt::Display for AnsiString<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let w: &mut dyn fmt::Write = f;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a> AnsiByteString<'a> {
-    /// Write an `ANSIByteString` to an `io::Write`.  This writes the escape
-    /// sequences for the associated `Style` around the bytes.
-    pub fn write_to<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
-        let w: &mut dyn io::Write = w;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized> AnsiGenericString<'a, S>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-    &'a S: AsRef<[u8]>,
-{
-    fn write_to_any<W: AnyWrite<Wstr = S> + ?Sized>(&self, w: &mut W) -> Result<(), W::Error> {
-        write!(w, "{}", self.style.prefix())?;
-        w.write_str(self.string.as_ref())?;
-        write!(w, "{}", self.style.suffix())
-    }
-}
-
-// ---- writers for combined ANSI strings ----
-
-impl<'a> fmt::Display for AnsiStrings<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let f: &mut dyn fmt::Write = f;
-        self.write_to_any(f)
-    }
-}
-
-impl<'a> AnsiByteStrings<'a> {
-    /// Write `ANSIByteStrings` to an `io::Write`.  This writes the minimal
-    /// escape sequences for the associated `Style`s around each set of
-    /// bytes.
-    pub fn write_to<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
-        let w: &mut dyn io::Write = w;
-        self.write_to_any(w)
-    }
-}
-
-impl<'a, S: 'a + ToOwned + ?Sized + PartialEq> AnsiGenericStrings<'a, S>
-where
-    <S as ToOwned>::Owned: fmt::Debug,
-    &'a S: AsRef<[u8]>,
-{
-    fn write_to_any<W: AnyWrite<Wstr = S> + ?Sized>(&self, w: &mut W) -> Result<(), W::Error> {
-        use self::Difference::*;
-
-        let first = match self.0.first() {
-            None => return Ok(()),
-            Some(f) => f,
-        };
-
-        write!(w, "{}", first.style.prefix())?;
-        w.write_str(first.string.as_ref())?;
-
-        for window in self.0.windows(2) {
-            match Difference::between(&window[0].style, &window[1].style) {
-                ExtraStyles(style) => write!(w, "{}", style.prefix())?,
-                Reset => write!(w, "{}{}", RESET, window[1].style.prefix())?,
-                Empty => { /* Do nothing! */ }
-            }
-
-            w.write_str(&window[1].string)?;
-        }
-
-        // Write the final reset string after all of the ANSIStrings have been
-        // written, *except* if the last one has no styles, because it would
-        // have already been written by this point.
-        if let Some(last) = self.0.last() {
-            if !last.style.is_plain() {
-                write!(w, "{}", RESET)?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-// ---- tests ----
-
-#[cfg(test)]
-mod tests {
-    pub use super::super::AnsiStrings;
-    pub use crate::style::Color::*;
-    pub use crate::style::Style;
-
-    #[test]
-    fn no_control_codes_for_plain() {
-        let one = Style::default().paint("one");
-        let two = Style::default().paint("two");
-        let output = AnsiStrings(&[one, two]).to_string();
-        assert_eq!(output, "onetwo");
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/gradient.rs b/old_nushell/crates/nu-ansi-term/src/gradient.rs
deleted file mode 100644
index a0d94c8cd..000000000
--- a/old_nushell/crates/nu-ansi-term/src/gradient.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::{rgb::Rgb, Color};
-
-/// Linear color gradient between two color stops
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Gradient {
-    /// Start Color of Gradient
-    pub start: Rgb,
-
-    /// End Color of Gradient
-    pub end: Rgb,
-}
-
-impl Gradient {
-    /// Creates a new [Gradient] with two [Rgb] colors, `start` and `end`
-    #[inline]
-    pub const fn new(start: Rgb, end: Rgb) -> Self {
-        Self { start, end }
-    }
-    pub const fn from_color_rgb(start: Color, end: Color) -> Self {
-        let start_grad = match start {
-            Color::Rgb(r, g, b) => Rgb { r, g, b },
-            _ => Rgb { r: 0, g: 0, b: 0 },
-        };
-        let end_grad = match end {
-            Color::Rgb(r, g, b) => Rgb { r, g, b },
-            _ => Rgb { r: 0, g: 0, b: 0 },
-        };
-
-        Self {
-            start: start_grad,
-            end: end_grad,
-        }
-    }
-
-    /// Computes the [Rgb] color between `start` and `end` for `t`
-    pub fn at(&self, t: f32) -> Rgb {
-        self.start.lerp(self.end, t)
-    }
-
-    /// Returns the reverse of `self`
-    #[inline]
-    pub const fn reverse(&self) -> Self {
-        Self::new(self.end, self.start)
-    }
-
-    #[allow(dead_code)]
-    pub fn build(&self, text: &str, target: TargetGround) -> String {
-        let delta = 1.0 / text.len() as f32;
-        let mut result = text.char_indices().fold(String::new(), |mut acc, (i, c)| {
-            let temp = format!(
-                "\x1B[{}m{}",
-                self.at(i as f32 * delta).ansi_color_code(target),
-                c
-            );
-            acc.push_str(&temp);
-            acc
-        });
-
-        result.push_str("\x1B[0m");
-        result
-    }
-}
-
-#[allow(dead_code)]
-pub fn build_all_gradient_text(text: &str, foreground: Gradient, background: Gradient) -> String {
-    let delta = 1.0 / text.len() as f32;
-    let mut result = text.char_indices().fold(String::new(), |mut acc, (i, c)| {
-        let step = i as f32 * delta;
-        let temp = format!(
-            "\x1B[{};{}m{}",
-            foreground
-                .at(step)
-                .ansi_color_code(TargetGround::Foreground),
-            background
-                .at(step)
-                .ansi_color_code(TargetGround::Background),
-            c
-        );
-        acc.push_str(&temp);
-        acc
-    });
-
-    result.push_str("\x1B[0m");
-    result
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum TargetGround {
-    Foreground,
-    Background,
-}
-
-impl TargetGround {
-    #[inline]
-    pub const fn code(&self) -> u8 {
-        match self {
-            Self::Foreground => 30,
-            Self::Background => 40,
-        }
-    }
-}
-
-pub trait ANSIColorCode {
-    fn ansi_color_code(&self, target: TargetGround) -> String;
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/lib.rs b/old_nushell/crates/nu-ansi-term/src/lib.rs
deleted file mode 100644
index d33b9bb52..000000000
--- a/old_nushell/crates/nu-ansi-term/src/lib.rs
+++ /dev/null
@@ -1,272 +0,0 @@
-//! This is a library for controlling colors and formatting, such as
-//! red bold text or blue underlined text, on ANSI terminals.
-//!
-//!
-//! ## Basic usage
-//!
-//! There are three main types in this crate that you need to be
-//! concerned with: [`ANSIString`], [`Style`], and [`Color`].
-//!
-//! A `Style` holds stylistic information: foreground and background colors,
-//! whether the text should be bold, or blinking, or other properties. The
-//! [`Color`] enum represents the available colors. And an [`ANSIString`] is a
-//! string paired with a [`Style`].
-//!
-//! [`Color`] is also available as an alias to `Color`.
-//!
-//! To format a string, call the `paint` method on a `Style` or a `Color`,
-//! passing in the string you want to format as the argument. For example,
-//! here’s how to get some red text:
-//!
-//! ```
-//! use nu_ansi_term::Color::Red;
-//!
-//! println!("This is in red: {}", Red.paint("a red string"));
-//! ```
-//!
-//! It’s important to note that the `paint` method does *not* actually return a
-//! string with the ANSI control characters surrounding it. Instead, it returns
-//! an [`ANSIString`] value that has a [`Display`] implementation that, when
-//! formatted, returns the characters. This allows strings to be printed with a
-//! minimum of [`String`] allocations being performed behind the scenes.
-//!
-//! If you *do* want to get at the escape codes, then you can convert the
-//! [`ANSIString`] to a string as you would any other `Display` value:
-//!
-//! ```
-//! use nu_ansi_term::Color::Red;
-//!
-//! let red_string = Red.paint("a red string").to_string();
-//! ```
-//!
-//!
-//! ## Bold, underline, background, and other styles
-//!
-//! For anything more complex than plain foreground color changes, you need to
-//! construct `Style` values themselves, rather than beginning with a `Color`.
-//! You can do this by chaining methods based on a new `Style`, created with
-//! [`Style::new()`]. Each method creates a new style that has that specific
-//! property set. For example:
-//!
-//! ```
-//! use nu_ansi_term::Style;
-//!
-//! println!("How about some {} and {}?",
-//!          Style::new().bold().paint("bold"),
-//!          Style::new().underline().paint("underline"));
-//! ```
-//!
-//! For brevity, these methods have also been implemented for `Color` values,
-//! so you can give your styles a foreground color without having to begin with
-//! an empty `Style` value:
-//!
-//! ```
-//! use nu_ansi_term::Color::{Blue, Yellow};
-//!
-//! println!("Demonstrating {} and {}!",
-//!          Blue.bold().paint("blue bold"),
-//!          Yellow.underline().paint("yellow underline"));
-//!
-//! println!("Yellow on blue: {}", Yellow.on(Blue).paint("wow!"));
-//! ```
-//!
-//! The complete list of styles you can use are: [`bold`], [`dimmed`], [`italic`],
-//! [`underline`], [`blink`], [`reverse`], [`hidden`], [`strikethrough`], and [`on`] for
-//! background colors.
-//!
-//! In some cases, you may find it easier to change the foreground on an
-//! existing `Style` rather than starting from the appropriate `Color`.
-//! You can do this using the [`fg`] method:
-//!
-//! ```
-//! use nu_ansi_term::Style;
-//! use nu_ansi_term::Color::{Blue, Cyan, Yellow};
-//!
-//! println!("Yellow on blue: {}", Style::new().on(Blue).fg(Yellow).paint("yow!"));
-//! println!("Also yellow on blue: {}", Cyan.on(Blue).fg(Yellow).paint("zow!"));
-//! ```
-//!
-//! You can turn a `Color` into a `Style` with the [`normal`] method.
-//! This will produce the exact same `ANSIString` as if you just used the
-//! `paint` method on the `Color` directly, but it’s useful in certain cases:
-//! for example, you may have a method that returns `Styles`, and need to
-//! represent both the “red bold” and “red, but not bold” styles with values of
-//! the same type. The `Style` struct also has a [`Default`] implementation if you
-//! want to have a style with *nothing* set.
-//!
-//! ```
-//! use nu_ansi_term::Style;
-//! use nu_ansi_term::Color::Red;
-//!
-//! Red.normal().paint("yet another red string");
-//! Style::default().paint("a completely regular string");
-//! ```
-//!
-//!
-//! ## Extended colors
-//!
-//! You can access the extended range of 256 colors by using the `Color::Fixed`
-//! variant, which takes an argument of the color number to use. This can be
-//! included wherever you would use a `Color`:
-//!
-//! ```
-//! use nu_ansi_term::Color::Fixed;
-//!
-//! Fixed(134).paint("A sort of light purple");
-//! Fixed(221).on(Fixed(124)).paint("Mustard in the ketchup");
-//! ```
-//!
-//! The first sixteen of these values are the same as the normal and bold
-//! standard color variants. There’s nothing stopping you from using these as
-//! `Fixed` colors instead, but there’s nothing to be gained by doing so
-//! either.
-//!
-//! You can also access full 24-bit color by using the `Color::Rgb` variant,
-//! which takes separate `u8` arguments for red, green, and blue:
-//!
-//! ```
-//! use nu_ansi_term::Color::Rgb;
-//!
-//! Rgb(70, 130, 180).paint("Steel blue");
-//! ```
-//!
-//! ## Combining successive colored strings
-//!
-//! The benefit of writing ANSI escape codes to the terminal is that they
-//! *stack*: you do not need to end every colored string with a reset code if
-//! the text that follows it is of a similar style. For example, if you want to
-//! have some blue text followed by some blue bold text, it’s possible to send
-//! the ANSI code for blue, followed by the ANSI code for bold, and finishing
-//! with a reset code without having to have an extra one between the two
-//! strings.
-//!
-//! This crate can optimise the ANSI codes that get printed in situations like
-//! this, making life easier for your terminal renderer. The [`ANSIStrings`]
-//! type takes a slice of several [`ANSIString`] values, and will iterate over
-//! each of them, printing only the codes for the styles that need to be updated
-//! as part of its formatting routine.
-//!
-//! The following code snippet uses this to enclose a binary number displayed in
-//! red bold text inside some red, but not bold, brackets:
-//!
-//! ```
-//! use nu_ansi_term::Color::Red;
-//! use nu_ansi_term::{ANSIString, ANSIStrings};
-//!
-//! let some_value = format!("{:b}", 42);
-//! let strings: &[ANSIString<'static>] = &[
-//!     Red.paint("["),
-//!     Red.bold().paint(some_value),
-//!     Red.paint("]"),
-//! ];
-//!
-//! println!("Value: {}", ANSIStrings(strings));
-//! ```
-//!
-//! There are several things to note here. Firstly, the [`paint`] method can take
-//! *either* an owned [`String`] or a borrowed [`&str`]. Internally, an [`ANSIString`]
-//! holds a copy-on-write ([`Cow`]) string value to deal with both owned and
-//! borrowed strings at the same time. This is used here to display a `String`,
-//! the result of the `format!` call, using the same mechanism as some
-//! statically-available `&str` slices. Secondly, that the [`ANSIStrings`] value
-//! works in the same way as its singular counterpart, with a [`Display`]
-//! implementation that only performs the formatting when required.
-//!
-//! ## Byte strings
-//!
-//! This library also supports formatting `\[u8]` byte strings; this supports
-//! applications working with text in an unknown encoding.  [`Style`] and
-//! [`Color`] support painting `\[u8]` values, resulting in an [`ANSIByteString`].
-//! This type does not implement [`Display`], as it may not contain UTF-8, but
-//! it does provide a method [`write_to`] to write the result to any value that
-//! implements [`Write`]:
-//!
-//! ```
-//! use nu_ansi_term::Color::Green;
-//!
-//! Green.paint("user data".as_bytes()).write_to(&mut std::io::stdout()).unwrap();
-//! ```
-//!
-//! Similarly, the type [`ANSIByteStrings`] supports writing a list of
-//! [`ANSIByteString`] values with minimal escape sequences:
-//!
-//! ```
-//! use nu_ansi_term::Color::Green;
-//! use nu_ansi_term::ANSIByteStrings;
-//!
-//! ANSIByteStrings(&[
-//!     Green.paint("user data 1\n".as_bytes()),
-//!     Green.bold().paint("user data 2\n".as_bytes()),
-//! ]).write_to(&mut std::io::stdout()).unwrap();
-//! ```
-//!
-//! [`Cow`]: https://doc.rust-lang.org/std/borrow/enum.Cow.html
-//! [`Display`]: https://doc.rust-lang.org/std/fmt/trait.Display.html
-//! [`Default`]: https://doc.rust-lang.org/std/default/trait.Default.html
-//! [`String`]: https://doc.rust-lang.org/std/string/struct.String.html
-//! [`&str`]: https://doc.rust-lang.org/std/primitive.str.html
-//! [`Write`]: https://doc.rust-lang.org/std/io/trait.Write.html
-//! [`Style`]: struct.Style.html
-//! [`Style::new()`]: struct.Style.html#method.new
-//! [`Color`]: enum.Color.html
-//! [`Color`]: enum.Color.html
-//! [`ANSIString`]: type.ANSIString.html
-//! [`ANSIStrings`]: type.ANSIStrings.html
-//! [`ANSIByteString`]: type.ANSIByteString.html
-//! [`ANSIByteStrings`]: type.ANSIByteStrings.html
-//! [`write_to`]: type.ANSIByteString.html#method.write_to
-//! [`paint`]: type.ANSIByteString.html#method.write_to
-//! [`normal`]: enum.Color.html#method.normal
-//!
-//! [`bold`]: struct.Style.html#method.bold
-//! [`dimmed`]: struct.Style.html#method.dimmed
-//! [`italic`]: struct.Style.html#method.italic
-//! [`underline`]: struct.Style.html#method.underline
-//! [`blink`]: struct.Style.html#method.blink
-//! [`reverse`]: struct.Style.html#method.reverse
-//! [`hidden`]: struct.Style.html#method.hidden
-//! [`strikethrough`]: struct.Style.html#method.strikethrough
-//! [`fg`]: struct.Style.html#method.fg
-//! [`on`]: struct.Style.html#method.on
-
-#![crate_name = "nu_ansi_term"]
-#![crate_type = "rlib"]
-#![warn(missing_copy_implementations)]
-// #![warn(missing_docs)]
-#![warn(trivial_casts, trivial_numeric_casts)]
-// #![warn(unused_extern_crates, unused_qualifications)]
-
-#[cfg(target_os = "windows")]
-extern crate winapi;
-#[cfg(test)]
-#[macro_use]
-extern crate doc_comment;
-
-#[cfg(test)]
-doctest!("../README.md");
-
-pub mod ansi;
-pub use ansi::{Infix, Prefix, Suffix};
-
-mod style;
-pub use style::{Color, Style};
-
-mod difference;
-mod display;
-pub use display::*;
-
-mod write;
-
-mod windows;
-pub use windows::*;
-
-mod util;
-pub use util::*;
-
-mod debug;
-
-pub mod gradient;
-pub use gradient::*;
-
-mod rgb;
-pub use rgb::*;
diff --git a/old_nushell/crates/nu-ansi-term/src/rgb.rs b/old_nushell/crates/nu-ansi-term/src/rgb.rs
deleted file mode 100644
index 19475c36b..000000000
--- a/old_nushell/crates/nu-ansi-term/src/rgb.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Code liberally borrowed from here
-// https://github.com/navierr/coloriz
-use std::ops;
-use std::u32;
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Rgb {
-    /// Red
-    pub r: u8,
-    /// Green
-    pub g: u8,
-    /// Blue
-    pub b: u8,
-}
-
-impl Rgb {
-    /// Creates a new [Rgb] color
-    #[inline]
-    pub const fn new(r: u8, g: u8, b: u8) -> Self {
-        Self { r, g, b }
-    }
-
-    /// Creates a new [Rgb] color with a hex code
-    #[inline]
-    pub const fn from_hex(hex: u32) -> Self {
-        Self::new((hex >> 16) as u8, (hex >> 8) as u8, hex as u8)
-    }
-
-    pub fn from_hex_string(hex: String) -> Self {
-        if hex.chars().count() == 8 && hex.starts_with("0x") {
-            // eprintln!("hex:{:?}", hex);
-            let (_, value_string) = hex.split_at(2);
-            // eprintln!("value_string:{:?}", value_string);
-            let int_val = u64::from_str_radix(value_string, 16);
-            match int_val {
-                Ok(num) => Self::new(
-                    ((num & 0xff0000) >> 16) as u8,
-                    ((num & 0xff00) >> 8) as u8,
-                    (num & 0xff) as u8,
-                ),
-                // Don't fail, just make the color black
-                // Should we fail?
-                _ => Self::new(0, 0, 0),
-            }
-        } else {
-            // Don't fail, just make the color black.
-            // Should we fail?
-            Self::new(0, 0, 0)
-        }
-    }
-
-    /// Creates a new [Rgb] color with three [f32] values
-    pub fn from_f32(r: f32, g: f32, b: f32) -> Self {
-        Self::new(
-            (r.clamp(0.0, 1.0) * 255.0) as u8,
-            (g.clamp(0.0, 1.0) * 255.0) as u8,
-            (b.clamp(0.0, 1.0) * 255.0) as u8,
-        )
-    }
-
-    /// Creates a grayscale [Rgb] color
-    #[inline]
-    pub const fn gray(x: u8) -> Self {
-        Self::new(x, x, x)
-    }
-
-    /// Creates a grayscale [Rgb] color with a [f32] value
-    pub fn gray_f32(x: f32) -> Self {
-        Self::from_f32(x, x, x)
-    }
-
-    /// Creates a new [Rgb] color from a [HSL] color
-    // pub fn from_hsl(hsl: HSL) -> Self {
-    //     if hsl.s == 0.0 {
-    //         return Self::gray_f32(hsl.l);
-    //     }
-
-    //     let q = if hsl.l < 0.5 {
-    //         hsl.l * (1.0 + hsl.s)
-    //     } else {
-    //         hsl.l + hsl.s - hsl.l * hsl.s
-    //     };
-    //     let p = 2.0 * hsl.l - q;
-    //     let h2c = |t: f32| {
-    //         let t = t.clamp(0.0, 1.0);
-    //         if 6.0 * t < 1.0 {
-    //             p + 6.0 * (q - p) * t
-    //         } else if t < 0.5 {
-    //             q
-    //         } else if 1.0 < 1.5 * t {
-    //             p + 6.0 * (q - p) * (1.0 / 1.5 - t)
-    //         } else {
-    //             p
-    //         }
-    //     };
-
-    //     Self::from_f32(h2c(hsl.h + 1.0 / 3.0), h2c(hsl.h), h2c(hsl.h - 1.0 / 3.0))
-    // }
-
-    /// Computes the linear interpolation between `self` and `other` for `t`
-    pub fn lerp(&self, other: Self, t: f32) -> Self {
-        let t = t.clamp(0.0, 1.0);
-        self * (1.0 - t) + other * t
-    }
-}
-
-impl From<(u8, u8, u8)> for Rgb {
-    fn from((r, g, b): (u8, u8, u8)) -> Self {
-        Self::new(r, g, b)
-    }
-}
-
-impl From<(f32, f32, f32)> for Rgb {
-    fn from((r, g, b): (f32, f32, f32)) -> Self {
-        Self::from_f32(r, g, b)
-    }
-}
-
-use crate::ANSIColorCode;
-use crate::TargetGround;
-impl ANSIColorCode for Rgb {
-    fn ansi_color_code(&self, target: TargetGround) -> String {
-        format!("{};2;{};{};{}", target.code() + 8, self.r, self.g, self.b)
-    }
-}
-
-overload::overload!(
-    (lhs: ?Rgb) + (rhs: ?Rgb) -> Rgb {
-        Rgb::new(
-            lhs.r.saturating_add(rhs.r),
-            lhs.g.saturating_add(rhs.g),
-            lhs.b.saturating_add(rhs.b)
-        )
-    }
-);
-
-overload::overload!(
-    (lhs: ?Rgb) - (rhs: ?Rgb) -> Rgb {
-        Rgb::new(
-            lhs.r.saturating_sub(rhs.r),
-            lhs.g.saturating_sub(rhs.g),
-            lhs.b.saturating_sub(rhs.b)
-        )
-    }
-);
-
-overload::overload!(
-    (lhs: ?Rgb) * (rhs: ?f32) -> Rgb {
-        Rgb::new(
-            (lhs.r as f32 * rhs.clamp(0.0, 1.0)) as u8,
-            (lhs.g as f32 * rhs.clamp(0.0, 1.0)) as u8,
-            (lhs.b as f32 * rhs.clamp(0.0, 1.0)) as u8
-        )
-    }
-);
-
-overload::overload!(
-    (lhs: ?f32) * (rhs: ?Rgb) -> Rgb {
-        Rgb::new(
-            (rhs.r as f32 * lhs.clamp(0.0, 1.0)) as u8,
-            (rhs.g as f32 * lhs.clamp(0.0, 1.0)) as u8,
-            (rhs.b as f32 * lhs.clamp(0.0, 1.0)) as u8
-        )
-    }
-);
-
-overload::overload!(
-    -(rgb: ?Rgb) -> Rgb {
-        Rgb::new(
-            255 - rgb.r,
-            255 - rgb.g,
-            255 - rgb.b)
-    }
-);
diff --git a/old_nushell/crates/nu-ansi-term/src/style.rs b/old_nushell/crates/nu-ansi-term/src/style.rs
deleted file mode 100644
index c4f1d7514..000000000
--- a/old_nushell/crates/nu-ansi-term/src/style.rs
+++ /dev/null
@@ -1,626 +0,0 @@
-/// A style is a collection of properties that can format a string
-/// using ANSI escape codes.
-///
-/// # Examples
-///
-/// ```
-/// use nu_ansi_term::{Style, Color};
-///
-/// let style = Style::new().bold().on(Color::Black);
-/// println!("{}", style.paint("Bold on black"));
-/// ```
-#[derive(PartialEq, Clone, Copy)]
-#[cfg_attr(
-    feature = "derive_serde_style",
-    derive(serde::Deserialize, serde::Serialize)
-)]
-pub struct Style {
-    /// The style's foreground color, if it has one.
-    pub foreground: Option<Color>,
-
-    /// The style's background color, if it has one.
-    pub background: Option<Color>,
-
-    /// Whether this style is bold.
-    pub is_bold: bool,
-
-    /// Whether this style is dimmed.
-    pub is_dimmed: bool,
-
-    /// Whether this style is italic.
-    pub is_italic: bool,
-
-    /// Whether this style is underlined.
-    pub is_underline: bool,
-
-    /// Whether this style is blinking.
-    pub is_blink: bool,
-
-    /// Whether this style has reverse colors.
-    pub is_reverse: bool,
-
-    /// Whether this style is hidden.
-    pub is_hidden: bool,
-
-    /// Whether this style is struckthrough.
-    pub is_strikethrough: bool,
-}
-
-impl Style {
-    /// Creates a new Style with no properties set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new();
-    /// println!("{}", style.paint("hi"));
-    /// ```
-    pub fn new() -> Style {
-        Style::default()
-    }
-
-    /// Returns a `Style` with the bold property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().bold();
-    /// println!("{}", style.paint("hey"));
-    /// ```
-    pub fn bold(&self) -> Style {
-        Style {
-            is_bold: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the dimmed property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().dimmed();
-    /// println!("{}", style.paint("sup"));
-    /// ```
-    pub fn dimmed(&self) -> Style {
-        Style {
-            is_dimmed: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the italic property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().italic();
-    /// println!("{}", style.paint("greetings"));
-    /// ```
-    pub fn italic(&self) -> Style {
-        Style {
-            is_italic: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the underline property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().underline();
-    /// println!("{}", style.paint("salutations"));
-    /// ```
-    pub fn underline(&self) -> Style {
-        Style {
-            is_underline: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the blink property set.
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().blink();
-    /// println!("{}", style.paint("wazzup"));
-    /// ```
-    pub fn blink(&self) -> Style {
-        Style {
-            is_blink: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the reverse property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().reverse();
-    /// println!("{}", style.paint("aloha"));
-    /// ```
-    pub fn reverse(&self) -> Style {
-        Style {
-            is_reverse: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the hidden property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().hidden();
-    /// println!("{}", style.paint("ahoy"));
-    /// ```
-    pub fn hidden(&self) -> Style {
-        Style {
-            is_hidden: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the strikethrough property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// let style = Style::new().strikethrough();
-    /// println!("{}", style.paint("yo"));
-    /// ```
-    pub fn strikethrough(&self) -> Style {
-        Style {
-            is_strikethrough: true,
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the foreground color property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color};
-    ///
-    /// let style = Style::new().fg(Color::Yellow);
-    /// println!("{}", style.paint("hi"));
-    /// ```
-    pub fn fg(&self, foreground: Color) -> Style {
-        Style {
-            foreground: Some(foreground),
-            ..*self
-        }
-    }
-
-    /// Returns a `Style` with the background color property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color};
-    ///
-    /// let style = Style::new().on(Color::Blue);
-    /// println!("{}", style.paint("eyyyy"));
-    /// ```
-    pub fn on(&self, background: Color) -> Style {
-        Style {
-            background: Some(background),
-            ..*self
-        }
-    }
-
-    /// Return true if this `Style` has no actual styles, and can be written
-    /// without any control characters.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    ///
-    /// assert_eq!(true,  Style::default().is_plain());
-    /// assert_eq!(false, Style::default().bold().is_plain());
-    /// ```
-    pub fn is_plain(self) -> bool {
-        self == Style::default()
-    }
-}
-
-impl Default for Style {
-    /// Returns a style with *no* properties set. Formatting text using this
-    /// style returns the exact same text.
-    ///
-    /// ```
-    /// use nu_ansi_term::Style;
-    /// assert_eq!(None,  Style::default().foreground);
-    /// assert_eq!(None,  Style::default().background);
-    /// assert_eq!(false, Style::default().is_bold);
-    /// assert_eq!("txt", Style::default().paint("txt").to_string());
-    /// ```
-    fn default() -> Style {
-        Style {
-            foreground: None,
-            background: None,
-            is_bold: false,
-            is_dimmed: false,
-            is_italic: false,
-            is_underline: false,
-            is_blink: false,
-            is_reverse: false,
-            is_hidden: false,
-            is_strikethrough: false,
-        }
-    }
-}
-
-// ---- colors ----
-
-/// A color is one specific type of ANSI escape code, and can refer
-/// to either the foreground or background color.
-///
-/// These use the standard numeric sequences.
-/// See <http://invisible-island.net/xterm/ctlseqs/ctlseqs.html>
-#[derive(PartialEq, Clone, Copy, Debug)]
-#[cfg_attr(
-    feature = "derive_serde_style",
-    derive(serde::Deserialize, serde::Serialize)
-)]
-pub enum Color {
-    /// Color #0 (foreground code `30`, background code `40`).
-    ///
-    /// This is not necessarily the background color, and using it as one may
-    /// render the text hard to read on terminals with dark backgrounds.
-    Black,
-
-    /// Color #0 (foreground code `90`, background code `100`).
-    DarkGray,
-
-    /// Color #1 (foreground code `31`, background code `41`).
-    Red,
-
-    /// Color #1 (foreground code `91`, background code `101`).
-    LightRed,
-
-    /// Color #2 (foreground code `32`, background code `42`).
-    Green,
-
-    /// Color #2 (foreground code `92`, background code `102`).
-    LightGreen,
-
-    /// Color #3 (foreground code `33`, background code `43`).
-    Yellow,
-
-    /// Color #3 (foreground code `93`, background code `103`).
-    LightYellow,
-
-    /// Color #4 (foreground code `34`, background code `44`).
-    Blue,
-
-    /// Color #4 (foreground code `94`, background code `104`).
-    LightBlue,
-
-    /// Color #5 (foreground code `35`, background code `45`).
-    Purple,
-
-    /// Color #5 (foreground code `95`, background code `105`).
-    LightPurple,
-
-    /// Color #5 (foreground code `35`, background code `45`).
-    Magenta,
-
-    /// Color #5 (foreground code `95`, background code `105`).
-    LightMagenta,
-
-    /// Color #6 (foreground code `36`, background code `46`).
-    Cyan,
-
-    /// Color #6 (foreground code `96`, background code `106`).
-    LightCyan,
-
-    /// Color #7 (foreground code `37`, background code `47`).
-    ///
-    /// As above, this is not necessarily the foreground color, and may be
-    /// hard to read on terminals with light backgrounds.
-    White,
-
-    /// Color #7 (foreground code `97`, background code `107`).
-    LightGray,
-
-    /// A color number from 0 to 255, for use in 256-color terminal
-    /// environments.
-    ///
-    /// - colors 0 to 7 are the `Black` to `White` variants respectively.
-    ///   These colors can usually be changed in the terminal emulator.
-    /// - colors 8 to 15 are brighter versions of the eight colors above.
-    ///   These can also usually be changed in the terminal emulator, or it
-    ///   could be configured to use the original colors and show the text in
-    ///   bold instead. It varies depending on the program.
-    /// - colors 16 to 231 contain several palettes of bright colors,
-    ///   arranged in six squares measuring six by six each.
-    /// - colors 232 to 255 are shades of grey from black to white.
-    ///
-    /// It might make more sense to look at a [color chart][cc].
-    ///
-    /// [cc]: https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg
-    Fixed(u8),
-
-    /// A 24-bit Rgb color, as specified by ISO-8613-3.
-    Rgb(u8, u8, u8),
-}
-
-impl Default for Color {
-    fn default() -> Self {
-        Color::White
-    }
-}
-
-impl Color {
-    /// Returns a `Style` with the foreground color set to this color.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Red.normal();
-    /// println!("{}", style.paint("hi"));
-    /// ```
-    pub fn normal(self) -> Style {
-        Style {
-            foreground: Some(self),
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// bold property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Green.bold();
-    /// println!("{}", style.paint("hey"));
-    /// ```
-    pub fn bold(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_bold: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// dimmed property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Yellow.dimmed();
-    /// println!("{}", style.paint("sup"));
-    /// ```
-    pub fn dimmed(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_dimmed: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// italic property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Blue.italic();
-    /// println!("{}", style.paint("greetings"));
-    /// ```
-    pub fn italic(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_italic: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// underline property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Purple.underline();
-    /// println!("{}", style.paint("salutations"));
-    /// ```
-    pub fn underline(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_underline: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// blink property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Cyan.blink();
-    /// println!("{}", style.paint("wazzup"));
-    /// ```
-    pub fn blink(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_blink: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// reverse property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Black.reverse();
-    /// println!("{}", style.paint("aloha"));
-    /// ```
-    pub fn reverse(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_reverse: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// hidden property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::White.hidden();
-    /// println!("{}", style.paint("ahoy"));
-    /// ```
-    pub fn hidden(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_hidden: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// strikethrough property set.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Fixed(244).strikethrough();
-    /// println!("{}", style.paint("yo"));
-    /// ```
-    pub fn strikethrough(self) -> Style {
-        Style {
-            foreground: Some(self),
-            is_strikethrough: true,
-            ..Style::default()
-        }
-    }
-
-    /// Returns a `Style` with the foreground color set to this color and the
-    /// background color property set to the given color.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use nu_ansi_term::Color;
-    ///
-    /// let style = Color::Rgb(31, 31, 31).on(Color::White);
-    /// println!("{}", style.paint("eyyyy"));
-    /// ```
-    pub fn on(self, background: Color) -> Style {
-        Style {
-            foreground: Some(self),
-            background: Some(background),
-            ..Style::default()
-        }
-    }
-}
-
-impl From<Color> for Style {
-    /// You can turn a `Color` into a `Style` with the foreground color set
-    /// with the `From` trait.
-    ///
-    /// ```
-    /// use nu_ansi_term::{Style, Color};
-    /// let green_foreground = Style::default().fg(Color::Green);
-    /// assert_eq!(green_foreground, Color::Green.normal());
-    /// assert_eq!(green_foreground, Color::Green.into());
-    /// assert_eq!(green_foreground, Style::from(Color::Green));
-    /// ```
-    fn from(color: Color) -> Style {
-        color.normal()
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "derive_serde_style")]
-mod serde_json_tests {
-    use super::{Color, Style};
-
-    #[test]
-    fn color_serialization() {
-        let colors = &[
-            Color::Red,
-            Color::Blue,
-            Color::Rgb(123, 123, 123),
-            Color::Fixed(255),
-        ];
-
-        assert_eq!(
-            serde_json::to_string(&colors).unwrap(),
-            String::from("[\"Red\",\"Blue\",{\"Rgb\":[123,123,123]},{\"Fixed\":255}]")
-        );
-    }
-
-    #[test]
-    fn color_deserialization() {
-        let colors = [
-            Color::Red,
-            Color::Blue,
-            Color::Rgb(123, 123, 123),
-            Color::Fixed(255),
-        ];
-
-        for color in colors {
-            let serialized = serde_json::to_string(&color).unwrap();
-            let deserialized: Color = serde_json::from_str(&serialized).unwrap();
-
-            assert_eq!(color, deserialized);
-        }
-    }
-
-    #[test]
-    fn style_serialization() {
-        let style = Style::default();
-
-        assert_eq!(serde_json::to_string(&style).unwrap(), "{\"foreground\":null,\"background\":null,\"is_bold\":false,\"is_dimmed\":false,\"is_italic\":false,\"is_underline\":false,\"is_blink\":false,\"is_reverse\":false,\"is_hidden\":false,\"is_strikethrough\":false}".to_string());
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/util.rs b/old_nushell/crates/nu-ansi-term/src/util.rs
deleted file mode 100644
index d66645958..000000000
--- a/old_nushell/crates/nu-ansi-term/src/util.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::display::{AnsiString, AnsiStrings};
-use std::ops::Deref;
-
-/// Return a substring of the given ANSIStrings sequence, while keeping the formatting.
-pub fn sub_string<'a>(
-    start: usize,
-    len: usize,
-    strs: &AnsiStrings<'a>,
-) -> Vec<AnsiString<'static>> {
-    let mut vec = Vec::new();
-    let mut pos = start;
-    let mut len_rem = len;
-
-    for i in strs.0.iter() {
-        let fragment = i.deref();
-        let frag_len = fragment.len();
-        if pos >= frag_len {
-            pos -= frag_len;
-            continue;
-        }
-        if len_rem == 0 {
-            break;
-        }
-
-        let end = pos + len_rem;
-        let pos_end = if end >= frag_len { frag_len } else { end };
-
-        vec.push(i.style_ref().paint(String::from(&fragment[pos..pos_end])));
-
-        if end <= frag_len {
-            break;
-        }
-
-        len_rem -= pos_end - pos;
-        pos = 0;
-    }
-
-    vec
-}
-
-/// Return a concatenated copy of `strs` without the formatting, as an allocated `String`.
-pub fn unstyle(strs: &AnsiStrings) -> String {
-    let mut s = String::new();
-
-    for i in strs.0.iter() {
-        s += i.deref();
-    }
-
-    s
-}
-
-/// Return the unstyled length of ANSIStrings. This is equaivalent to `unstyle(strs).len()`.
-pub fn unstyled_len(strs: &AnsiStrings) -> usize {
-    let mut l = 0;
-    for i in strs.0.iter() {
-        l += i.deref().len();
-    }
-    l
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::Color::*;
-
-    #[test]
-    fn test() {
-        let l = [
-            Black.paint("first"),
-            Red.paint("-second"),
-            White.paint("-third"),
-        ];
-        let a = AnsiStrings(&l);
-        assert_eq!(unstyle(&a), "first-second-third");
-        assert_eq!(unstyled_len(&a), 18);
-
-        let l2 = [Black.paint("st"), Red.paint("-second"), White.paint("-t")];
-        assert_eq!(sub_string(3, 11, &a), l2);
-    }
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/windows.rs b/old_nushell/crates/nu-ansi-term/src/windows.rs
deleted file mode 100644
index 828e35573..000000000
--- a/old_nushell/crates/nu-ansi-term/src/windows.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-/// Enables ANSI code support on Windows 10.
-///
-/// This uses Windows API calls to alter the properties of the console that
-/// the program is running in.
-///
-/// https://msdn.microsoft.com/en-us/library/windows/desktop/mt638032(v=vs.85).aspx
-///
-/// Returns a `Result` with the Windows error code if unsuccessful.
-#[cfg(windows)]
-pub fn enable_ansi_support() -> Result<(), u32> {
-    // ref: https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences#EXAMPLE_OF_ENABLING_VIRTUAL_TERMINAL_PROCESSING @@ https://archive.is/L7wRJ#76%
-
-    use std::ffi::OsStr;
-    use std::iter::once;
-    use std::os::windows::ffi::OsStrExt;
-    use std::ptr::null_mut;
-    use winapi::um::consoleapi::{GetConsoleMode, SetConsoleMode};
-    use winapi::um::errhandlingapi::GetLastError;
-    use winapi::um::fileapi::{CreateFileW, OPEN_EXISTING};
-    use winapi::um::handleapi::INVALID_HANDLE_VALUE;
-    use winapi::um::winnt::{FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE};
-
-    const ENABLE_VIRTUAL_TERMINAL_PROCESSING: u32 = 0x0004;
-
-    unsafe {
-        // ref: https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew
-        // Using `CreateFileW("CONOUT$", ...)` to retrieve the console handle works correctly even if STDOUT and/or STDERR are redirected
-        let console_out_name: Vec<u16> =
-            OsStr::new("CONOUT$").encode_wide().chain(once(0)).collect();
-        let console_handle = CreateFileW(
-            console_out_name.as_ptr(),
-            GENERIC_READ | GENERIC_WRITE,
-            FILE_SHARE_WRITE,
-            null_mut(),
-            OPEN_EXISTING,
-            0,
-            null_mut(),
-        );
-        if console_handle == INVALID_HANDLE_VALUE {
-            return Err(GetLastError());
-        }
-
-        // ref: https://docs.microsoft.com/en-us/windows/console/getconsolemode
-        let mut console_mode: u32 = 0;
-        if 0 == GetConsoleMode(console_handle, &mut console_mode) {
-            return Err(GetLastError());
-        }
-
-        // VT processing not already enabled?
-        if console_mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING == 0 {
-            // https://docs.microsoft.com/en-us/windows/console/setconsolemode
-            if 0 == SetConsoleMode(
-                console_handle,
-                console_mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING,
-            ) {
-                return Err(GetLastError());
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu-ansi-term/src/write.rs b/old_nushell/crates/nu-ansi-term/src/write.rs
deleted file mode 100644
index 552771918..000000000
--- a/old_nushell/crates/nu-ansi-term/src/write.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::fmt;
-use std::io;
-
-pub trait AnyWrite {
-    type Wstr: ?Sized;
-    type Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error>;
-
-    fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error>;
-}
-
-impl<'a> AnyWrite for dyn fmt::Write + 'a {
-    type Wstr = str;
-    type Error = fmt::Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> {
-        fmt::Write::write_fmt(self, fmt)
-    }
-
-    fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error> {
-        fmt::Write::write_str(self, s)
-    }
-}
-
-impl<'a> AnyWrite for dyn io::Write + 'a {
-    type Wstr = [u8];
-    type Error = io::Error;
-
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Self::Error> {
-        io::Write::write_fmt(self, fmt)
-    }
-
-    fn write_str(&mut self, s: &Self::Wstr) -> Result<(), Self::Error> {
-        io::Write::write_all(self, s)
-    }
-}
diff --git a/old_nushell/crates/nu-cli/Cargo.toml b/old_nushell/crates/nu-cli/Cargo.toml
deleted file mode 100644
index 305edeb45..000000000
--- a/old_nushell/crates/nu-cli/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "CLI for nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-cli"
-version = "0.43.0"
-build = "build.rs"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-completion = { version = "0.43.0", path="../nu-completion" }
-nu-command = { version = "0.43.0", path="../nu-command" }
-nu-data = { version = "0.43.0", path="../nu-data" }
-nu-engine = { version = "0.43.0", path="../nu-engine" }
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-parser = { version = "0.43.0", path="../nu-parser" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-stream = { version = "0.43.0", path="../nu-stream" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-
-indexmap ="1.6.1"
-log = "0.4.14"
-pretty_env_logger = "0.4.0"
-strip-ansi-escapes = "0.1.0"
-rustyline = { version="9.0.0", optional=true }
-ctrlc = { version="3.1.7", optional=true }
-shadow-rs = { version = "0.8.1", default-features = false, optional = true }
-serde = { version="1.0.123", features=["derive"] }
-serde_yaml = "0.8.16"
-lazy_static = "1.4.0"
-
-[build-dependencies]
-shadow-rs = "0.8.1"
-
-[features]
-default = ["shadow-rs"]
-rustyline-support = ["rustyline", "nu-engine/rustyline-support"]
-stable = []
diff --git a/old_nushell/crates/nu-cli/README.md b/old_nushell/crates/nu-cli/README.md
deleted file mode 100644
index ae7eeaed7..000000000
--- a/old_nushell/crates/nu-cli/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# nu-cli
-
-This crate provides the fundamental needs when creating the Nushell interactive REPL. In it, you'll find features for interacting with the line editor (the piece which writes the prompt and takes input from the user), keybindings, handlers for the commandline arguments passed to the REPL as it starts up, and more.
-
diff --git a/old_nushell/crates/nu-cli/build.rs b/old_nushell/crates/nu-cli/build.rs
deleted file mode 100644
index 4a0dfc459..000000000
--- a/old_nushell/crates/nu-cli/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() -> shadow_rs::SdResult<()> {
-    shadow_rs::new()
-}
diff --git a/old_nushell/crates/nu-cli/src/app.rs b/old_nushell/crates/nu-cli/src/app.rs
deleted file mode 100644
index 51cd6be0f..000000000
--- a/old_nushell/crates/nu-cli/src/app.rs
+++ /dev/null
@@ -1,638 +0,0 @@
-mod logger;
-mod options;
-mod options_parser;
-pub mod stopwatch;
-
-use self::stopwatch::Stopwatch;
-use lazy_static::lazy_static;
-use nu_command::{commands::NuSignature as Nu, utils::test_bins as binaries};
-use nu_engine::{get_full_help, EvaluationContext};
-use nu_errors::ShellError;
-use nu_protocol::hir::{Call, Expression, SpannedExpression, Synthetic};
-use nu_protocol::{Primitive, UntaggedValue};
-use nu_source::{Span, Tag};
-use nu_stream::InputStream;
-pub use options::{CliOptions, NuScript, Options};
-use options_parser::{NuParser, OptionsParser};
-use std::sync::Mutex;
-
-lazy_static! {
-    pub static ref STOPWATCH: Mutex<Stopwatch> = {
-        let mut sw = Stopwatch::default();
-        sw.start();
-        sw.stop();
-        Mutex::new(sw)
-    };
-}
-
-pub struct App {
-    parser: Box<dyn OptionsParser>,
-    pub options: Options,
-}
-
-impl App {
-    pub fn new(parser: Box<dyn OptionsParser>, options: Options) -> Self {
-        Self { parser, options }
-    }
-
-    pub fn run(args: &[String]) -> Result<(), ShellError> {
-        let nu = Box::new(NuParser::new());
-        let options = Options::default();
-        let ui = App::new(nu, options);
-
-        ui.main(args)
-    }
-
-    pub fn main(&self, argv: &[String]) -> Result<(), ShellError> {
-        if self.perf() {
-            // start the stopwatch running
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .start();
-        }
-
-        let argv = quote_positionals(argv).join(" ");
-
-        if let Err(cause) = self.parse(&argv) {
-            self.parser
-                .context()
-                .host()
-                .lock()
-                .print_err(cause, &nu_source::Text::from(argv));
-            std::process::exit(1);
-        }
-
-        if self.help() {
-            let context = self.parser.context();
-            let stream = nu_stream::OutputStream::one(
-                UntaggedValue::string(get_full_help(&Nu, &context.scope))
-                    .into_value(nu_source::Tag::unknown()),
-            );
-
-            consume(context, stream)?;
-
-            if self.perf() {
-                // stop the stopwatch since we're exiting
-                STOPWATCH
-                    .lock()
-                    .expect("unable to lock the stopwatch")
-                    .stop();
-                eprintln!(
-                    "help {:?}",
-                    STOPWATCH
-                        .lock()
-                        .expect("unable to lock the stopwatch")
-                        .elapsed()
-                );
-            }
-
-            std::process::exit(0);
-        }
-
-        if self.version() {
-            let context = self.parser.context();
-
-            let stream = nu_command::commands::version(nu_engine::CommandArgs {
-                context: context.clone(),
-                call_info: nu_engine::UnevaluatedCallInfo {
-                    args: Call::new(
-                        Box::new(SpannedExpression::new(
-                            Expression::Synthetic(Synthetic::String("version".to_string())),
-                            Span::unknown(),
-                        )),
-                        Span::unknown(),
-                    ),
-                    name_tag: Tag::unknown(),
-                },
-                input: InputStream::empty(),
-            })?;
-
-            let stream = {
-                let command = context
-                    .get_command("pivot")
-                    .expect("could not find version command");
-
-                context.run_command(
-                    command,
-                    Tag::unknown(),
-                    Call::new(
-                        Box::new(SpannedExpression::new(
-                            Expression::Synthetic(Synthetic::String("pivot".to_string())),
-                            Span::unknown(),
-                        )),
-                        Span::unknown(),
-                    ),
-                    stream,
-                )?
-            };
-
-            consume(context, stream)?;
-
-            if self.perf() {
-                // stop the stopwatch since we're exiting
-                STOPWATCH
-                    .lock()
-                    .expect("unable to lock the stopwatch")
-                    .stop();
-                eprintln!(
-                    "version {:?}",
-                    STOPWATCH
-                        .lock()
-                        .expect("unable to lock the stopwatch")
-                        .elapsed()
-                );
-            }
-
-            std::process::exit(0);
-        }
-
-        if let Some(bin) = self.testbin() {
-            match bin.as_deref() {
-                Ok("echo_env") => binaries::echo_env(),
-                Ok("cococo") => binaries::cococo(),
-                Ok("meow") => binaries::meow(),
-                Ok("iecho") => binaries::iecho(),
-                Ok("fail") => binaries::fail(),
-                Ok("nonu") => binaries::nonu(),
-                Ok("chop") => binaries::chop(),
-                Ok("repeater") => binaries::repeater(),
-                _ => unreachable!(),
-            }
-
-            return Ok(());
-        }
-
-        let mut opts = CliOptions::new();
-        opts.config = self.config().map(std::ffi::OsString::from);
-        opts.stdin = self.takes_stdin();
-        opts.save_history = self.save_history();
-        opts.perf = self.perf();
-
-        use logger::{configure, debug_filters, logger, trace_filters};
-
-        logger(|builder| {
-            configure(self, builder)?;
-            trace_filters(self, builder)?;
-            debug_filters(self, builder)?;
-
-            Ok(())
-        })?;
-
-        if self.perf() {
-            // start a new split
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .start()
-        }
-
-        if let Some(commands) = self.commands() {
-            let commands = commands?;
-            let script = NuScript::code(&commands)?;
-            opts.scripts = vec![script];
-            let context = crate::create_default_context(false)?;
-            return crate::run_script_file(context, opts);
-        }
-
-        if self.perf() {
-            // start a new spit
-            eprintln!(
-                "commands using -c at launch: {:?}",
-                STOPWATCH
-                    .lock()
-                    .expect("unable to lock the stopwatch")
-                    .elapsed_split()
-            );
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .start();
-        }
-
-        if let Some(scripts) = self.scripts() {
-            let mut source_files = vec![];
-            for script in scripts {
-                let script_name = script?;
-                let path = std::ffi::OsString::from(&script_name);
-
-                match NuScript::source_file(path.as_os_str()) {
-                    Ok(file) => source_files.push(file),
-                    Err(_) => {
-                        eprintln!("File not found: {}", script_name);
-                        return Ok(());
-                    }
-                }
-            }
-
-            for file in source_files {
-                let mut opts = opts.clone();
-                opts.scripts = vec![file];
-
-                let context = crate::create_default_context(false)?;
-                crate::run_script_file(context, opts)?;
-            }
-
-            return Ok(());
-        }
-
-        if self.perf() {
-            // start a new split
-            eprintln!(
-                "script file(s) passed in: {:?}",
-                STOPWATCH
-                    .lock()
-                    .expect("unable to lock the stopwatch")
-                    .elapsed_split()
-            );
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .start();
-        }
-
-        let context = crate::create_default_context(true)?;
-
-        if !self.skip_plugins() {
-            let _ = crate::register_plugins(&context);
-        }
-
-        if self.perf() {
-            // start a new split
-            eprintln!(
-                "plugins registered: {:?}",
-                STOPWATCH
-                    .lock()
-                    .expect("unable to lock the stopwatch")
-                    .elapsed_split()
-            );
-        }
-
-        #[cfg(feature = "rustyline-support")]
-        {
-            crate::cli(context, opts)?;
-        }
-
-        #[cfg(not(feature = "rustyline-support"))]
-        {
-            println!("Nushell needs the 'rustyline-support' feature for CLI support");
-        }
-
-        Ok(())
-    }
-
-    pub fn commands(&self) -> Option<Result<String, ShellError>> {
-        self.options.get("commands").map(|v| match v.value {
-            UntaggedValue::Error(err) => Err(err),
-            UntaggedValue::Primitive(Primitive::String(name)) => Ok(name),
-            _ => Err(ShellError::untagged_runtime_error("Unsupported option")),
-        })
-    }
-
-    pub fn perf(&self) -> bool {
-        self.options
-            .get("perf")
-            .map(|v| matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(false)
-    }
-
-    pub fn help(&self) -> bool {
-        self.options
-            .get("help")
-            .map(|v| matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(false)
-    }
-
-    pub fn version(&self) -> bool {
-        self.options
-            .get("version")
-            .map(|v| matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(false)
-    }
-
-    pub fn scripts(&self) -> Option<Vec<Result<String, ShellError>>> {
-        self.options.get("args").map(|v| {
-            v.table_entries()
-                .map(|v| match &v.value {
-                    UntaggedValue::Error(err) => Err(err.clone()),
-                    UntaggedValue::Primitive(Primitive::FilePath(path)) => {
-                        Ok(path.display().to_string())
-                    }
-                    UntaggedValue::Primitive(Primitive::String(name)) => Ok(name.clone()),
-                    _ => Err(ShellError::untagged_runtime_error("Unsupported option")),
-                })
-                .collect()
-        })
-    }
-
-    pub fn takes_stdin(&self) -> bool {
-        self.options
-            .get("stdin")
-            .map(|v| matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(false)
-    }
-
-    pub fn config(&self) -> Option<String> {
-        self.options
-            .get("config-file")
-            .map(|v| v.as_string().expect("not a string"))
-    }
-
-    pub fn develop(&self) -> Option<Vec<Result<String, ShellError>>> {
-        self.options.get("develop").map(|v| {
-            let mut values = vec![];
-
-            match v.value {
-                UntaggedValue::Error(err) => values.push(Err(err)),
-                UntaggedValue::Primitive(Primitive::String(filters)) => {
-                    values.extend(filters.split(',').map(|filter| Ok(filter.to_string())));
-                }
-                _ => values.push(Err(ShellError::untagged_runtime_error(
-                    "Unsupported option",
-                ))),
-            };
-
-            values
-        })
-    }
-
-    pub fn debug(&self) -> Option<Vec<Result<String, ShellError>>> {
-        self.options.get("debug").map(|v| {
-            let mut values = vec![];
-
-            match v.value {
-                UntaggedValue::Error(err) => values.push(Err(err)),
-                UntaggedValue::Primitive(Primitive::String(filters)) => {
-                    values.extend(filters.split(',').map(|filter| Ok(filter.to_string())));
-                }
-                _ => values.push(Err(ShellError::untagged_runtime_error(
-                    "Unsupported option",
-                ))),
-            };
-
-            values
-        })
-    }
-
-    pub fn loglevel(&self) -> Option<Result<String, ShellError>> {
-        self.options.get("loglevel").map(|v| match v.value {
-            UntaggedValue::Error(err) => Err(err),
-            UntaggedValue::Primitive(Primitive::String(name)) => Ok(name),
-            _ => Err(ShellError::untagged_runtime_error("Unsupported option")),
-        })
-    }
-
-    pub fn testbin(&self) -> Option<Result<String, ShellError>> {
-        self.options.get("testbin").map(|v| match v.value {
-            UntaggedValue::Error(err) => Err(err),
-            UntaggedValue::Primitive(Primitive::String(name)) => Ok(name),
-            _ => Err(ShellError::untagged_runtime_error("Unsupported option")),
-        })
-    }
-
-    pub fn skip_plugins(&self) -> bool {
-        self.options
-            .get("skip-plugins")
-            .map(|v| matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(false)
-    }
-
-    pub fn save_history(&self) -> bool {
-        self.options
-            .get("no-history")
-            .map(|v| !matches!(v.as_bool(), Ok(true)))
-            .unwrap_or(true)
-    }
-
-    pub fn parse(&self, args: &str) -> Result<(), ShellError> {
-        self.parser.parse(args).map(|options| {
-            self.options.swap(&options);
-        })
-    }
-}
-
-fn quote_positionals(parameters: &[String]) -> Vec<String> {
-    parameters
-        .iter()
-        .cloned()
-        .map(|arg| {
-            if arg.contains(' ') {
-                format!("\"{}\"", arg)
-            } else {
-                arg
-            }
-        })
-        .collect::<Vec<_>>()
-}
-
-fn consume(context: &EvaluationContext, stream: InputStream) -> Result<(), ShellError> {
-    let autoview_cmd = context
-        .get_command("autoview")
-        .expect("could not find autoview command");
-
-    let stream = context.run_command(
-        autoview_cmd,
-        Tag::unknown(),
-        Call::new(
-            Box::new(SpannedExpression::new(
-                Expression::Synthetic(Synthetic::String("autoview".to_string())),
-                Span::unknown(),
-            )),
-            Span::unknown(),
-        ),
-        stream,
-    )?;
-
-    for _ in stream {}
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn cli_app() -> App {
-        let parser = Box::new(NuParser::new());
-        let options = Options::default();
-
-        App::new(parser, options)
-    }
-
-    #[test]
-    fn default_options() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu")?;
-        assert!(!ui.version());
-        assert!(!ui.help());
-        assert!(!ui.takes_stdin());
-        assert!(ui.save_history());
-        assert!(!ui.skip_plugins());
-        assert_eq!(ui.config(), None);
-        assert_eq!(ui.loglevel(), None);
-        assert_eq!(ui.debug(), None);
-        assert_eq!(ui.develop(), None);
-        assert_eq!(ui.testbin(), None);
-        assert_eq!(ui.commands(), None);
-        assert_eq!(ui.scripts(), None);
-        Ok(())
-    }
-
-    #[test]
-    fn reports_errors_on_unsupported_flags() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        assert!(ui.parse("nu --coonfig-file /path/to/config.toml").is_err());
-        assert!(ui.config().is_none());
-        Ok(())
-    }
-
-    #[test]
-    fn configures_debug_trace_level_with_filters() -> Result<(), ShellError> {
-        let ui = cli_app();
-        ui.parse("nu --develop=cli,parser")?;
-        assert_eq!(ui.develop().unwrap()[0], Ok("cli".to_string()));
-        assert_eq!(ui.develop().unwrap()[1], Ok("parser".to_string()));
-        Ok(())
-    }
-
-    #[test]
-    fn configures_debug_level_with_filters() -> Result<(), ShellError> {
-        let ui = cli_app();
-        ui.parse("nu --debug=cli,run")?;
-        assert_eq!(ui.debug().unwrap()[0], Ok("cli".to_string()));
-        assert_eq!(ui.debug().unwrap()[1], Ok("run".to_string()));
-        Ok(())
-    }
-
-    #[test]
-    fn can_use_loglevels() -> Result<(), ShellError> {
-        for level in ["error", "warn", "info", "debug", "trace"] {
-            let ui = cli_app();
-            let args = format!("nu --loglevel={}", level);
-            ui.parse(&args)?;
-            assert_eq!(ui.loglevel().unwrap(), Ok(level.to_string()));
-        }
-
-        let ui = cli_app();
-        ui.parse("nu --loglevel=nada")?;
-        assert_eq!(
-            ui.loglevel().unwrap(),
-            Err(ShellError::untagged_runtime_error("nada is not supported."))
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn can_be_login() -> Result<(), ShellError> {
-        let ui = cli_app();
-        ui.parse("nu -l")?;
-
-        let ui = cli_app();
-        ui.parse("nu --login")?;
-
-        Ok(())
-    }
-
-    #[test]
-    fn can_be_passed_nu_scripts() -> Result<(), ShellError> {
-        let ui = cli_app();
-        ui.parse("nu code.nu bootstrap.nu")?;
-        assert_eq!(ui.scripts().unwrap()[0], Ok("code.nu".into()));
-        assert_eq!(ui.scripts().unwrap()[1], Ok("bootstrap.nu".into()));
-        Ok(())
-    }
-
-    #[test]
-    fn can_use_test_binaries() -> Result<(), ShellError> {
-        for binarie_name in [
-            "echo_env", "cococo", "iecho", "fail", "nonu", "chop", "repeater", "meow",
-        ] {
-            let ui = cli_app();
-            let args = format!("nu --testbin={}", binarie_name);
-            ui.parse(&args)?;
-            assert_eq!(ui.testbin().unwrap(), Ok(binarie_name.to_string()));
-        }
-
-        let ui = cli_app();
-        ui.parse("nu --testbin=andres")?;
-        assert_eq!(
-            ui.testbin().unwrap(),
-            Err(ShellError::untagged_runtime_error(
-                "andres is not supported."
-            ))
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn has_version() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --version")?;
-        assert!(ui.version());
-        Ok(())
-    }
-
-    #[test]
-    fn has_help() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --help")?;
-        assert!(ui.help());
-        Ok(())
-    }
-
-    #[test]
-    fn can_take_stdin() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --stdin")?;
-        assert!(ui.takes_stdin());
-        Ok(())
-    }
-
-    #[test]
-    fn can_opt_to_avoid_saving_history() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --no-history")?;
-        assert!(!ui.save_history());
-        Ok(())
-    }
-
-    #[test]
-    fn can_opt_to_skip_plugins() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --skip-plugins")?;
-        assert!(ui.skip_plugins());
-        Ok(())
-    }
-
-    #[test]
-    fn understands_commands_need_to_be_run() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu -c \"ls | get name\"")?;
-        assert_eq!(ui.commands().unwrap(), Ok(String::from("ls | get name")));
-
-        let ui = cli_app();
-
-        ui.parse("nu -c \"echo 'hola'\"")?;
-        assert_eq!(ui.commands().unwrap(), Ok(String::from("echo 'hola'")));
-        Ok(())
-    }
-
-    #[test]
-    fn knows_custom_configurations() -> Result<(), ShellError> {
-        let ui = cli_app();
-
-        ui.parse("nu --config-file /path/to/config.toml")?;
-        assert_eq!(ui.config().unwrap(), String::from("/path/to/config.toml"));
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-cli/src/app/logger.rs b/old_nushell/crates/nu-cli/src/app/logger.rs
deleted file mode 100644
index 02644a856..000000000
--- a/old_nushell/crates/nu-cli/src/app/logger.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use super::App;
-use log::LevelFilter;
-use nu_errors::ShellError;
-use pretty_env_logger::env_logger::Builder;
-
-pub fn logger(f: impl FnOnce(&mut Builder) -> Result<(), ShellError>) -> Result<(), ShellError> {
-    let mut builder = pretty_env_logger::formatted_builder();
-    f(&mut builder)?;
-    let _ = builder.try_init();
-    Ok(())
-}
-
-pub fn configure(app: &App, logger: &mut Builder) -> Result<(), ShellError> {
-    if let Some(level) = app.loglevel() {
-        let level = match level.as_deref() {
-            Ok("error") => LevelFilter::Error,
-            Ok("warn") => LevelFilter::Warn,
-            Ok("info") => LevelFilter::Info,
-            Ok("debug") => LevelFilter::Debug,
-            Ok("trace") => LevelFilter::Trace,
-            Ok(_) | Err(_) => LevelFilter::Warn,
-        };
-
-        logger.filter_module("nu", level);
-    };
-
-    if let Ok(s) = std::env::var("RUST_LOG") {
-        logger.parse_filters(&s);
-    }
-
-    Ok(())
-}
-
-pub fn trace_filters(app: &App, logger: &mut Builder) -> Result<(), ShellError> {
-    if let Some(filters) = app.develop() {
-        filters.into_iter().filter_map(Result::ok).for_each(|name| {
-            logger.filter_module(&name, LevelFilter::Trace);
-        })
-    }
-
-    Ok(())
-}
-
-pub fn debug_filters(app: &App, logger: &mut Builder) -> Result<(), ShellError> {
-    if let Some(filters) = app.debug() {
-        filters.into_iter().filter_map(Result::ok).for_each(|name| {
-            logger.filter_module(&name, LevelFilter::Debug);
-        })
-    }
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu-cli/src/app/options.rs b/old_nushell/crates/nu-cli/src/app/options.rs
deleted file mode 100644
index 025316578..000000000
--- a/old_nushell/crates/nu-cli/src/app/options.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{UntaggedValue, Value};
-use std::cell::RefCell;
-use std::ffi::{OsStr, OsString};
-
-#[derive(Debug, Clone)]
-pub struct CliOptions {
-    pub config: Option<OsString>,
-    pub stdin: bool,
-    pub scripts: Vec<NuScript>,
-    pub save_history: bool,
-    pub perf: bool,
-}
-
-impl Default for CliOptions {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CliOptions {
-    pub fn new() -> Self {
-        Self {
-            config: None,
-            stdin: false,
-            scripts: vec![],
-            save_history: true,
-            perf: false,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Options {
-    inner: RefCell<IndexMap<String, Value>>,
-}
-
-impl Options {
-    pub fn default() -> Self {
-        Self {
-            inner: RefCell::new(IndexMap::default()),
-        }
-    }
-
-    pub fn get(&self, key: &str) -> Option<Value> {
-        self.inner.borrow().get(key).cloned()
-    }
-
-    pub fn put(&self, key: &str, value: Value) {
-        self.inner.borrow_mut().insert(key.into(), value);
-    }
-
-    pub fn shift(&self) {
-        if let Some(Value {
-            value: UntaggedValue::Table(ref mut args),
-            ..
-        }) = self.inner.borrow_mut().get_mut("args")
-        {
-            args.remove(0);
-        }
-    }
-
-    pub fn swap(&self, other: &Options) {
-        self.inner.swap(&other.inner);
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct NuScript {
-    pub filepath: Option<OsString>,
-    pub contents: String,
-}
-
-impl NuScript {
-    pub fn code(content: &str) -> Result<Self, ShellError> {
-        Ok(Self {
-            filepath: None,
-            contents: content.to_string(),
-        })
-    }
-
-    pub fn get_code(&self) -> &str {
-        &self.contents
-    }
-
-    pub fn source_file(path: &OsStr) -> Result<Self, ShellError> {
-        use std::fs::File;
-        use std::io::Read;
-
-        let path = path.to_os_string();
-        let mut file = File::open(&path)?;
-        let mut buffer = String::new();
-
-        file.read_to_string(&mut buffer)?;
-
-        Ok(Self {
-            filepath: Some(path),
-            contents: buffer,
-        })
-    }
-}
diff --git a/old_nushell/crates/nu-cli/src/app/options_parser.rs b/old_nushell/crates/nu-cli/src/app/options_parser.rs
deleted file mode 100644
index d6efb6b0b..000000000
--- a/old_nushell/crates/nu-cli/src/app/options_parser.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use super::Options;
-
-use nu_command::commands::{loglevels, testbins, NuSignature as Nu};
-use nu_command::commands::{Autoview, Pivot, Table, Version as NuVersion};
-use nu_engine::{whole_stream_command, EvaluationContext};
-use nu_errors::ShellError;
-use nu_protocol::hir::{ClassifiedCommand, InternalCommand, NamedValue};
-use nu_protocol::UntaggedValue;
-use nu_source::Tag;
-
-pub struct NuParser {
-    context: EvaluationContext,
-}
-
-pub trait OptionsParser {
-    fn parse(&self, input: &str) -> Result<Options, ShellError>;
-    fn context(&self) -> &EvaluationContext;
-}
-
-impl NuParser {
-    pub fn new() -> Self {
-        let context = EvaluationContext::basic();
-        context.add_commands(vec![
-            whole_stream_command(Nu {}),
-            whole_stream_command(NuVersion {}),
-            whole_stream_command(Autoview {}),
-            whole_stream_command(Pivot {}),
-            whole_stream_command(Table {}),
-        ]);
-
-        Self { context }
-    }
-}
-
-impl OptionsParser for NuParser {
-    fn context(&self) -> &EvaluationContext {
-        &self.context
-    }
-
-    fn parse(&self, input: &str) -> Result<Options, ShellError> {
-        let options = Options::default();
-        let (lite_result, _err) = nu_parser::lex(input, 0, nu_parser::NewlineMode::Normal);
-        let (lite_result, _err) = nu_parser::parse_block(lite_result);
-
-        let (parsed, err) = nu_parser::classify_block(&lite_result, &self.context.scope);
-
-        if let Some(reason) = err {
-            return Err(reason.into());
-        }
-
-        match parsed.block[0].pipelines[0].list[0] {
-            ClassifiedCommand::Internal(InternalCommand { ref args, .. }) => {
-                if let Some(ref params) = args.named {
-                    params.iter().for_each(|(k, v)| {
-                        let value = match v {
-                            NamedValue::AbsentSwitch => {
-                                Some(UntaggedValue::from(false).into_untagged_value())
-                            }
-                            NamedValue::PresentSwitch(span) => {
-                                Some(UntaggedValue::from(true).into_value(Tag::from(span)))
-                            }
-                            NamedValue::AbsentValue => None,
-                            NamedValue::Value(span, exprs) => {
-                                let value = nu_engine::evaluate_baseline_expr(exprs, &self.context)
-                                    .expect("value");
-                                Some(value.value.into_value(Tag::from(span)))
-                            }
-                        };
-
-                        let value = value.map(|v| match k.as_ref() {
-                            "testbin" => {
-                                if let Ok(name) = v.as_string() {
-                                    if testbins().iter().any(|n| name == *n) {
-                                        v
-                                    } else {
-                                        UntaggedValue::Error(ShellError::untagged_runtime_error(
-                                            format!("{} is not supported.", name),
-                                        ))
-                                        .into_value(v.tag)
-                                    }
-                                } else {
-                                    v
-                                }
-                            }
-                            "loglevel" => {
-                                if let Ok(name) = v.as_string() {
-                                    if loglevels().iter().any(|n| name == *n) {
-                                        v
-                                    } else {
-                                        UntaggedValue::Error(ShellError::untagged_runtime_error(
-                                            format!("{} is not supported.", name),
-                                        ))
-                                        .into_value(v.tag)
-                                    }
-                                } else {
-                                    v
-                                }
-                            }
-                            _ => v,
-                        });
-
-                        if let Some(value) = value {
-                            options.put(k, value);
-                        }
-                    });
-                }
-
-                let mut positional_args = vec![];
-
-                if let Some(positional) = &args.positional {
-                    for pos in positional {
-                        let result = nu_engine::evaluate_baseline_expr(pos, &self.context)?;
-                        positional_args.push(result);
-                    }
-                }
-
-                if !positional_args.is_empty() {
-                    options.put(
-                        "args",
-                        UntaggedValue::Table(positional_args).into_untagged_value(),
-                    );
-                }
-            }
-            ClassifiedCommand::Error(ref reason) => {
-                return Err(reason.clone().into());
-            }
-            _ => return Err(ShellError::untagged_runtime_error("unrecognized command")),
-        }
-
-        Ok(options)
-    }
-}
diff --git a/old_nushell/crates/nu-cli/src/app/stopwatch.rs b/old_nushell/crates/nu-cli/src/app/stopwatch.rs
deleted file mode 100644
index e433782af..000000000
--- a/old_nushell/crates/nu-cli/src/app/stopwatch.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-#![allow(dead_code)]
-use std::default::Default;
-use std::fmt;
-use std::time::{Duration, Instant};
-
-#[derive(Clone, Copy)]
-pub struct Stopwatch {
-    /// The time the stopwatch was started last, if ever.
-    start_time: Option<Instant>,
-    /// The time the stopwatch was split last, if ever.
-    split_time: Option<Instant>,
-    /// The time elapsed while the stopwatch was running (between start() and stop()).
-    elapsed: Duration,
-}
-
-impl Default for Stopwatch {
-    fn default() -> Stopwatch {
-        Stopwatch {
-            start_time: None,
-            split_time: None,
-            elapsed: Duration::from_secs(0),
-        }
-    }
-}
-
-impl fmt::Display for Stopwatch {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        return write!(f, "{}ms", self.elapsed_ms());
-    }
-}
-
-impl Stopwatch {
-    /// Returns a new stopwatch.
-    pub fn new() -> Stopwatch {
-        let sw: Stopwatch = Default::default();
-        sw
-    }
-
-    /// Returns a new stopwatch which will immediately be started.
-    pub fn start_new() -> Stopwatch {
-        let mut sw = Stopwatch::new();
-        sw.start();
-        sw
-    }
-
-    /// Starts the stopwatch.
-    pub fn start(&mut self) {
-        self.start_time = Some(Instant::now());
-    }
-
-    /// Stops the stopwatch.
-    pub fn stop(&mut self) {
-        self.elapsed = self.elapsed();
-        self.start_time = None;
-        self.split_time = None;
-    }
-
-    /// Resets all counters and stops the stopwatch.
-    pub fn reset(&mut self) {
-        self.elapsed = Duration::from_secs(0);
-        self.start_time = None;
-        self.split_time = None;
-    }
-
-    /// Resets and starts the stopwatch again.
-    pub fn restart(&mut self) {
-        self.reset();
-        self.start();
-    }
-
-    /// Returns whether the stopwatch is running.
-    pub fn is_running(&self) -> bool {
-        self.start_time.is_some()
-    }
-
-    /// Returns the elapsed time since the start of the stopwatch.
-    pub fn elapsed(&self) -> Duration {
-        match self.start_time {
-            // stopwatch is running
-            Some(t1) => t1.elapsed() + self.elapsed,
-            // stopwatch is not running
-            None => self.elapsed,
-        }
-    }
-
-    /// Returns the elapsed time since the start of the stopwatch in milliseconds.
-    pub fn elapsed_ms(&self) -> i64 {
-        let dur = self.elapsed();
-        (dur.as_secs() * 1000 + dur.subsec_millis() as u64) as i64
-    }
-
-    /// Returns the elapsed time since last split or start/restart.
-    ///
-    /// If the stopwatch is in stopped state this will always return a zero Duration.
-    pub fn elapsed_split(&mut self) -> Duration {
-        match self.start_time {
-            // stopwatch is running
-            Some(start) => {
-                let res = match self.split_time {
-                    Some(split) => split.elapsed(),
-                    None => start.elapsed(),
-                };
-                self.split_time = Some(Instant::now());
-                res
-            }
-            // stopwatch is not running
-            None => Duration::from_secs(0),
-        }
-    }
-
-    /// Returns the elapsed time since last split or start/restart in milliseconds.
-    ///
-    /// If the stopwatch is in stopped state this will always return zero.
-    pub fn elapsed_split_ms(&mut self) -> i64 {
-        let dur = self.elapsed_split();
-        (dur.as_secs() * 1000 + dur.subsec_millis() as u64) as i64
-    }
-}
diff --git a/old_nushell/crates/nu-cli/src/cli.rs b/old_nushell/crates/nu-cli/src/cli.rs
deleted file mode 100644
index 72f2f4c97..000000000
--- a/old_nushell/crates/nu-cli/src/cli.rs
+++ /dev/null
@@ -1,538 +0,0 @@
-use crate::app::STOPWATCH;
-use crate::line_editor::configure_ctrl_c;
-use nu_ansi_term::Color;
-use nu_engine::{maybe_print_errors, run_block, script::run_script_standalone, EvaluationContext};
-
-#[allow(unused_imports)]
-pub(crate) use nu_engine::script::{process_script, LineResult};
-
-#[cfg(feature = "rustyline-support")]
-use crate::line_editor::{
-    configure_rustyline_editor, convert_rustyline_result_to_string,
-    default_rustyline_editor_configuration, nu_line_editor_helper,
-};
-
-#[allow(unused_imports)]
-use nu_data::config;
-use nu_source::{Tag, Text};
-use nu_stream::InputStream;
-#[allow(unused_imports)]
-use std::sync::atomic::Ordering;
-
-#[cfg(feature = "rustyline-support")]
-use rustyline::{self, error::ReadlineError};
-
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_path::expand_tilde;
-use nu_protocol::{hir::ExternalRedirection, ConfigPath, UntaggedValue, Value};
-
-use log::trace;
-use std::error::Error;
-use std::iter::Iterator;
-use std::path::PathBuf;
-
-// Name of environment variable where the prompt could be stored
-#[cfg(feature = "rustyline-support")]
-const PROMPT_COMMAND: &str = "PROMPT_COMMAND";
-
-pub fn search_paths() -> Vec<std::path::PathBuf> {
-    use std::env;
-    let mut search_paths = Vec::new();
-
-    // Automatically add path `nu` is in as a search path
-    if let Ok(exe_path) = env::current_exe() {
-        if let Some(exe_dir) = exe_path.parent() {
-            search_paths.push(exe_dir.to_path_buf());
-        }
-    }
-
-    if let Ok(config) = nu_data::config::config(Tag::unknown()) {
-        if let Some(Value {
-            value: UntaggedValue::Table(pipelines),
-            ..
-        }) = config.get("plugin_dirs")
-        {
-            for pipeline in pipelines {
-                if let Ok(plugin_dir) = pipeline.as_string() {
-                    search_paths.push(expand_tilde(plugin_dir));
-                }
-            }
-        }
-    }
-
-    search_paths
-}
-
-pub fn run_script_file(
-    context: EvaluationContext,
-    options: super::app::CliOptions,
-) -> Result<(), ShellError> {
-    if let Some(cfg) = options.config {
-        load_cfg_as_global_cfg(&context, PathBuf::from(cfg));
-    } else {
-        load_global_cfg(&context);
-    }
-
-    let _ = register_plugins(&context);
-    let _ = configure_ctrl_c(&context);
-
-    let script = options
-        .scripts
-        .get(0)
-        .ok_or_else(|| ShellError::unexpected("Nu source code not available"))?;
-
-    run_script_standalone(script.get_code().to_string(), options.stdin, &context, true)?;
-
-    Ok(())
-}
-
-#[cfg(feature = "rustyline-support")]
-fn default_prompt_string(cwd: &str) -> String {
-    format!(
-        "{}{}{}{}{}{}> ",
-        Color::Green.bold().prefix(),
-        cwd,
-        nu_ansi_term::ansi::RESET,
-        Color::Cyan.bold().prefix(),
-        current_branch(),
-        nu_ansi_term::ansi::RESET
-    )
-}
-
-#[cfg(feature = "rustyline-support")]
-fn evaluate_prompt_string(prompt_line: &str, context: &EvaluationContext, cwd: &str) -> String {
-    context.scope.enter_scope();
-    let (prompt_block, err) = nu_parser::parse(prompt_line, 0, &context.scope);
-
-    if err.is_some() {
-        context.scope.exit_scope();
-        default_prompt_string(cwd)
-    } else {
-        let run_result = run_block(
-            &prompt_block,
-            context,
-            InputStream::empty(),
-            ExternalRedirection::Stdout,
-        );
-        context.scope.exit_scope();
-
-        match run_result {
-            Ok(result) => match result.collect_string(Tag::unknown()) {
-                Ok(string_result) => {
-                    let errors = context.get_errors();
-                    maybe_print_errors(context, Text::from(prompt_line));
-                    context.clear_errors();
-
-                    if !errors.is_empty() {
-                        "> ".into()
-                    } else {
-                        string_result.item
-                    }
-                }
-                Err(e) => {
-                    context.host().lock().print_err(e, &Text::from(prompt_line));
-                    context.clear_errors();
-
-                    "> ".into()
-                }
-            },
-            Err(e) => {
-                context.host().lock().print_err(e, &Text::from(prompt_line));
-                context.clear_errors();
-
-                "> ".into()
-            }
-        }
-    }
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn cli(
-    context: EvaluationContext,
-    options: super::app::CliOptions,
-) -> Result<(), Box<dyn Error>> {
-    let _ = configure_ctrl_c(&context);
-
-    // start time for running startup scripts (this metric includes loading of the cfg, but w/e)
-    let startup_commands_start_time = std::time::Instant::now();
-
-    if let Some(cfg) = options.config {
-        load_cfg_as_global_cfg(&context, PathBuf::from(cfg));
-    } else {
-        load_global_cfg(&context);
-    }
-
-    // Store cmd duration in an env var
-    context.scope.add_env_var(
-        "CMD_DURATION_MS",
-        startup_commands_start_time
-            .elapsed()
-            .as_millis()
-            .to_string(),
-    );
-
-    if options.perf {
-        eprintln!(
-            "config loaded: {:?}",
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .elapsed_split()
-        );
-        STOPWATCH
-            .lock()
-            .expect("unable to lock the stopwatch")
-            .start();
-    }
-
-    //Configure rustyline
-    let mut rl = default_rustyline_editor_configuration();
-    let history_path = if let Some(cfg) = &context.configs().lock().global_config {
-        let _ = configure_rustyline_editor(&mut rl, cfg);
-        let helper = Some(nu_line_editor_helper(&context, cfg));
-        rl.set_helper(helper);
-        nu_data::config::path::history_path_or_default(cfg)
-    } else {
-        nu_data::config::path::default_history_path()
-    };
-
-    if options.perf {
-        eprintln!(
-            "rustyline configuration: {:?}",
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .elapsed_split()
-        );
-        STOPWATCH
-            .lock()
-            .expect("unable to lock the stopwatch")
-            .start();
-    }
-
-    // Don't load history if it's not necessary
-    if options.save_history {
-        let _ = rl.load_history(&history_path);
-    }
-
-    if options.perf {
-        eprintln!(
-            "history load: {:?}",
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .elapsed_split()
-        );
-        STOPWATCH
-            .lock()
-            .expect("unable to lock the stopwatch")
-            .start();
-    }
-
-    //set vars from cfg if present
-    let (skip_welcome_message, prompt) = if let Some(cfg) = &context.configs().lock().global_config
-    {
-        (
-            cfg.var("skip_welcome_message")
-                .map(|x| x.is_true())
-                .unwrap_or(false),
-            cfg.var("prompt"),
-        )
-    } else {
-        (false, None)
-    };
-
-    if options.perf {
-        eprintln!(
-            "load custom prompt: {:?}",
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .elapsed_split()
-        );
-        STOPWATCH
-            .lock()
-            .expect("unable to lock the stopwatch")
-            .start();
-    }
-
-    //Check whether dir we start in contains local cfg file and if so load it.
-    load_local_cfg_if_present(&context);
-
-    // Give ourselves a scope to work in
-    context.scope.enter_scope();
-
-    let mut session_text = String::new();
-    let mut line_start: usize = 0;
-
-    if !skip_welcome_message {
-        println!(
-            "Welcome to Nushell {} (type 'help' for more info)",
-            nu_command::commands::core_version()
-        );
-    }
-
-    #[cfg(windows)]
-    {
-        let _ = nu_ansi_term::enable_ansi_support();
-    }
-
-    let mut ctrlcbreak = false;
-
-    if options.perf {
-        eprintln!(
-            "timing stopped. starting run loop: {:?}",
-            STOPWATCH
-                .lock()
-                .expect("unable to lock the stopwatch")
-                .elapsed_split()
-        );
-        STOPWATCH
-            .lock()
-            .expect("unable to lock the stopwatch")
-            .stop();
-    }
-
-    loop {
-        if context.ctrl_c().load(Ordering::SeqCst) {
-            context.ctrl_c().store(false, Ordering::SeqCst);
-            continue;
-        }
-
-        let cwd = context.shell_manager().path();
-
-        // Check if the PROMPT_COMMAND env variable is set. This env variable
-        // contains nu code that is used to overwrite the prompt
-        let colored_prompt = match context.scope.get_env(PROMPT_COMMAND) {
-            Some(env_prompt) => evaluate_prompt_string(&env_prompt, &context, &cwd),
-            None => {
-                if let Some(prompt) = &prompt {
-                    let prompt_line = prompt.as_string()?;
-                    evaluate_prompt_string(&prompt_line, &context, &cwd)
-                } else {
-                    default_prompt_string(&cwd)
-                }
-            }
-        };
-
-        let prompt = {
-            if let Ok(bytes) = strip_ansi_escapes::strip(&colored_prompt) {
-                String::from_utf8_lossy(&bytes).to_string()
-            } else {
-                "> ".to_string()
-            }
-        };
-
-        if let Some(helper) = rl.helper_mut() {
-            helper.colored_prompt = colored_prompt;
-        }
-        let mut initial_command = Some(String::new());
-        let mut readline = Err(ReadlineError::Eof);
-        while let Some(ref cmd) = initial_command {
-            readline = rl.readline_with_initial(&prompt, (cmd, ""));
-            initial_command = None;
-        }
-
-        if let Ok(line) = &readline {
-            line_start = session_text.len();
-            session_text.push_str(line);
-            session_text.push('\n');
-        }
-
-        // start time for command duration
-        let cmd_start_time = std::time::Instant::now();
-
-        let line = match convert_rustyline_result_to_string(readline) {
-            LineResult::Success(_) => process_script(
-                &session_text[line_start..],
-                &context,
-                false,
-                line_start,
-                true,
-            ),
-            x => x,
-        };
-
-        // Store cmd duration in an env var
-        context.scope.add_env_var(
-            "CMD_DURATION_MS",
-            cmd_start_time.elapsed().as_millis().to_string(),
-        );
-
-        match line {
-            LineResult::Success(line) => {
-                if options.save_history && !line.trim().is_empty() {
-                    rl.add_history_entry(&line);
-                    let _ = rl.append_history(&history_path);
-                }
-                maybe_print_errors(&context, Text::from(session_text.clone()));
-            }
-
-            LineResult::ClearHistory => {
-                if options.save_history {
-                    rl.clear_history();
-                    std::fs::remove_file(&history_path)?;
-                }
-            }
-
-            LineResult::Error(line, err) => {
-                if options.save_history && !line.trim().is_empty() {
-                    rl.add_history_entry(&line);
-                    let _ = rl.append_history(&history_path);
-                }
-
-                context
-                    .host()
-                    .lock()
-                    .print_err(err, &Text::from(session_text.clone()));
-
-                // I am not so sure, we don't need maybe_print_errors here (as we printed an err
-                // above), because maybe_print_errors also clears the errors.
-                // TODO Analyze where above err comes from, and whether we need to clear
-                // context.errors here
-                // Or just be consistent and return errors always in context.errors...
-                maybe_print_errors(&context, Text::from(session_text.clone()));
-            }
-
-            LineResult::CtrlC => {
-                let config_ctrlc_exit = context
-                    .configs()
-                    .lock()
-                    .global_config
-                    .as_ref()
-                    .and_then(|cfg| cfg.var("ctrlc_exit"))
-                    .map(|ctrl_c| ctrl_c.is_true())
-                    .unwrap_or(false); // default behavior is to allow CTRL-C spamming similar to other shells
-
-                if !config_ctrlc_exit {
-                    continue;
-                }
-
-                if ctrlcbreak {
-                    if options.save_history {
-                        let _ = rl.append_history(&history_path);
-                    }
-                    std::process::exit(0);
-                } else {
-                    context.with_host(|host| host.stdout("CTRL-C pressed (again to quit)"));
-                    ctrlcbreak = true;
-                    continue;
-                }
-            }
-
-            LineResult::CtrlD => {
-                context.shell_manager().remove_at_current();
-                if context.shell_manager().is_empty() {
-                    break;
-                }
-            }
-
-            LineResult::Break => {
-                break;
-            }
-        }
-        ctrlcbreak = false;
-    }
-
-    // we are ok if we can not save history
-    if options.save_history {
-        let _ = rl.append_history(&history_path);
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn load_local_cfg_if_present(context: &EvaluationContext) {
-    trace!("Loading local cfg if present");
-    match config::loadable_cfg_exists_in_dir(PathBuf::from(context.shell_manager().path())) {
-        Ok(Some(cfg_path)) => {
-            if let Err(err) = context.load_config(&ConfigPath::Local(cfg_path)) {
-                context.host().lock().print_err(err, &Text::from(""))
-            }
-        }
-        Err(e) => {
-            //Report error while checking for local cfg file
-            context.host().lock().print_err(e, &Text::from(""))
-        }
-        Ok(None) => {
-            //No local cfg file present in start dir
-        }
-    }
-}
-
-fn load_cfg_as_global_cfg(context: &EvaluationContext, path: PathBuf) {
-    if let Err(err) = context.load_config(&ConfigPath::Global(path)) {
-        context.host().lock().print_err(err, &Text::from(""));
-    }
-}
-
-pub fn load_global_cfg(context: &EvaluationContext) {
-    match config::default_path() {
-        Ok(path) => {
-            load_cfg_as_global_cfg(context, path);
-        }
-        Err(e) => {
-            context.host().lock().print_err(e, &Text::from(""));
-        }
-    }
-}
-
-pub fn register_plugins(context: &EvaluationContext) -> Result<(), ShellError> {
-    if let Ok(plugins) = nu_engine::plugin::build_plugin::scan(search_paths()) {
-        context.add_commands(
-            plugins
-                .into_iter()
-                .filter(|p| !context.is_command_registered(p.name()))
-                .collect(),
-        );
-    }
-
-    Ok(())
-}
-
-pub fn parse_and_eval(line: &str, ctx: &EvaluationContext) -> Result<String, ShellError> {
-    // FIXME: do we still need this?
-    let line = if let Some(s) = line.strip_suffix('\n') {
-        s
-    } else {
-        line
-    };
-
-    // TODO ensure the command whose examples we're testing is actually in the pipeline
-    ctx.scope.enter_scope();
-    let (classified_block, err) = nu_parser::parse(line, 0, &ctx.scope);
-    if let Some(err) = err {
-        ctx.scope.exit_scope();
-        return Err(err.into());
-    }
-
-    let input_stream = InputStream::empty();
-
-    let result = run_block(
-        &classified_block,
-        ctx,
-        input_stream,
-        ExternalRedirection::Stdout,
-    );
-    ctx.scope.exit_scope();
-
-    result?.collect_string(Tag::unknown()).map(|x| x.item)
-}
-
-#[allow(dead_code)]
-fn current_branch() -> String {
-    #[cfg(feature = "shadow-rs")]
-    {
-        Some(shadow_rs::branch())
-            .map(|x| x.trim().to_string())
-            .filter(|x| !x.is_empty())
-            .map(|x| format!("({})", x))
-            .unwrap_or_default()
-    }
-    #[cfg(not(feature = "shadow-rs"))]
-    {
-        "".to_string()
-    }
-}
diff --git a/old_nushell/crates/nu-cli/src/keybinding.rs b/old_nushell/crates/nu-cli/src/keybinding.rs
deleted file mode 100644
index 0b90255ed..000000000
--- a/old_nushell/crates/nu-cli/src/keybinding.rs
+++ /dev/null
@@ -1,473 +0,0 @@
-use rustyline::{KeyCode as RustyKeyCode, Modifiers};
-use serde::{Deserialize, Serialize};
-
-pub fn convert_keyevent(key_event: KeyCode, modifiers: Option<Modifiers>) -> rustyline::KeyEvent {
-    match key_event {
-        KeyCode::UnknownEscSeq => convert_to_rl_keyevent(RustyKeyCode::UnknownEscSeq, modifiers),
-        KeyCode::Backspace => convert_to_rl_keyevent(RustyKeyCode::Backspace, modifiers),
-        KeyCode::BackTab => convert_to_rl_keyevent(RustyKeyCode::BackTab, modifiers),
-        KeyCode::BracketedPasteStart => {
-            convert_to_rl_keyevent(RustyKeyCode::BracketedPasteStart, modifiers)
-        }
-        KeyCode::BracketedPasteEnd => {
-            convert_to_rl_keyevent(RustyKeyCode::BracketedPasteEnd, modifiers)
-        }
-        KeyCode::Char(c) => convert_to_rl_keyevent(RustyKeyCode::Char(c), modifiers),
-        KeyCode::Delete => convert_to_rl_keyevent(RustyKeyCode::Delete, modifiers),
-        KeyCode::Down => convert_to_rl_keyevent(RustyKeyCode::Down, modifiers),
-        KeyCode::End => convert_to_rl_keyevent(RustyKeyCode::End, modifiers),
-        KeyCode::Enter => convert_to_rl_keyevent(RustyKeyCode::Enter, modifiers),
-        KeyCode::Esc => convert_to_rl_keyevent(RustyKeyCode::Esc, modifiers),
-        KeyCode::F(u) => convert_to_rl_keyevent(RustyKeyCode::F(u), modifiers),
-        KeyCode::Home => convert_to_rl_keyevent(RustyKeyCode::Home, modifiers),
-        KeyCode::Insert => convert_to_rl_keyevent(RustyKeyCode::Insert, modifiers),
-        KeyCode::Left => convert_to_rl_keyevent(RustyKeyCode::Left, modifiers),
-        KeyCode::Null => convert_to_rl_keyevent(RustyKeyCode::Null, modifiers),
-        KeyCode::PageDown => convert_to_rl_keyevent(RustyKeyCode::PageDown, modifiers),
-        KeyCode::PageUp => convert_to_rl_keyevent(RustyKeyCode::PageUp, modifiers),
-        KeyCode::Right => convert_to_rl_keyevent(RustyKeyCode::Right, modifiers),
-        KeyCode::Tab => convert_to_rl_keyevent(RustyKeyCode::Tab, modifiers),
-        KeyCode::Up => convert_to_rl_keyevent(RustyKeyCode::Up, modifiers),
-    }
-}
-
-fn convert_to_rl_keyevent(
-    key_code: RustyKeyCode,
-    modifier: Option<Modifiers>,
-) -> rustyline::KeyEvent {
-    rustyline::KeyEvent {
-        0: key_code,
-        1: modifier.unwrap_or(Modifiers::NONE),
-    }
-}
-
-fn convert_word(word: Word) -> rustyline::Word {
-    match word {
-        Word::Big => rustyline::Word::Big,
-        Word::Emacs => rustyline::Word::Emacs,
-        Word::Vi => rustyline::Word::Vi,
-    }
-}
-
-fn convert_at(at: At) -> rustyline::At {
-    match at {
-        At::AfterEnd => rustyline::At::AfterEnd,
-        At::BeforeEnd => rustyline::At::BeforeEnd,
-        At::Start => rustyline::At::Start,
-    }
-}
-
-fn convert_char_search(search: CharSearch) -> rustyline::CharSearch {
-    match search {
-        CharSearch::Backward(c) => rustyline::CharSearch::Backward(c),
-        CharSearch::BackwardAfter(c) => rustyline::CharSearch::BackwardAfter(c),
-        CharSearch::Forward(c) => rustyline::CharSearch::Forward(c),
-        CharSearch::ForwardBefore(c) => rustyline::CharSearch::ForwardBefore(c),
-    }
-}
-
-fn convert_movement(movement: Movement) -> rustyline::Movement {
-    match movement {
-        Movement::BackwardChar(u) => rustyline::Movement::BackwardChar(u),
-        Movement::BackwardWord { repeat, word } => {
-            rustyline::Movement::BackwardWord(repeat, convert_word(word))
-        }
-        Movement::BeginningOfBuffer => rustyline::Movement::BeginningOfBuffer,
-        Movement::BeginningOfLine => rustyline::Movement::BeginningOfLine,
-        Movement::EndOfBuffer => rustyline::Movement::EndOfBuffer,
-        Movement::EndOfLine => rustyline::Movement::EndOfLine,
-        Movement::ForwardChar(u) => rustyline::Movement::ForwardChar(u),
-        Movement::ForwardWord { repeat, at, word } => {
-            rustyline::Movement::ForwardWord(repeat, convert_at(at), convert_word(word))
-        }
-        Movement::LineDown(u) => rustyline::Movement::LineDown(u),
-        Movement::LineUp(u) => rustyline::Movement::LineUp(u),
-        Movement::ViCharSearch { repeat, search } => {
-            rustyline::Movement::ViCharSearch(repeat, convert_char_search(search))
-        }
-        Movement::ViFirstPrint => rustyline::Movement::ViFirstPrint,
-        Movement::WholeBuffer => rustyline::Movement::WholeBuffer,
-        Movement::WholeLine => rustyline::Movement::WholeLine,
-    }
-}
-
-fn convert_anchor(anchor: Anchor) -> rustyline::Anchor {
-    match anchor {
-        Anchor::After => rustyline::Anchor::After,
-        Anchor::Before => rustyline::Anchor::Before,
-    }
-}
-
-fn convert_cmd(cmd: Cmd) -> rustyline::Cmd {
-    match cmd {
-        Cmd::Abort => rustyline::Cmd::Abort,
-        Cmd::AcceptLine => rustyline::Cmd::AcceptLine,
-        Cmd::AcceptOrInsertLine => rustyline::Cmd::AcceptOrInsertLine {
-            accept_in_the_middle: false,
-        },
-        Cmd::BeginningOfHistory => rustyline::Cmd::BeginningOfHistory,
-        Cmd::CapitalizeWord => rustyline::Cmd::CapitalizeWord,
-        Cmd::ClearScreen => rustyline::Cmd::ClearScreen,
-        Cmd::Complete => rustyline::Cmd::Complete,
-        Cmd::CompleteBackward => rustyline::Cmd::CompleteBackward,
-        Cmd::CompleteHint => rustyline::Cmd::CompleteHint,
-        Cmd::Dedent(movement) => rustyline::Cmd::Dedent(convert_movement(movement)),
-        Cmd::DowncaseWord => rustyline::Cmd::DowncaseWord,
-        Cmd::EndOfFile => rustyline::Cmd::EndOfFile,
-        Cmd::EndOfHistory => rustyline::Cmd::EndOfHistory,
-        Cmd::ForwardSearchHistory => rustyline::Cmd::ForwardSearchHistory,
-        Cmd::HistorySearchBackward => rustyline::Cmd::HistorySearchBackward,
-        Cmd::HistorySearchForward => rustyline::Cmd::HistorySearchForward,
-        Cmd::Indent(movement) => rustyline::Cmd::Indent(convert_movement(movement)),
-        Cmd::Insert { repeat, string } => rustyline::Cmd::Insert(repeat, string),
-        Cmd::Interrupt => rustyline::Cmd::Interrupt,
-        Cmd::Kill(movement) => rustyline::Cmd::Kill(convert_movement(movement)),
-        Cmd::LineDownOrNextHistory(u) => rustyline::Cmd::LineDownOrNextHistory(u),
-        Cmd::LineUpOrPreviousHistory(u) => rustyline::Cmd::LineUpOrPreviousHistory(u),
-        Cmd::Move(movement) => rustyline::Cmd::Move(convert_movement(movement)),
-        Cmd::NextHistory => rustyline::Cmd::NextHistory,
-        Cmd::Newline => rustyline::Cmd::Newline,
-        Cmd::Noop => rustyline::Cmd::Noop,
-        Cmd::Overwrite(c) => rustyline::Cmd::Overwrite(c),
-        #[cfg(windows)]
-        Cmd::PasteFromClipboard => rustyline::Cmd::PasteFromClipboard,
-        Cmd::PreviousHistory => rustyline::Cmd::PreviousHistory,
-        Cmd::QuotedInsert => rustyline::Cmd::QuotedInsert,
-        Cmd::Replace {
-            movement,
-            replacement,
-        } => rustyline::Cmd::Replace(convert_movement(movement), replacement),
-        Cmd::ReplaceChar { repeat, ch } => rustyline::Cmd::ReplaceChar(repeat, ch),
-        Cmd::ReverseSearchHistory => rustyline::Cmd::ReverseSearchHistory,
-        Cmd::SelfInsert { repeat, ch } => rustyline::Cmd::SelfInsert(repeat, ch),
-        Cmd::Suspend => rustyline::Cmd::Suspend,
-        Cmd::TransposeChars => rustyline::Cmd::TransposeChars,
-        Cmd::TransposeWords(u) => rustyline::Cmd::TransposeWords(u),
-        Cmd::Undo(u) => rustyline::Cmd::Undo(u),
-        Cmd::Unknown => rustyline::Cmd::Unknown,
-        Cmd::UpcaseWord => rustyline::Cmd::UpcaseWord,
-        Cmd::ViYankTo(movement) => rustyline::Cmd::ViYankTo(convert_movement(movement)),
-        Cmd::Yank { repeat, anchor } => rustyline::Cmd::Yank(repeat, convert_anchor(anchor)),
-        Cmd::YankPop => rustyline::Cmd::YankPop,
-    }
-}
-
-fn convert_keybinding(keybinding: Keybinding) -> (rustyline::KeyEvent, rustyline::Cmd) {
-    let rusty_modifiers = match keybinding.modifiers {
-        Some(mods) => match mods {
-            NuModifiers::Ctrl => Some(Modifiers::CTRL),
-            NuModifiers::Alt => Some(Modifiers::ALT),
-            NuModifiers::Shift => Some(Modifiers::SHIFT),
-            NuModifiers::None => Some(Modifiers::NONE),
-            NuModifiers::CtrlShift => Some(Modifiers::CTRL_SHIFT),
-            NuModifiers::AltShift => Some(Modifiers::ALT_SHIFT),
-            NuModifiers::CtrlAlt => Some(Modifiers::CTRL_ALT),
-            NuModifiers::CtrlAltShift => Some(Modifiers::CTRL_ALT_SHIFT),
-            // _ => None,
-        },
-        None => None,
-    };
-    (
-        convert_keyevent(keybinding.key, rusty_modifiers),
-        convert_cmd(keybinding.binding),
-    )
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum KeyCode {
-    /// Unsupported escape sequence (on unix platform)
-    UnknownEscSeq,
-    /// ⌫ or `KeyEvent::Ctrl('H')`
-    Backspace,
-    /// ⇤ (usually Shift-Tab)
-    BackTab,
-    /// Paste (on unix platform)
-    BracketedPasteStart,
-    /// Paste (on unix platform)
-    BracketedPasteEnd,
-    /// Single char
-    Char(char),
-    /// ⌦
-    Delete,
-    /// ↓ arrow key
-    Down,
-    /// ⇲
-    End,
-    /// ↵ or `KeyEvent::Ctrl('M')`
-    Enter,
-    /// Escape or `KeyEvent::Ctrl('[')`
-    Esc,
-    /// Function key
-    F(u8),
-    /// ⇱
-    Home,
-    /// Insert key
-    Insert,
-    /// ← arrow key
-    Left,
-    // /// `KeyEvent::Char('\0')`
-    Null,
-    /// ⇟
-    PageDown,
-    /// ⇞
-    PageUp,
-    /// → arrow key
-    Right,
-    /// ⇥ or `KeyEvent::Ctrl('I')`
-    Tab,
-    /// ↑ arrow key
-    Up,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum Cmd {
-    /// abort
-    Abort, // Miscellaneous Command
-    /// accept-line
-    AcceptLine,
-    /// beginning-of-history
-    BeginningOfHistory,
-    /// capitalize-word
-    CapitalizeWord,
-    /// clear-screen
-    ClearScreen,
-    /// complete
-    Complete,
-    /// complete-backward
-    CompleteBackward,
-    /// complete-hint
-    CompleteHint,
-    /// Dedent current line
-    Dedent(Movement),
-    /// downcase-word
-    DowncaseWord,
-    /// vi-eof-maybe
-    EndOfFile,
-    /// end-of-history
-    EndOfHistory,
-    /// forward-search-history
-    ForwardSearchHistory,
-    /// history-search-backward
-    HistorySearchBackward,
-    /// history-search-forward
-    HistorySearchForward,
-    /// Indent current line
-    Indent(Movement),
-    /// Insert text
-    Insert { repeat: RepeatCount, string: String },
-    /// Interrupt signal (Ctrl-C)
-    Interrupt,
-    /// backward-delete-char, backward-kill-line, backward-kill-word
-    /// delete-char, kill-line, kill-word, unix-line-discard, unix-word-rubout,
-    /// vi-delete, vi-delete-to, vi-rubout
-    Kill(Movement),
-    /// backward-char, backward-word, beginning-of-line, end-of-line,
-    /// forward-char, forward-word, vi-char-search, vi-end-word, vi-next-word,
-    /// vi-prev-word
-    Move(Movement),
-    /// Inserts a newline
-    Newline,
-    /// next-history
-    NextHistory,
-    /// No action
-    Noop,
-    /// vi-replace
-    Overwrite(char),
-    /// Paste from the clipboard
-    #[cfg(windows)]
-    PasteFromClipboard,
-    /// previous-history
-    PreviousHistory,
-    /// quoted-insert
-    QuotedInsert,
-    /// vi-change-char
-    ReplaceChar { repeat: RepeatCount, ch: char },
-    /// vi-change-to, vi-substitute
-    Replace {
-        movement: Movement,
-        replacement: Option<String>,
-    },
-    /// reverse-search-history
-    ReverseSearchHistory,
-    /// self-insert
-    SelfInsert { repeat: RepeatCount, ch: char },
-    /// Suspend signal (Ctrl-Z on unix platform)
-    Suspend,
-    /// transpose-chars
-    TransposeChars,
-    /// transpose-words
-    TransposeWords(RepeatCount),
-    /// undo
-    Undo(RepeatCount),
-    /// Unsupported / unexpected
-    Unknown,
-    /// upcase-word
-    UpcaseWord,
-    /// vi-yank-to
-    ViYankTo(Movement),
-    /// yank, vi-put
-    Yank { repeat: RepeatCount, anchor: Anchor },
-    /// yank-pop
-    YankPop,
-    /// moves cursor to the line above or switches to prev history entry if
-    /// the cursor is already on the first line
-    LineUpOrPreviousHistory(RepeatCount),
-    /// moves cursor to the line below or switches to next history entry if
-    /// the cursor is already on the last line
-    LineDownOrNextHistory(RepeatCount),
-    /// accepts the line when cursor is at the end of the text (non including
-    /// trailing whitespace), inserts newline character otherwise
-    AcceptOrInsertLine,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum Movement {
-    /// Whole current line (not really a movement but a range)
-    WholeLine,
-    /// beginning-of-line
-    BeginningOfLine,
-    /// end-of-line
-    EndOfLine,
-    /// backward-word, vi-prev-word
-    BackwardWord { repeat: RepeatCount, word: Word }, // Backward until start of word
-    /// forward-word, vi-end-word, vi-next-word
-    ForwardWord {
-        repeat: RepeatCount,
-        at: At,
-        word: Word,
-    }, // Forward until start/end of word
-    /// vi-char-search
-    ViCharSearch {
-        repeat: RepeatCount,
-        search: CharSearch,
-    },
-    /// vi-first-print
-    ViFirstPrint,
-    /// backward-char
-    BackwardChar(RepeatCount),
-    /// forward-char
-    ForwardChar(RepeatCount),
-    /// move to the same column on the previous line
-    LineUp(RepeatCount),
-    /// move to the same column on the next line
-    LineDown(RepeatCount),
-    /// Whole user input (not really a movement but a range)
-    WholeBuffer,
-    /// beginning-of-buffer
-    BeginningOfBuffer,
-    /// end-of-buffer
-    EndOfBuffer,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-enum InputMode {
-    /// Vi Command/Alternate
-    Command,
-    /// Insert/Input mode
-    Insert,
-    /// Overwrite mode
-    Replace,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum Word {
-    /// non-blanks characters
-    Big,
-    /// alphanumeric characters
-    Emacs,
-    /// alphanumeric (and '_') characters
-    Vi,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum At {
-    /// Start of word.
-    Start,
-    /// Before end of word.
-    BeforeEnd,
-    /// After end of word.
-    AfterEnd,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum Anchor {
-    /// After cursor
-    After,
-    /// Before cursor
-    Before,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub enum CharSearch {
-    /// Forward search
-    Forward(char),
-    /// Forward search until
-    ForwardBefore(char),
-    /// Backward search
-    Backward(char),
-    /// Backward search until
-    BackwardAfter(char),
-}
-
-/// The set of modifier keys that were triggered along with a key press.
-#[derive(Debug, Serialize, Deserialize)]
-#[allow(non_camel_case_types)]
-pub enum NuModifiers {
-    /// Control modifier
-    #[serde(alias = "CTRL")]
-    Ctrl = 8,
-    /// Escape or Alt modifier
-    #[serde(alias = "ALT")]
-    Alt = 4,
-    /// Shift modifier
-    #[serde(alias = "SHIFT")]
-    Shift = 2,
-    /// No modifier
-    #[serde(alias = "NONE")]
-    None = 0,
-    /// Ctrl + Shift
-    #[serde(alias = "CTRL_SHIFT")]
-    CtrlShift = 10,
-    /// Alt + Shift
-    #[serde(alias = "ALT_SHIFT")]
-    AltShift = 6,
-    /// Ctrl + Alt
-    #[serde(alias = "CTRL_ALT")]
-    CtrlAlt = 12,
-    /// Ctrl + Alt + Shift
-    #[serde(alias = "CTRL_ALT_SHIFT")]
-    CtrlAltShift = 14,
-}
-
-/// The number of times one command should be repeated.
-pub type RepeatCount = usize;
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Keybinding {
-    key: KeyCode,
-    modifiers: Option<NuModifiers>,
-    binding: Cmd,
-}
-
-type Keybindings = Vec<Keybinding>;
-
-pub(crate) fn load_keybindings(
-    rl: &mut rustyline::Editor<crate::shell::Helper>,
-) -> Result<(), nu_errors::ShellError> {
-    let filename = nu_data::keybinding::keybinding_path()?;
-    let contents = std::fs::read_to_string(filename);
-
-    // Silently fail if there is no file there
-    if let Ok(contents) = contents {
-        let keybindings: Keybindings = serde_yaml::from_str(&contents)?;
-        // eprintln!("{:#?}", keybindings);
-        for keybinding in keybindings {
-            let (k, b) = convert_keybinding(keybinding);
-            // eprintln!("{:?} {:?}", k, b);
-
-            rl.bind_sequence(k, b);
-        }
-    }
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu-cli/src/lib.rs b/old_nushell/crates/nu-cli/src/lib.rs
deleted file mode 100644
index 4b3e2fb93..000000000
--- a/old_nushell/crates/nu-cli/src/lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-pub mod app;
-mod cli;
-#[cfg(feature = "rustyline-support")]
-mod keybinding;
-mod line_editor;
-#[cfg(feature = "rustyline-support")]
-mod shell;
-
-#[cfg(feature = "rustyline-support")]
-pub use crate::cli::cli;
-
-pub use crate::app::App;
-pub use crate::cli::{parse_and_eval, register_plugins, run_script_file};
-
-pub use nu_command::create_default_context;
diff --git a/old_nushell/crates/nu-cli/src/line_editor.rs b/old_nushell/crates/nu-cli/src/line_editor.rs
deleted file mode 100644
index 7c36021b8..000000000
--- a/old_nushell/crates/nu-cli/src/line_editor.rs
+++ /dev/null
@@ -1,276 +0,0 @@
-use nu_engine::EvaluationContext;
-use nu_errors::ShellError;
-use std::error::Error;
-
-#[allow(unused_imports)]
-use std::sync::atomic::Ordering;
-
-#[allow(unused_imports)]
-use nu_engine::script::LineResult;
-
-#[cfg(feature = "rustyline-support")]
-use crate::keybinding::{convert_keyevent, KeyCode};
-
-#[cfg(feature = "rustyline-support")]
-use crate::shell::Helper;
-
-#[cfg(feature = "rustyline-support")]
-use rustyline::{
-    self,
-    config::Configurer,
-    config::{ColorMode, CompletionType, Config},
-    error::ReadlineError,
-    line_buffer::LineBuffer,
-    At, Cmd, ConditionalEventHandler, Editor, EventHandler, Modifiers, Movement, Word,
-};
-
-#[cfg(feature = "rustyline-support")]
-pub fn convert_rustyline_result_to_string(input: Result<String, ReadlineError>) -> LineResult {
-    match input {
-        Ok(s) if s == "history -c" || s == "history --clear" => LineResult::ClearHistory,
-        Ok(s) => LineResult::Success(s),
-        Err(ReadlineError::Interrupted) => LineResult::CtrlC,
-        Err(ReadlineError::Eof) => LineResult::CtrlD,
-        Err(err) => {
-            eprintln!("Error: {:?}", err);
-            LineResult::Break
-        }
-    }
-}
-
-#[derive(Clone)]
-#[cfg(feature = "rustyline-support")]
-struct PartialCompleteHintHandler;
-
-#[cfg(feature = "rustyline-support")]
-impl ConditionalEventHandler for PartialCompleteHintHandler {
-    fn handle(
-        &self,
-        _evt: &rustyline::Event,
-        _n: rustyline::RepeatCount,
-        _positive: bool,
-        ctx: &rustyline::EventContext,
-    ) -> Option<Cmd> {
-        Some(match ctx.hint_text() {
-            Some(hint_text) if ctx.pos() == ctx.line().len() => {
-                let mut line_buffer = LineBuffer::with_capacity(hint_text.len());
-                line_buffer.update(hint_text, 0);
-                line_buffer.move_to_next_word(At::AfterEnd, Word::Vi, 1);
-
-                let text = hint_text[0..line_buffer.pos()].to_string();
-
-                Cmd::Insert(1, text)
-            }
-            _ => Cmd::Move(Movement::ForwardWord(1, At::AfterEnd, Word::Vi)),
-        })
-    }
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn default_rustyline_editor_configuration() -> Editor<Helper> {
-    #[cfg(windows)]
-    const DEFAULT_COMPLETION_MODE: CompletionType = CompletionType::Circular;
-    #[cfg(not(windows))]
-    const DEFAULT_COMPLETION_MODE: CompletionType = CompletionType::List;
-
-    let config = Config::builder()
-        .check_cursor_position(true)
-        .color_mode(ColorMode::Forced)
-        .history_ignore_dups(false)
-        .max_history_size(10_000)
-        .build();
-    let mut rl: Editor<_> = Editor::with_config(config);
-
-    // add key bindings to move over a whole word with Ctrl+ArrowLeft and Ctrl+ArrowRight
-    //M modifier, E KeyEvent, K KeyCode
-    rl.bind_sequence(
-        convert_keyevent(KeyCode::Left, Some(Modifiers::CTRL)),
-        Cmd::Move(Movement::BackwardWord(1, Word::Vi)),
-    );
-
-    rl.bind_sequence(
-        convert_keyevent(KeyCode::Right, Some(Modifiers::CTRL)),
-        EventHandler::Conditional(Box::new(PartialCompleteHintHandler)),
-    );
-
-    // workaround for multiline-paste hang in rustyline (see https://github.com/kkawakam/rustyline/issues/202)
-    rl.bind_sequence(
-        convert_keyevent(KeyCode::BracketedPasteStart, None),
-        rustyline::Cmd::Noop,
-    );
-    // Let's set the defaults up front and then override them later if the user indicates
-    // defaults taken from here https://github.com/kkawakam/rustyline/blob/2fe886c9576c1ea13ca0e5808053ad491a6fe049/src/config.rs#L150-L167
-    rl.set_max_history_size(100);
-    rl.set_history_ignore_dups(true);
-    rl.set_history_ignore_space(false);
-    rl.set_completion_type(DEFAULT_COMPLETION_MODE);
-    rl.set_completion_prompt_limit(100);
-    rl.set_keyseq_timeout(-1);
-    rl.set_edit_mode(rustyline::config::EditMode::Emacs);
-    rl.set_auto_add_history(false);
-    rl.set_bell_style(rustyline::config::BellStyle::default());
-    rl.set_color_mode(rustyline::ColorMode::Enabled);
-    rl.set_tab_stop(8);
-
-    if let Err(e) = crate::keybinding::load_keybindings(&mut rl) {
-        println!("Error loading keybindings: {:?}", e);
-    }
-
-    rl
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn configure_rustyline_editor(
-    rl: &mut Editor<Helper>,
-    config: &dyn nu_data::config::Conf,
-) -> Result<(), ShellError> {
-    #[cfg(windows)]
-    const DEFAULT_COMPLETION_MODE: CompletionType = CompletionType::Circular;
-    #[cfg(not(windows))]
-    const DEFAULT_COMPLETION_MODE: CompletionType = CompletionType::List;
-
-    if let Some(line_editor_vars) = config.var("line_editor") {
-        for (idx, value) in line_editor_vars.row_entries() {
-            match idx.as_ref() {
-                "max_history_size" => {
-                    if let Ok(max_history_size) = value.as_u64() {
-                        rl.set_max_history_size(max_history_size as usize);
-                    }
-                }
-                "history_duplicates" => {
-                    // history_duplicates = match value.as_string() {
-                    //     Ok(s) if s.to_lowercase() == "alwaysadd" => {
-                    //         rustyline::config::HistoryDuplicates::AlwaysAdd
-                    //     }
-                    //     Ok(s) if s.to_lowercase() == "ignoreconsecutive" => {
-                    //         rustyline::config::HistoryDuplicates::IgnoreConsecutive
-                    //     }
-                    //     _ => rustyline::config::HistoryDuplicates::AlwaysAdd,
-                    // };
-                    if let Ok(history_duplicates) = value.as_bool() {
-                        rl.set_history_ignore_dups(history_duplicates);
-                    }
-                }
-                "history_ignore_space" => {
-                    if let Ok(history_ignore_space) = value.as_bool() {
-                        rl.set_history_ignore_space(history_ignore_space);
-                    }
-                }
-                "completion_type" => {
-                    let completion_type = match value.as_string() {
-                        Ok(s) if s.to_lowercase() == "circular" => {
-                            rustyline::config::CompletionType::Circular
-                        }
-                        Ok(s) if s.to_lowercase() == "list" => {
-                            rustyline::config::CompletionType::List
-                        }
-                        #[cfg(all(unix, feature = "with-fuzzy"))]
-                        Ok(s) if s.to_lowercase() == "fuzzy" => {
-                            rustyline::config::CompletionType::Fuzzy
-                        }
-                        _ => DEFAULT_COMPLETION_MODE,
-                    };
-                    rl.set_completion_type(completion_type);
-                }
-                "completion_prompt_limit" => {
-                    if let Ok(completion_prompt_limit) = value.as_u64() {
-                        rl.set_completion_prompt_limit(completion_prompt_limit as usize);
-                    }
-                }
-                "keyseq_timeout_ms" => {
-                    if let Ok(keyseq_timeout_ms) = value.as_u64() {
-                        rl.set_keyseq_timeout(keyseq_timeout_ms as i32);
-                    }
-                }
-                "edit_mode" => {
-                    let edit_mode = match value.as_string() {
-                        Ok(s) if s.to_lowercase() == "vi" => rustyline::config::EditMode::Vi,
-                        Ok(s) if s.to_lowercase() == "emacs" => rustyline::config::EditMode::Emacs,
-                        _ => rustyline::config::EditMode::Emacs,
-                    };
-                    rl.set_edit_mode(edit_mode);
-                    // Note: When edit_mode is Emacs, the keyseq_timeout_ms is set to -1
-                    // no matter what you may have configured. This is so that key chords
-                    // can be applied without having to do them in a given timeout. So,
-                    // it essentially turns off the keyseq timeout.
-                }
-                "auto_add_history" => {
-                    if let Ok(auto_add_history) = value.as_bool() {
-                        rl.set_auto_add_history(auto_add_history);
-                    }
-                }
-                "bell_style" => {
-                    let bell_style = match value.as_string() {
-                        Ok(s) if s.to_lowercase() == "audible" => {
-                            rustyline::config::BellStyle::Audible
-                        }
-                        Ok(s) if s.to_lowercase() == "none" => rustyline::config::BellStyle::None,
-                        Ok(s) if s.to_lowercase() == "visible" => {
-                            rustyline::config::BellStyle::Visible
-                        }
-                        _ => rustyline::config::BellStyle::default(),
-                    };
-                    rl.set_bell_style(bell_style);
-                }
-                "color_mode" => {
-                    let color_mode = match value.as_string() {
-                        Ok(s) if s.to_lowercase() == "enabled" => rustyline::ColorMode::Enabled,
-                        Ok(s) if s.to_lowercase() == "forced" => rustyline::ColorMode::Forced,
-                        Ok(s) if s.to_lowercase() == "disabled" => rustyline::ColorMode::Disabled,
-                        _ => rustyline::ColorMode::Enabled,
-                    };
-                    rl.set_color_mode(color_mode);
-                }
-                "tab_stop" => {
-                    if let Ok(tab_stop) = value.as_u64() {
-                        rl.set_tab_stop(tab_stop as usize);
-                    }
-                }
-                _ => (),
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn nu_line_editor_helper(
-    context: &EvaluationContext,
-    config: &dyn nu_data::config::Conf,
-) -> crate::shell::Helper {
-    let hinter = rustyline_hinter(config);
-    crate::shell::Helper::new(context.clone(), hinter)
-}
-
-#[cfg(feature = "rustyline-support")]
-pub fn rustyline_hinter(
-    config: &dyn nu_data::config::Conf,
-) -> Option<rustyline::hint::HistoryHinter> {
-    if let Some(line_editor_vars) = config.var("line_editor") {
-        for (idx, value) in line_editor_vars.row_entries() {
-            if idx == "show_hints" && value.as_bool() == Ok(false) {
-                return None;
-            }
-        }
-    }
-
-    Some(rustyline::hint::HistoryHinter {})
-}
-
-pub fn configure_ctrl_c(_context: &EvaluationContext) -> Result<(), Box<dyn Error>> {
-    #[cfg(feature = "ctrlc")]
-    {
-        let cc = _context.ctrl_c().clone();
-
-        ctrlc::set_handler(move || {
-            cc.store(true, Ordering::SeqCst);
-        })?;
-
-        if _context.ctrl_c().load(Ordering::SeqCst) {
-            _context.ctrl_c().store(false, Ordering::SeqCst);
-        }
-    }
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu-cli/src/shell.rs b/old_nushell/crates/nu-cli/src/shell.rs
deleted file mode 100644
index ce7ef7a3a..000000000
--- a/old_nushell/crates/nu-cli/src/shell.rs
+++ /dev/null
@@ -1,234 +0,0 @@
-use nu_ansi_term::Color;
-use nu_completion::NuCompleter;
-use nu_engine::{DefaultPalette, EvaluationContext, Painter};
-use nu_source::{Tag, Tagged};
-use std::borrow::Cow::{self, Owned};
-
-pub struct Helper {
-    completer: NuCompleter,
-    hinter: Option<rustyline::hint::HistoryHinter>,
-    context: EvaluationContext,
-    pub colored_prompt: String,
-    validator: NuValidator,
-}
-
-impl Helper {
-    pub(crate) fn new(
-        context: EvaluationContext,
-        hinter: Option<rustyline::hint::HistoryHinter>,
-    ) -> Helper {
-        Helper {
-            completer: NuCompleter {},
-            hinter,
-            context,
-            colored_prompt: String::new(),
-            validator: NuValidator {},
-        }
-    }
-}
-
-use nu_protocol::{SignatureRegistry, VariableRegistry};
-struct CompletionContext<'a>(&'a EvaluationContext);
-
-impl<'a> nu_completion::CompletionContext for CompletionContext<'a> {
-    fn signature_registry(&self) -> &dyn SignatureRegistry {
-        &self.0.scope
-    }
-
-    fn scope(&self) -> &dyn nu_parser::ParserScope {
-        &self.0.scope
-    }
-
-    fn source(&self) -> &EvaluationContext {
-        self.as_ref()
-    }
-
-    fn variable_registry(&self) -> &dyn VariableRegistry {
-        self.0
-    }
-}
-
-impl<'a> AsRef<EvaluationContext> for CompletionContext<'a> {
-    fn as_ref(&self) -> &EvaluationContext {
-        self.0
-    }
-}
-
-pub struct CompletionSuggestion(nu_completion::Suggestion);
-
-impl rustyline::completion::Candidate for CompletionSuggestion {
-    fn display(&self) -> &str {
-        &self.0.display
-    }
-
-    fn replacement(&self) -> &str {
-        &self.0.replacement
-    }
-}
-
-impl rustyline::completion::Completer for Helper {
-    type Candidate = CompletionSuggestion;
-
-    fn complete(
-        &self,
-        line: &str,
-        pos: usize,
-        _ctx: &rustyline::Context<'_>,
-    ) -> Result<(usize, Vec<Self::Candidate>), rustyline::error::ReadlineError> {
-        let ctx = CompletionContext(&self.context);
-        let (position, suggestions) = self.completer.complete(line, pos, &ctx);
-        let suggestions = suggestions.into_iter().map(CompletionSuggestion).collect();
-        Ok((position, suggestions))
-    }
-
-    fn update(&self, line: &mut rustyline::line_buffer::LineBuffer, start: usize, elected: &str) {
-        let end = line.pos();
-        line.replace(start..end, elected)
-    }
-}
-
-impl rustyline::hint::Hinter for Helper {
-    type Hint = String;
-    fn hint(&self, line: &str, pos: usize, ctx: &rustyline::Context<'_>) -> Option<String> {
-        match &self.hinter {
-            Some(the_hinter) => the_hinter.hint(line, pos, ctx),
-            None => Some("".to_string()),
-        }
-    }
-}
-
-impl rustyline::highlight::Highlighter for Helper {
-    fn highlight_prompt<'b, 's: 'b, 'p: 'b>(
-        &'s self,
-        prompt: &'p str,
-        default: bool,
-    ) -> Cow<'b, str> {
-        use std::borrow::Cow::Borrowed;
-
-        if default {
-            Borrowed(&self.colored_prompt)
-        } else {
-            Borrowed(prompt)
-        }
-    }
-
-    fn highlight_hint<'h>(&self, hint: &'h str) -> Cow<'h, str> {
-        Owned(Color::DarkGray.prefix().to_string() + hint + nu_ansi_term::ansi::RESET)
-    }
-
-    fn highlight<'l>(&self, line: &'l str, _pos: usize) -> Cow<'l, str> {
-        let cfg = &self.context.configs().lock();
-        if let Some(palette) = &cfg.syntax_config {
-            Painter::paint_string(line, &self.context.scope, palette)
-        } else {
-            Painter::paint_string(line, &self.context.scope, &DefaultPalette {})
-        }
-    }
-
-    fn highlight_char(&self, _line: &str, _pos: usize) -> bool {
-        true
-    }
-}
-
-impl rustyline::validate::Validator for Helper {
-    fn validate(
-        &self,
-        ctx: &mut rustyline::validate::ValidationContext,
-    ) -> rustyline::Result<rustyline::validate::ValidationResult> {
-        self.validator.validate(ctx)
-    }
-
-    fn validate_while_typing(&self) -> bool {
-        self.validator.validate_while_typing()
-    }
-}
-
-struct NuValidator {}
-
-impl rustyline::validate::Validator for NuValidator {
-    fn validate(
-        &self,
-        ctx: &mut rustyline::validate::ValidationContext,
-    ) -> rustyline::Result<rustyline::validate::ValidationResult> {
-        let src = ctx.input();
-
-        let (tokens, err) = nu_parser::lex(src, 0, nu_parser::NewlineMode::Normal);
-        if let Some(err) = err {
-            if let nu_errors::ParseErrorReason::Eof { .. } = err.reason() {
-                return Ok(rustyline::validate::ValidationResult::Incomplete);
-            }
-        }
-
-        let (_, err) = nu_parser::parse_block(tokens);
-
-        if let Some(err) = err {
-            if let nu_errors::ParseErrorReason::Eof { .. } = err.reason() {
-                return Ok(rustyline::validate::ValidationResult::Incomplete);
-            }
-        }
-
-        Ok(rustyline::validate::ValidationResult::Valid(None))
-    }
-}
-
-#[allow(unused)]
-fn vec_tag<T>(input: Vec<Tagged<T>>) -> Option<Tag> {
-    let mut iter = input.iter();
-    let first = iter.next()?.tag.clone();
-    let last = iter.last();
-
-    Some(match last {
-        None => first,
-        Some(last) => first.until(&last.tag),
-    })
-}
-
-impl rustyline::Helper for Helper {}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use nu_engine::EvaluationContext;
-    use rustyline::completion::Completer;
-    use rustyline::line_buffer::LineBuffer;
-
-    #[ignore]
-    #[test]
-    fn closing_quote_should_replaced() {
-        let text = "cd \"folder with spaces\\subdirectory\\\"";
-        let replacement = "\"folder with spaces\\subdirectory\\subsubdirectory\\\"";
-
-        let mut buffer = LineBuffer::with_capacity(256);
-        buffer.insert_str(0, text);
-        buffer.set_pos(text.len() - 1);
-
-        let helper = Helper::new(EvaluationContext::basic(), None);
-
-        helper.update(&mut buffer, "cd ".len(), replacement);
-
-        assert_eq!(
-            buffer.as_str(),
-            "cd \"folder with spaces\\subdirectory\\subsubdirectory\\\""
-        );
-    }
-
-    #[ignore]
-    #[test]
-    fn replacement_with_cursor_in_text() {
-        let text = "cd \"folder with spaces\\subdirectory\\\"";
-        let replacement = "\"folder with spaces\\subdirectory\\subsubdirectory\\\"";
-
-        let mut buffer = LineBuffer::with_capacity(256);
-        buffer.insert_str(0, text);
-        buffer.set_pos(text.len() - 30);
-
-        let helper = Helper::new(EvaluationContext::basic(), None);
-
-        helper.update(&mut buffer, "cd ".len(), replacement);
-
-        assert_eq!(
-            buffer.as_str(),
-            "cd \"folder with spaces\\subdirectory\\subsubdirectory\\\""
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-command/Cargo.toml b/old_nushell/crates/nu-command/Cargo.toml
deleted file mode 100644
index 943bc4480..000000000
--- a/old_nushell/crates/nu-command/Cargo.toml
+++ /dev/null
@@ -1,122 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-build = "build.rs"
-description = "Commands for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-command"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-data = { version = "0.43.0", path="../nu-data" }
-nu-engine = { version = "0.43.0", path="../nu-engine" }
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-json = { version = "0.43.0", path="../nu-json" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-parser = { version = "0.43.0", path="../nu-parser" }
-nu-plugin = { version = "0.43.0", path="../nu-plugin" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-serde = { version = "0.43.0", path="../nu-serde" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-stream = { version = "0.43.0", path="../nu-stream" }
-nu-table = { version = "0.43.0", path="../nu-table" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-nu-value-ext = { version = "0.43.0", path="../nu-value-ext" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-nu-pretty-hex = { version = "0.43.0", path="../nu-pretty-hex" }
-
-url = "2.2.1"
-mime = "0.3.16"
-heck = "0.4.0"
-base64 = "0.13.0"
-bigdecimal = { version = "0.3.0", features = ["serde"] }
-calamine = "0.18.0"
-chrono = { version="0.4.19", features=["serde"] }
-chrono-tz = "0.5.3"
-crossterm = { version="0.19.0", optional=true }
-csv = "1.1.3"
-ctrlc = { version="3.1.7", optional=true }
-derive-new = "0.5.8"
-dirs-next = "2.0.0"
-dtparse = "1.2.0"
-eml-parser = "0.1.0"
-encoding_rs = "0.8.28"
-filesize = "0.2.0"
-futures = { version="0.3.12", features=["compat", "io-compat"] }
-glob = "0.3.0"
-htmlescape = "0.3.1"
-ical = "0.7.0"
-indexmap = { version="1.7", features=["serde-1"] }
-itertools = "0.10.0"
-lazy_static = "1.*"
-log = "0.4.14"
-md-5 = "0.9.1"
-meval = "0.2.0"
-num-bigint = { version="0.4.3", features=["serde"] }
-num-format = { version="0.4.0", features=["with-num-bigint"] }
-num-traits = "0.2.14"
-parking_lot = "0.11.1"
-quick-xml = "0.22"
-rand = "0.8"
-regex = "1.4.3"
-reqwest = {version = "0.11", optional = true }
-roxmltree = "0.14.0"
-rust-embed = "5.9.0"
-rustyline = { version="9.0.0", optional=true }
-serde = { version="1.0.123", features=["derive"] }
-serde_ini = "0.2.0"
-serde_json = "1.0.61"
-serde_urlencoded = "0.7.0"
-serde_yaml = "0.8.16"
-sha2 = "0.9.3"
-strip-ansi-escapes = "0.1.0"
-sysinfo = { version = "0.23.0", optional = true }
-thiserror = "1.0.26"
-term = { version="0.7.0", optional=true }
-term_size = "0.3.2"
-titlecase = "1.1.0"
-tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
-toml = "0.5.8"
-trash = { version = "2.0.2", optional = true }
-unicode-segmentation = "1.8"
-uuid_crate = { package="uuid", version="0.8.2", features=["v4"], optional=true }
-which = { version="4.1.0", optional=true }
-zip = { version="0.5.9", optional=true }
-digest = "0.9.0"
-
-[dependencies.polars]
-version = "0.17.0"
-optional = true
-default-features = false
-features = ["docs", "zip_with", "csv-file", "temporal", "performant", "pretty_fmt", "dtype-slim", "parquet", "json", "random", "pivot", "strings", "is_in", "cum_agg", "rolling_window"]
-
-[target.'cfg(unix)'.dependencies]
-umask = "1.0.0"
-users = "0.11.0"
-
-# TODO this will be possible with new dependency resolver
-#   (currently on nightly behind -Zfeatures=itarget):
-#   https://github.com/rust-lang/cargo/issues/7914
-# [target.'cfg(not(windows))'.dependencies]
-# num-format = { version = "0.4", features = ["with-system-locale"] }
-
-[build-dependencies]
-shadow-rs = "0.8.1"
-
-[dev-dependencies]
-quickcheck = "1.0.3"
-quickcheck_macros = "1.0.0"
-hamcrest2 = "0.3.0"
-
-[features]
-rustyline-support = ["rustyline"]
-stable = []
-trash-support = ["trash"]
-dataframe = ["nu-protocol/dataframe", "polars"]
-fetch = ["reqwest", "tokio"]
-post = ["reqwest", "tokio"]
-sys = ["sysinfo"]
-ps = ["sysinfo"]
diff --git a/old_nushell/crates/nu-command/README.md b/old_nushell/crates/nu-command/README.md
deleted file mode 100644
index b9f0857cb..000000000
--- a/old_nushell/crates/nu-command/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# nu-command
-
-The Nu command crate contains the full set of internal commands, that is, the commands that can be form the set of built-in commands in a Nushell engine.
-
-The default set of commands that Nushell ships with can be found in the [default context](src/default_context.rs).
-
-The commands themselves live in the [commands module](src/commands/).
diff --git a/old_nushell/crates/nu-command/assets/228_themes.zip b/old_nushell/crates/nu-command/assets/228_themes.zip
deleted file mode 100644
index eca629d50..000000000
Binary files a/old_nushell/crates/nu-command/assets/228_themes.zip and /dev/null differ
diff --git a/old_nushell/crates/nu-command/build.rs b/old_nushell/crates/nu-command/build.rs
deleted file mode 100644
index 4a0dfc459..000000000
--- a/old_nushell/crates/nu-command/build.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() -> shadow_rs::SdResult<()> {
-    shadow_rs::new()
-}
diff --git a/old_nushell/crates/nu-command/src/args.rs b/old_nushell/crates/nu-command/src/args.rs
deleted file mode 100644
index 2e6961888..000000000
--- a/old_nushell/crates/nu-command/src/args.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use nu_protocol::Value;
-
-#[derive(Debug)]
-pub enum LogLevel {}
-
-#[derive(Debug)]
-pub struct LogItem {
-    level: LogLevel,
-    value: Value,
-}
diff --git a/old_nushell/crates/nu-command/src/classified/external.rs b/old_nushell/crates/nu-command/src/classified/external.rs
deleted file mode 100644
index 716d830a2..000000000
--- a/old_nushell/crates/nu-command/src/classified/external.rs
+++ /dev/null
@@ -1,725 +0,0 @@
-use crate::prelude::*;
-use lazy_static::lazy_static;
-use nu_engine::{evaluate_baseline_expr, BufCodecReader};
-use nu_engine::{MaybeTextCodec, StringOrBinary};
-use nu_test_support::NATIVE_PATH_ENV_VAR;
-use parking_lot::Mutex;
-use regex::Regex;
-
-#[allow(unused)]
-use std::env;
-use std::io::Write;
-use std::path::PathBuf;
-use std::process::{Command, Stdio};
-use std::sync::mpsc;
-use std::{borrow::Cow, io::BufReader};
-
-use log::trace;
-
-use nu_errors::ShellError;
-use nu_protocol::hir::Expression;
-use nu_protocol::hir::{ExternalCommand, ExternalRedirection};
-use nu_protocol::{Primitive, ShellTypeName, UntaggedValue, Value};
-use nu_source::Tag;
-
-#[cfg(feature = "which")]
-use which::which_in;
-
-pub(crate) fn run_external_command(
-    command: ExternalCommand,
-    context: &mut EvaluationContext,
-    input: InputStream,
-    external_redirection: ExternalRedirection,
-) -> Result<InputStream, ShellError> {
-    trace!(target: "nu::run::external", "-> {}", command.name);
-
-    context.sync_path_to_env();
-    if !context.host().lock().is_external_cmd(&command.name) {
-        return Err(ShellError::labeled_error(
-            "Command not found",
-            format!("command {} not found", &command.name),
-            &command.name_tag,
-        ));
-    }
-
-    run_with_stdin(command, context, input, external_redirection)
-}
-
-#[allow(unused)]
-fn trim_enclosing_quotes(input: &str) -> String {
-    let mut chars = input.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some('"'), Some('"')) => chars.collect(),
-        (Some('\''), Some('\'')) => chars.collect(),
-        _ => input.to_string(),
-    }
-}
-
-fn run_with_stdin(
-    command: ExternalCommand,
-    context: &mut EvaluationContext,
-    input: InputStream,
-    external_redirection: ExternalRedirection,
-) -> Result<InputStream, ShellError> {
-    let path = context.shell_manager().path();
-
-    let mut command_args = vec![];
-    for arg in command.args.iter() {
-        let is_literal = matches!(arg.expr, Expression::Literal(_));
-        let value = evaluate_baseline_expr(arg, context)?;
-
-        // Skip any arguments that don't really exist, treating them as optional
-        // FIXME: we may want to preserve the gap in the future, though it's hard to say
-        // what value we would put in its place.
-        if value.value.is_none() {
-            continue;
-        }
-
-        // Do the cleanup that we need to do on any argument going out:
-        match &value.value {
-            UntaggedValue::Table(table) => {
-                for t in table {
-                    match &t.value {
-                        UntaggedValue::Primitive(_) => {
-                            command_args.push((
-                                t.convert_to_string().trim_end_matches('\n').to_string(),
-                                is_literal,
-                            ));
-                        }
-                        _ => {
-                            return Err(ShellError::labeled_error(
-                                "Could not convert to positional arguments",
-                                "could not convert to positional arguments",
-                                value.tag(),
-                            ));
-                        }
-                    }
-                }
-            }
-            _ => {
-                let trimmed_value_string = value.as_string()?.trim_end_matches('\n').to_string();
-                //let trimmed_value_string = trim_quotes(&trimmed_value_string);
-                command_args.push((trimmed_value_string, is_literal));
-            }
-        }
-    }
-
-    let process_args = command_args
-        .iter()
-        .map(|(arg, _is_literal)| {
-            let arg = nu_path::expand_tilde(arg).to_string_lossy().to_string();
-
-            #[cfg(not(windows))]
-            {
-                if !_is_literal {
-                    arg
-                } else {
-                    trim_enclosing_quotes(&arg)
-                }
-            }
-            #[cfg(windows)]
-            {
-                if let Some(unquoted) = remove_quotes(&arg) {
-                    unquoted.to_string()
-                } else {
-                    arg
-                }
-            }
-        })
-        .collect::<Vec<String>>();
-
-    spawn(
-        &command,
-        &path,
-        &process_args[..],
-        input,
-        external_redirection,
-        &context.scope,
-    )
-}
-
-/// Spawn a direct exe
-#[allow(unused)]
-fn spawn_exe(full_path: PathBuf, args: &[String]) -> Command {
-    let mut process = Command::new(full_path);
-    for arg in args {
-        process.arg(&arg);
-    }
-    process
-}
-
-/// Spawn a cmd command with `cmd /c args...`
-fn spawn_cmd_command(command: &ExternalCommand, args: &[String]) -> Command {
-    let mut process = Command::new("cmd");
-    process.arg("/c");
-    process.arg(&command.name);
-    for arg in args {
-        // Clean the args before we use them:
-        // https://stackoverflow.com/questions/1200235/how-to-pass-a-quoted-pipe-character-to-cmd-exe
-        // cmd.exe needs to have a caret to escape a pipe
-        let arg = arg.replace("|", "^|");
-        process.arg(&arg);
-    }
-    process
-}
-
-fn has_unsafe_shell_characters(arg: &str) -> bool {
-    lazy_static! {
-        static ref RE: Regex = Regex::new(r"[^\w@%+=:,./-]").expect("regex to be valid");
-    }
-
-    RE.is_match(arg)
-}
-
-fn shell_arg_escape(arg: &str) -> String {
-    match arg {
-        "" => String::from("''"),
-        s if !has_unsafe_shell_characters(s) => String::from(s),
-        _ => {
-            let single_quotes_escaped = arg.split('\'').join("'\"'\"'");
-            format!("'{}'", single_quotes_escaped)
-        }
-    }
-}
-
-/// Spawn a sh command with `sh -c args...`
-fn spawn_sh_command(command: &ExternalCommand, args: &[String]) -> Command {
-    let joined_and_escaped_arguments = args.iter().map(|arg| shell_arg_escape(arg)).join(" ");
-    let cmd_with_args = vec![command.name.clone(), joined_and_escaped_arguments].join(" ");
-    let mut process = Command::new("sh");
-    process.arg("-c").arg(cmd_with_args);
-    process
-}
-
-/// a function to spawn any external command
-#[allow(unused)] // for minimal builds cwd is unused
-fn spawn_any(command: &ExternalCommand, args: &[String], cwd: &str) -> Command {
-    // resolve the executable name if it is spawnable directly
-    #[cfg(feature = "which")]
-    // TODO add more available paths to `env::var_os("PATH")`?
-    if let Result::Ok(full_path) = which_in(&command.name, env::var_os("PATH"), cwd) {
-        if let Some(extension) = full_path.extension() {
-            #[cfg(windows)]
-            if extension.eq_ignore_ascii_case("exe") {
-                // if exe spawn it directly
-                return spawn_exe(full_path, args);
-            } else {
-                // TODO implement special care for various executable types such as .bat, .ps1, .cmd, etc
-                // https://github.com/mklement0/Native/blob/e0e0b8785cad39a73053e35084d1f60d87fbac58/Native.psm1#L749
-                // otherwise shell out to cmd
-                return spawn_cmd_command(command, args);
-            }
-            #[cfg(not(windows))]
-            if !["sh", "bash"]
-                .iter()
-                .any(|ext| extension.eq_ignore_ascii_case(ext))
-            {
-                // if exe spawn it directly
-                return spawn_exe(full_path, args);
-            } else {
-                // otherwise shell out to sh
-                return spawn_sh_command(command, args);
-            }
-        }
-    }
-    // in all the other cases shell out
-    if cfg!(windows) {
-        spawn_cmd_command(command, args)
-    } else {
-        // TODO what happens if that os doesn't support spawning sh?
-        spawn_sh_command(command, args)
-    }
-}
-
-fn spawn(
-    command: &ExternalCommand,
-    path: &str,
-    args: &[String],
-    input: InputStream,
-    external_redirection: ExternalRedirection,
-    scope: &Scope,
-) -> Result<InputStream, ShellError> {
-    let command = command.clone();
-
-    let mut process = spawn_any(&command, args, path);
-    process.current_dir(path);
-    trace!(target: "nu::run::external", "cwd = {:?}", &path);
-
-    process.env_clear();
-    process.envs(scope.get_env_vars());
-
-    // We want stdout regardless of what
-    // we are doing ($it case or pipe stdin)
-    match external_redirection {
-        ExternalRedirection::Stdout => {
-            process.stdout(Stdio::piped());
-            trace!(target: "nu::run::external", "set up stdout pipe");
-        }
-        ExternalRedirection::Stderr => {
-            process.stderr(Stdio::piped());
-            trace!(target: "nu::run::external", "set up stderr pipe");
-        }
-        ExternalRedirection::StdoutAndStderr => {
-            process.stdout(Stdio::piped());
-            trace!(target: "nu::run::external", "set up stdout pipe");
-            process.stderr(Stdio::piped());
-            trace!(target: "nu::run::external", "set up stderr pipe");
-        }
-        _ => {}
-    }
-
-    // open since we have some contents for stdin
-    if !input.is_empty() {
-        process.stdin(Stdio::piped());
-        trace!(target: "nu::run::external", "set up stdin pipe");
-    }
-
-    trace!(target: "nu::run::external", "built command {:?}", process);
-
-    // TODO Switch to async_std::process once it's stabilized
-    match process.spawn() {
-        Ok(mut child) => {
-            let (tx, rx) = mpsc::sync_channel(0);
-
-            let mut stdin = child.stdin.take();
-
-            let stdin_write_tx = tx.clone();
-            let stdout_read_tx = tx;
-            let stdin_name_tag = command.name_tag.clone();
-            let stdout_name_tag = command.name_tag;
-
-            std::thread::spawn(move || {
-                if !input.is_empty() {
-                    let mut stdin_write = stdin
-                        .take()
-                        .expect("Internal error: could not get stdin pipe for external command");
-
-                    for value in input {
-                        match &value.value {
-                            UntaggedValue::Primitive(Primitive::Nothing) => continue,
-                            UntaggedValue::Primitive(Primitive::String(s)) => {
-                                if stdin_write.write(s.as_bytes()).is_err() {
-                                    // Other side has closed, so exit
-                                    return Ok(());
-                                }
-                            }
-                            UntaggedValue::Primitive(Primitive::Binary(b)) => {
-                                if stdin_write.write(b).is_err() {
-                                    // Other side has closed, so exit
-                                    return Ok(());
-                                }
-                            }
-                            unsupported => {
-                                println!("Unsupported: {:?}", unsupported);
-                                let _ = stdin_write_tx.send(Ok(Value {
-                                    value: UntaggedValue::Error(ShellError::labeled_error(
-                                        format!(
-                                            "Received unexpected type from pipeline ({})",
-                                            unsupported.type_name()
-                                        ),
-                                        format!(
-                                            "expected a string, got {} as input",
-                                            unsupported.type_name()
-                                        ),
-                                        stdin_name_tag.clone(),
-                                    )),
-                                    tag: stdin_name_tag,
-                                }));
-                                return Err(());
-                            }
-                        };
-                    }
-                }
-
-                Ok(())
-            });
-
-            std::thread::spawn(move || {
-                if external_redirection == ExternalRedirection::Stdout
-                    || external_redirection == ExternalRedirection::StdoutAndStderr
-                {
-                    let stdout = if let Some(stdout) = child.stdout.take() {
-                        stdout
-                    } else {
-                        let _ = stdout_read_tx.send(Ok(Value {
-                            value: UntaggedValue::Error(ShellError::labeled_error(
-                                "Can't redirect the stdout for external command",
-                                "can't redirect stdout",
-                                &stdout_name_tag,
-                            )),
-                            tag: stdout_name_tag,
-                        }));
-                        return Err(());
-                    };
-
-                    // let file = futures::io::AllowStdIo::new(stdout);
-                    // let stream = FramedRead::new(file, MaybeTextCodec::default());
-                    let buf_read = BufReader::new(stdout);
-                    let buf_codec = BufCodecReader::new(buf_read, MaybeTextCodec::default());
-
-                    for line in buf_codec {
-                        match line {
-                            Ok(line) => match line {
-                                StringOrBinary::String(s) => {
-                                    let result = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Primitive(Primitive::String(
-                                            s.clone(),
-                                        )),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-
-                                    if result.is_err() {
-                                        break;
-                                    }
-                                }
-                                StringOrBinary::Binary(b) => {
-                                    let result = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Primitive(Primitive::Binary(
-                                            b.into_iter().collect(),
-                                        )),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-
-                                    if result.is_err() {
-                                        break;
-                                    }
-                                }
-                            },
-                            Err(e) => {
-                                // If there's an exit status, it makes sense that we may error when
-                                // trying to read from its stdout pipe (likely been closed). In that
-                                // case, don't emit an error.
-                                let should_error = match child.wait() {
-                                    Ok(exit_status) => !exit_status.success(),
-                                    Err(_) => true,
-                                };
-
-                                if should_error {
-                                    let _ = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Error(ShellError::labeled_error(
-                                            format!("Unable to read from stdout ({})", e),
-                                            "unable to read from stdout",
-                                            &stdout_name_tag,
-                                        )),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-                                }
-
-                                return Ok(());
-                            }
-                        }
-                    }
-                }
-                if external_redirection == ExternalRedirection::Stderr
-                    || external_redirection == ExternalRedirection::StdoutAndStderr
-                {
-                    let stderr = if let Some(stderr) = child.stderr.take() {
-                        stderr
-                    } else {
-                        let _ = stdout_read_tx.send(Ok(Value {
-                            value: UntaggedValue::Error(ShellError::labeled_error(
-                                "Can't redirect the stderr for external command",
-                                "can't redirect stderr",
-                                &stdout_name_tag,
-                            )),
-                            tag: stdout_name_tag,
-                        }));
-                        return Err(());
-                    };
-
-                    // let file = futures::io::AllowStdIo::new(stderr);
-                    // let stream = FramedRead::new(file, MaybeTextCodec::default());
-                    let buf_reader = BufReader::new(stderr);
-                    let buf_codec = BufCodecReader::new(buf_reader, MaybeTextCodec::default());
-
-                    for line in buf_codec {
-                        match line {
-                            Ok(line) => match line {
-                                StringOrBinary::String(s) => {
-                                    let result = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Error(
-                                            ShellError::untagged_runtime_error(s),
-                                        ),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-
-                                    if result.is_err() {
-                                        break;
-                                    }
-                                }
-                                StringOrBinary::Binary(_) => {
-                                    let result = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Error(
-                                            ShellError::untagged_runtime_error("<binary stderr>"),
-                                        ),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-
-                                    if result.is_err() {
-                                        break;
-                                    }
-                                }
-                            },
-                            Err(e) => {
-                                // If there's an exit status, it makes sense that we may error when
-                                // trying to read from its stdout pipe (likely been closed). In that
-                                // case, don't emit an error.
-                                let should_error = match child.wait() {
-                                    Ok(exit_status) => !exit_status.success(),
-                                    Err(_) => true,
-                                };
-
-                                if should_error {
-                                    let _ = stdout_read_tx.send(Ok(Value {
-                                        value: UntaggedValue::Error(ShellError::labeled_error(
-                                            format!("Unable to read from stdout ({})", e),
-                                            "unable to read from stdout",
-                                            &stdout_name_tag,
-                                        )),
-                                        tag: stdout_name_tag.clone(),
-                                    }));
-                                }
-
-                                return Ok(());
-                            }
-                        }
-                    }
-                }
-
-                // We can give an error when we see a non-zero exit code, but this is different
-                // than what other shells will do.
-                let external_failed = match child.wait() {
-                    Err(_) => true,
-                    Ok(exit_status) => !exit_status.success(),
-                };
-
-                if external_failed {
-                    let cfg = nu_data::config::config(Tag::unknown());
-                    if let Ok(cfg) = cfg {
-                        if cfg.contains_key("nonzero_exit_errors") {
-                            let _ = stdout_read_tx.send(Ok(Value {
-                                value: UntaggedValue::Error(ShellError::labeled_error(
-                                    "External command failed",
-                                    "command failed",
-                                    &stdout_name_tag,
-                                )),
-                                tag: stdout_name_tag.clone(),
-                            }));
-                        }
-                    }
-                    let _ = stdout_read_tx.send(Ok(Value {
-                        value: UntaggedValue::nothing(),
-                        tag: stdout_name_tag,
-                    }));
-                }
-
-                Ok(())
-            });
-
-            let stream = ChannelReceiver::new(rx);
-            Ok(stream.into_input_stream())
-        }
-        Err(e) => Err(ShellError::labeled_error(
-            e.to_string(),
-            "failed to spawn",
-            &command.name_tag,
-        )),
-    }
-}
-
-struct ChannelReceiver {
-    rx: Arc<Mutex<mpsc::Receiver<Result<Value, ShellError>>>>,
-}
-
-impl ChannelReceiver {
-    pub fn new(rx: mpsc::Receiver<Result<Value, ShellError>>) -> Self {
-        Self {
-            rx: Arc::new(Mutex::new(rx)),
-        }
-    }
-}
-
-impl Iterator for ChannelReceiver {
-    type Item = Result<Value, ShellError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let rx = self.rx.lock();
-        match rx.recv() {
-            Ok(v) => Some(v),
-            Err(_) => None,
-        }
-    }
-}
-
-fn argument_is_quoted(argument: &str) -> bool {
-    if argument.len() < 2 {
-        return false;
-    }
-
-    (argument.starts_with('"') && argument.ends_with('"'))
-        || (argument.starts_with('\'') && argument.ends_with('\''))
-}
-
-#[allow(unused)]
-fn add_double_quotes(argument: &str) -> String {
-    format!("\"{}\"", argument)
-}
-
-#[allow(unused)]
-fn escape_double_quotes(argument: &str) -> Cow<'_, str> {
-    // allocate new string only if required
-    if argument.contains('"') {
-        Cow::Owned(argument.replace('"', r#"\""#))
-    } else {
-        Cow::Borrowed(argument)
-    }
-}
-
-#[allow(unused)]
-fn remove_quotes(argument: &str) -> Option<&str> {
-    if !argument_is_quoted(argument) {
-        return None;
-    }
-
-    let size = argument.len();
-
-    Some(&argument[1..size - 1])
-}
-
-#[allow(unused)]
-fn shell_os_paths() -> Vec<std::path::PathBuf> {
-    let mut original_paths = vec![];
-
-    if let Some(paths) = std::env::var_os(NATIVE_PATH_ENV_VAR) {
-        original_paths = std::env::split_paths(&paths).collect::<Vec<_>>();
-    }
-
-    original_paths
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{add_double_quotes, argument_is_quoted, escape_double_quotes, remove_quotes};
-    #[cfg(feature = "which")]
-    use super::{run_external_command, InputStream};
-
-    #[cfg(feature = "which")]
-    use nu_engine::EvaluationContext;
-
-    #[cfg(feature = "which")]
-    use nu_test_support::commands::ExternalBuilder;
-    // fn read(mut stream: OutputStream) -> Option<Value> {
-    //     match stream.try_next() {
-    //         Ok(val) => {
-    //             if let Some(val) = val {
-    //                 val.raw_value()
-    //             } else {
-    //                 None
-    //             }
-    //         }
-    //         Err(_) => None,
-    //     }
-    // }
-
-    #[cfg(feature = "which")]
-    fn non_existent_run() {
-        use nu_protocol::hir::ExternalRedirection;
-        let cmd = ExternalBuilder::for_name("i_dont_exist.exe").build();
-
-        let input = InputStream::empty();
-        let mut ctx = EvaluationContext::basic();
-
-        assert!(run_external_command(cmd, &mut ctx, input, ExternalRedirection::Stdout).is_err());
-    }
-
-    // fn failure_run() -> Result<(), ShellError> {
-    //     let cmd = ExternalBuilder::for_name("fail").build();
-
-    //     let mut ctx = crate::cli::EvaluationContext::basic().expect("There was a problem creating a basic context.");
-    //     let stream = run_external_command(cmd, &mut ctx, None, false)
-    //         ?
-    //         .expect("There was a problem running the external command.");
-
-    //     match read(stream.into()) {
-    //         Some(Value {
-    //             value: UntaggedValue::Error(_),
-    //             ..
-    //         }) => {}
-    //         None | _ => panic!("Command didn't fail."),
-    //     }
-
-    //     Ok(())
-    // }
-
-    // #[test]
-    // fn identifies_command_failed() -> Result<(), ShellError> {
-    //     block_on(failure_run())
-    // }
-
-    #[cfg(feature = "which")]
-    #[test]
-    fn identifies_command_not_found() {
-        non_existent_run()
-    }
-
-    #[test]
-    fn checks_escape_double_quotes() {
-        assert_eq!(escape_double_quotes("andrés"), "andrés");
-        assert_eq!(escape_double_quotes(r#"an"drés"#), r#"an\"drés"#);
-        assert_eq!(escape_double_quotes(r#""an"drés""#), r#"\"an\"drés\""#);
-    }
-
-    #[test]
-    fn checks_quotes_from_argument_to_be_passed_in() {
-        assert!(!argument_is_quoted(""));
-
-        assert!(!argument_is_quoted("'"));
-        assert!(!argument_is_quoted("'a"));
-        assert!(!argument_is_quoted("a"));
-        assert!(!argument_is_quoted("a'"));
-        assert!(argument_is_quoted("''"));
-
-        assert!(!argument_is_quoted(r#"""#));
-        assert!(!argument_is_quoted(r#""a"#));
-        assert!(!argument_is_quoted(r#"a"#));
-        assert!(!argument_is_quoted(r#"a""#));
-        assert!(argument_is_quoted(r#""""#));
-
-        assert!(!argument_is_quoted("'andrés"));
-        assert!(!argument_is_quoted("andrés'"));
-        assert!(!argument_is_quoted(r#""andrés"#));
-        assert!(!argument_is_quoted(r#"andrés""#));
-        assert!(argument_is_quoted("'andrés'"));
-        assert!(argument_is_quoted(r#""andrés""#));
-    }
-
-    #[test]
-    fn adds_double_quotes_to_argument_to_be_passed_in() {
-        assert_eq!(add_double_quotes("andrés"), "\"andrés\"");
-    }
-
-    #[test]
-    fn strips_quotes_from_argument_to_be_passed_in() {
-        assert_eq!(remove_quotes(""), None);
-
-        assert_eq!(remove_quotes("'"), None);
-        assert_eq!(remove_quotes("'a"), None);
-        assert_eq!(remove_quotes("a"), None);
-        assert_eq!(remove_quotes("a'"), None);
-        assert_eq!(remove_quotes("''"), Some(""));
-
-        assert_eq!(remove_quotes(r#"""#), None);
-        assert_eq!(remove_quotes(r#""a"#), None);
-        assert_eq!(remove_quotes(r#"a"#), None);
-        assert_eq!(remove_quotes(r#"a""#), None);
-        assert_eq!(remove_quotes(r#""""#), Some(""));
-
-        assert_eq!(remove_quotes("'andrés"), None);
-        assert_eq!(remove_quotes("andrés'"), None);
-        assert_eq!(remove_quotes(r#""andrés"#), None);
-        assert_eq!(remove_quotes(r#"andrés""#), None);
-        assert_eq!(remove_quotes("'andrés'"), Some("andrés"));
-        assert_eq!(remove_quotes(r#""andrés""#), Some("andrés"));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/classified/mod.rs b/old_nushell/crates/nu-command/src/classified/mod.rs
deleted file mode 100644
index 04016e9e7..000000000
--- a/old_nushell/crates/nu-command/src/classified/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub(crate) mod external;
diff --git a/old_nushell/crates/nu-command/src/commands/charting/chart.rs b/old_nushell/crates/nu-command/src/commands/charting/chart.rs
deleted file mode 100644
index edc6f59f5..000000000
--- a/old_nushell/crates/nu-command/src/commands/charting/chart.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-
-#[derive(Clone)]
-pub struct Chart;
-
-impl WholeStreamCommand for Chart {
-    fn name(&self) -> &str {
-        "chart"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("chart")
-    }
-
-    fn usage(&self) -> &str {
-        "Displays charts."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        if args.scope().get_command("chart bar").is_none() {
-            return Err(ShellError::untagged_runtime_error(
-                "nu_plugin_chart not installed.",
-            ));
-        }
-
-        Ok(ActionStream::one(Ok(ReturnSuccess::Value(
-            UntaggedValue::string(get_full_help(&Chart, args.scope())).into_value(Tag::unknown()),
-        ))))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Chart;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Chart {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/charting/histogram.rs b/old_nushell/crates/nu-command/src/commands/charting/histogram.rs
deleted file mode 100644
index 4fcf6aa57..000000000
--- a/old_nushell/crates/nu-command/src/commands/charting/histogram.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    ColumnPath, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-pub struct Histogram;
-
-impl WholeStreamCommand for Histogram {
-    fn name(&self) -> &str {
-        "histogram"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("histogram")
-            .named(
-                "use",
-                SyntaxShape::ColumnPath,
-                "Use data at the column path given as valuator",
-                None,
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "column name to give the histogram's frequency column",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a new table with a histogram based on the column name passed in."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        histogram(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get a histogram for the types of files",
-                example: "ls | histogram type",
-                result: None,
-            },
-            Example {
-                description:
-                    "Get a histogram for the types of files, with frequency column named percentage",
-                example: "ls | histogram type percentage",
-                result: None,
-            },
-            Example {
-                description: "Get a histogram for a list of numbers",
-                example: "echo [1 2 3 1 1 1 2 2 1 1] | histogram",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn histogram(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let mut columns = args.rest::<ColumnPath>(0)?;
-    let evaluate_with = args.get_flag::<ColumnPath>("use")?.map(evaluator);
-    let values: Vec<Value> = args.input.collect();
-
-    let column_grouper = if !columns.is_empty() {
-        columns
-            .remove(0)
-            .split_last()
-            .map(|(key, _)| key.as_string().tagged(&name))
-    } else {
-        None
-    };
-
-    let frequency_column_name = if columns.is_empty() {
-        "frequency".to_string()
-    } else if let Some((key, _)) = columns[0].split_last() {
-        key.as_string()
-    } else {
-        "frequency".to_string()
-    };
-
-    let column = if let Some(ref column) = column_grouper {
-        column.clone()
-    } else {
-        "value".to_string().tagged(&name)
-    };
-
-    let results = nu_data::utils::report(
-        &UntaggedValue::table(&values).into_value(&name),
-        nu_data::utils::Operation {
-            grouper: Some(Box::new(move |_, _| Ok(String::from("frequencies")))),
-            splitter: Some(splitter(column_grouper)),
-            format: &None,
-            eval: &evaluate_with,
-            reduction: &nu_data::utils::Reduction::Count,
-        },
-        &name,
-    )?;
-
-    let labels = results.labels.y.clone();
-    let mut idx = 0;
-
-    Ok(results
-        .data
-        .table_entries()
-        .cloned()
-        .collect::<Vec<_>>()
-        .into_iter()
-        .zip(
-            results
-                .percentages
-                .table_entries()
-                .cloned()
-                .collect::<Vec<_>>()
-                .into_iter(),
-        )
-        .map(move |(counts, percentages)| {
-            let percentage = percentages
-                .table_entries()
-                .cloned()
-                .last()
-                .unwrap_or_else(|| {
-                    UntaggedValue::decimal_from_float(0.0, name.span).into_value(&name)
-                });
-            let value = counts
-                .table_entries()
-                .cloned()
-                .last()
-                .unwrap_or_else(|| UntaggedValue::int(0).into_value(&name));
-
-            let mut fact = TaggedDictBuilder::new(&name);
-            let column_value = labels
-                .get(idx)
-                .ok_or_else(|| {
-                    ShellError::labeled_error(
-                        "Unable to load group labels",
-                        "unable to load group labels",
-                        &name,
-                    )
-                })?
-                .clone();
-
-            fact.insert_value(&column.item, column_value);
-            fact.insert_untagged("count", value);
-
-            let fmt_percentage = format!(
-                "{}%",
-                // Some(2) < the number of digits
-                // true < group the digits
-                crate::commands::conversions::into::string::action(
-                    &percentage,
-                    &name,
-                    Some(2),
-                    true
-                )?
-                .as_string()?
-            );
-            fact.insert_untagged("percentage", UntaggedValue::string(fmt_percentage));
-
-            let string = "*".repeat(percentage.as_u64().map_err(|_| {
-                ShellError::labeled_error("expected a number", "expected a number", &name)
-            })? as usize);
-
-            fact.insert_untagged(&frequency_column_name, UntaggedValue::string(string));
-
-            idx += 1;
-
-            ReturnSuccess::value(fact.into_value())
-        })
-        .into_action_stream())
-}
-
-fn evaluator(by: ColumnPath) -> Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send> {
-    Box::new(move |_: usize, value: &Value| {
-        let path = by.clone();
-
-        let eval = nu_value_ext::get_data_by_column_path(value, &path, move |_, _, error| error);
-
-        match eval {
-            Ok(with_value) => Ok(with_value),
-            Err(reason) => Err(reason),
-        }
-    })
-}
-
-fn splitter(
-    by: Option<Tagged<String>>,
-) -> Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send> {
-    match by {
-        Some(column) => Box::new(move |_, row: &Value| {
-            let key = &column;
-
-            match row.get_data_by_key(key.borrow_spanned()) {
-                Some(key) => nu_value_ext::as_string(&key),
-                None => Err(ShellError::labeled_error(
-                    "unknown column",
-                    "unknown column",
-                    key.tag(),
-                )),
-            }
-        }),
-        None => Box::new(move |_, row: &Value| nu_value_ext::as_string(row)),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Histogram;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Histogram {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/charting/mod.rs b/old_nushell/crates/nu-command/src/commands/charting/mod.rs
deleted file mode 100644
index a69047517..000000000
--- a/old_nushell/crates/nu-command/src/commands/charting/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod chart;
-mod histogram;
-
-pub use chart::Chart;
-pub use histogram::Histogram;
diff --git a/old_nushell/crates/nu-command/src/commands/config/clear.rs b/old_nushell/crates/nu-command/src/commands/config/clear.rs
deleted file mode 100644
index 0aa8593df..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/clear.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config clear"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config clear")
-    }
-
-    fn usage(&self) -> &str {
-        "clear the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        clear(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Clear the config (be careful!)",
-            example: "config clear",
-            result: None,
-        }]
-    }
-}
-
-pub fn clear(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let result = if let Some(global_cfg) = &mut args.configs().lock().global_config {
-        global_cfg.vars.clear();
-        global_cfg.write()?;
-        ctx.reload_config(global_cfg)?;
-
-        let value = UntaggedValue::Row(global_cfg.vars.clone().into()).into_value(name);
-        Ok(OutputStream::one(value))
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    };
-
-    result
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/command.rs b/old_nushell/crates/nu-command/src/commands/config/command.rs
deleted file mode 100644
index f0faea14b..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/command.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::prelude::*;
-use nu_engine::CommandArgs;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "config"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config")
-    }
-
-    fn usage(&self) -> &str {
-        "Configuration management."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let name = args.call_info.name_tag.clone();
-
-        if let Some(global_cfg) = &args.configs().lock().global_config {
-            let result = global_cfg.vars.clone();
-            let value = UntaggedValue::Row(result.into()).into_value(name);
-
-            Ok(OutputStream::one(value))
-        } else {
-            let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-                .into_value(name);
-
-            Ok(OutputStream::one(value))
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/get.rs b/old_nushell/crates/nu-command/src/commands/config/get.rs
deleted file mode 100644
index fac8e110e..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/get.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config get"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config get").required(
-            "get",
-            SyntaxShape::ColumnPath,
-            "value to get from the config",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Gets a value from the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        get(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the current startup commands",
-            example: "config get startup",
-            result: None,
-        }]
-    }
-}
-
-pub fn get(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let column_path = args.req(0)?;
-
-    let result = if let Some(global_cfg) = &ctx.configs().lock().global_config {
-        let result = UntaggedValue::row(global_cfg.vars.clone()).into_value(&name);
-        let value = crate::commands::filters::get::get_column_path(&column_path, &result)?;
-        Ok(match value {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => OutputStream::from_stream(list.into_iter()),
-            x => OutputStream::one(x),
-        })
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    };
-
-    result
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/mod.rs b/old_nushell/crates/nu-command/src/commands/config/mod.rs
deleted file mode 100644
index 62f626cf8..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-pub mod clear;
-pub mod command;
-pub mod get;
-pub mod path;
-pub mod remove;
-pub mod set;
-pub mod set_into;
-
-pub use clear::SubCommand as ConfigClear;
-pub use command::Command as Config;
-pub use get::SubCommand as ConfigGet;
-pub use path::SubCommand as ConfigPath;
-pub use remove::SubCommand as ConfigRemove;
-pub use set::SubCommand as ConfigSet;
-pub use set_into::SubCommand as ConfigSetInto;
-
-use nu_errors::ShellError;
-
-pub fn err_no_global_cfg_present() -> ShellError {
-    ShellError::untagged_runtime_error("No global config found!")
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/path.rs b/old_nushell/crates/nu-command/src/commands/config/path.rs
deleted file mode 100644
index 4e32596cc..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/path.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, UntaggedValue};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config path"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config path")
-    }
-
-    fn usage(&self) -> &str {
-        "return the path to the config file"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        path(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the path to the current config file",
-            example: "config path",
-            result: None,
-        }]
-    }
-}
-
-pub fn path(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    if let Some(global_cfg) = &mut args.configs().lock().global_config {
-        let value = UntaggedValue::Primitive(Primitive::FilePath(global_cfg.file_path.clone()))
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/remove.rs b/old_nushell/crates/nu-command/src/commands/config/remove.rs
deleted file mode 100644
index d71ecc5c1..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/remove.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config remove"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config remove").required(
-            "remove",
-            SyntaxShape::Any,
-            "remove a value from the config",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Removes a value from the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        remove(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Remove the startup commands",
-            example: "config remove startup",
-            result: None,
-        }]
-    }
-}
-
-pub fn remove(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-    let remove: Tagged<String> = args.req(0)?;
-
-    let key = remove.to_string();
-
-    let result = if let Some(global_cfg) = &mut ctx.configs().lock().global_config {
-        if global_cfg.vars.contains_key(&key) {
-            global_cfg.vars.swap_remove(&key);
-            global_cfg.write()?;
-            ctx.reload_config(global_cfg)?;
-
-            let value: Value = UntaggedValue::row(global_cfg.vars.clone()).into_value(remove.tag);
-
-            Ok(OutputStream::one(value))
-        } else {
-            Err(ShellError::labeled_error(
-                "Key does not exist in config",
-                "key",
-                remove.tag(),
-            ))
-        }
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    };
-
-    result
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/set.rs b/old_nushell/crates/nu-command/src/commands/config/set.rs
deleted file mode 100644
index b6bd986e4..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/set.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config set"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config set")
-            .required("key", SyntaxShape::ColumnPath, "variable name to set")
-            .required("value", SyntaxShape::Any, "value to use")
-    }
-
-    fn usage(&self) -> &str {
-        "Sets a value in the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        set(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Set auto pivoting",
-                example: "config set pivot_mode always",
-                result: None,
-            },
-            Example {
-                description: "Set line editor options",
-                example: "config set line_editor [[edit_mode, completion_type]; [emacs circular]]",
-                result: None,
-            },
-            Example {
-                description: "Set coloring options",
-                example: "config set color_config [[header_align header_color]; [left white_bold]]",
-                result: None,
-            },
-            Example {
-                description: "Set nested options",
-                example: "config set color_config.header_color white",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn set(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let column_path = args.req(0)?;
-    let mut value: Value = args.req(1)?;
-
-    let result = if let Some(global_cfg) = &mut ctx.configs().lock().global_config {
-        let configuration = UntaggedValue::row(global_cfg.vars.clone()).into_value(&name);
-
-        if let UntaggedValue::Table(rows) = &value.value {
-            if rows.len() == 1 && rows[0].is_row() {
-                value = rows[0].clone();
-            }
-        }
-
-        match configuration.forgiving_insert_data_at_column_path(&column_path, value) {
-            Ok(Value {
-                value: UntaggedValue::Row(changes),
-                ..
-            }) => {
-                global_cfg.vars = changes.entries;
-                global_cfg.write()?;
-                ctx.reload_config(global_cfg)?;
-
-                let value = UntaggedValue::row(global_cfg.vars.clone()).into_value(name);
-                Ok(OutputStream::one(value))
-            }
-            Ok(_) => Ok(OutputStream::empty()),
-            Err(reason) => Err(reason),
-        }
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    };
-
-    result
-}
diff --git a/old_nushell/crates/nu-command/src/commands/config/set_into.rs b/old_nushell/crates/nu-command/src/commands/config/set_into.rs
deleted file mode 100644
index f49ae71ab..000000000
--- a/old_nushell/crates/nu-command/src/commands/config/set_into.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "config set_into"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("config set_into").required(
-            "set_into",
-            SyntaxShape::String,
-            "sets a variable from values in the pipeline",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Sets a value in the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        set_into(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Store the contents of the pipeline as a path",
-            example: "echo ['/usr/bin' '/bin'] | config set_into path",
-            result: None,
-        }]
-    }
-}
-
-pub fn set_into(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let set_into: Tagged<String> = args.req(0)?;
-
-    let rows: Vec<Value> = args.input.collect();
-    let key = set_into.to_string();
-
-    let result = if let Some(global_cfg) = &mut ctx.configs().lock().global_config {
-        if rows.is_empty() {
-            return Err(ShellError::labeled_error(
-                "No values given for set_into",
-                "needs value(s) from pipeline",
-                set_into.tag(),
-            ));
-        } else if rows.len() == 1 {
-            // A single value
-            let value = &rows[0];
-
-            global_cfg.vars.insert(key, value.clone());
-        } else {
-            // Take in the pipeline as a table
-            let value = UntaggedValue::Table(rows).into_value(name.clone());
-
-            global_cfg.vars.insert(key, value);
-        }
-
-        global_cfg.write()?;
-        ctx.reload_config(global_cfg)?;
-
-        let value = UntaggedValue::row(global_cfg.vars.clone()).into_value(name);
-
-        Ok(OutputStream::one(value))
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    };
-
-    result
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/binary.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/binary.rs
deleted file mode 100644
index 59aa35bbd..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/binary.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use num_bigint::{BigInt, ToBigInt};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into binary"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into binary").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "column paths to convert to binary (for table input)",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to a binary primitive"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_binary(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "convert string to a nushell binary primitive",
-                example:
-                    "echo 'This is a string that is exactly 52 characters long.' | into binary",
-                result: Some(vec![UntaggedValue::binary(
-                    "This is a string that is exactly 52 characters long."
-                        .to_string()
-                        .as_bytes()
-                        .to_vec(),
-                )
-                .into()]),
-            },
-            Example {
-                description: "convert a number to a nushell binary primitive",
-                example: "echo 1 | into binary",
-                result: Some(vec![UntaggedValue::binary(
-                    i64::from(1).to_le_bytes().to_vec(),
-                )
-                .into()]),
-            },
-            Example {
-                description: "convert a boolean to a nushell binary primitive",
-                example: "echo $true | into binary",
-                result: Some(vec![UntaggedValue::binary(
-                    i64::from(1).to_le_bytes().to_vec(),
-                )
-                .into()]),
-            },
-            Example {
-                description: "convert a filesize to a nushell binary primitive",
-                example: "ls | where name == LICENSE | get size | into binary",
-                result: None,
-            },
-            Example {
-                description: "convert a filepath to a nushell binary primitive",
-                example: "ls | where name == LICENSE | get name | path expand | into binary",
-                result: None,
-            },
-            Example {
-                description: "convert a decimal to a nushell binary primitive",
-                example: "echo 1.234 | into binary",
-                result: Some(vec![
-                    UntaggedValue::binary(BigInt::from(1).to_bytes_le().1).into()
-                ]),
-            },
-        ]
-    }
-}
-
-fn into_binary(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-fn int_to_endian(n: i64) -> Vec<u8> {
-    if cfg!(target_endian = "little") {
-        n.to_le_bytes().to_vec()
-    } else {
-        n.to_be_bytes().to_vec()
-    }
-}
-
-fn bigint_to_endian(n: &BigInt) -> Vec<u8> {
-    if cfg!(target_endian = "little") {
-        n.to_bytes_le().1
-    } else {
-        n.to_bytes_be().1
-    }
-}
-
-pub fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::binary(match prim {
-            Primitive::Binary(b) => b.to_vec(),
-            Primitive::Int(n_ref) => int_to_endian(*n_ref),
-            Primitive::BigInt(n_ref) => bigint_to_endian(n_ref),
-            Primitive::Decimal(dec) => match dec.to_bigint() {
-                Some(n) => bigint_to_endian(&n),
-                None => {
-                    return Err(ShellError::unimplemented(
-                        "failed to convert decimal to int",
-                    ));
-                }
-            },
-            Primitive::Filesize(a_filesize) => match a_filesize.to_bigint() {
-                Some(n) => bigint_to_endian(&n),
-                None => {
-                    return Err(ShellError::unimplemented(
-                        "failed to convert filesize to bigint",
-                    ));
-                }
-            },
-            Primitive::String(a_string) => a_string.as_bytes().to_vec(),
-            Primitive::Boolean(a_bool) => match a_bool {
-                false => int_to_endian(0),
-                true => int_to_endian(1),
-            },
-            Primitive::Date(a_date) => a_date.format("%c").to_string().as_bytes().to_vec(),
-            Primitive::FilePath(a_filepath) => a_filepath
-                .as_path()
-                .display()
-                .to_string()
-                .as_bytes()
-                .to_vec(),
-            _ => {
-                return Err(ShellError::unimplemented(
-                    "'into binary' for non-numeric primitives",
-                ))
-            }
-        })
-        .into_value(&tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column name to use, with 'into binary COLUMN'",
-            "found table",
-            tag,
-        )),
-        _ => Err(ShellError::unimplemented(
-            "'into binary' for unsupported type",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/column_path.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/column_path.rs
deleted file mode 100644
index 141bb68c4..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/column_path.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into column-path"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into column-path").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "values to convert to column path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to column path"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_filepath(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert string to column path in table",
-                example: "echo [[name]; ['/dev/null'] ['C:\\Program Files'] ['../../Cargo.toml']] | into column-path name",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::column_path("/dev/null", Span::unknown()).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::column_path("C:\\Program Files", Span::unknown()).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::column_path("../../Cargo.toml", Span::unknown()).into(),
-                    })
-                    .into(),
-                ]),
-            },
-            Example {
-                description: "Convert string to column path",
-                example: "echo 'Cargo.toml' | into column-path",
-                result: Some(vec![UntaggedValue::column_path("Cargo.toml", Span::unknown()).into()]),
-            },
-        ]
-    }
-}
-
-fn into_filepath(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::column_path(
-            match prim {
-                Primitive::String(a_string) => a_string,
-                _ => {
-                    return Err(ShellError::unimplemented(
-                        "'into column-path' for non-string primitives",
-                    ))
-                }
-            },
-            Span::unknown(),
-        )
-        .into_value(&tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column name to use, with 'into column-path COLUMN'",
-            "found table",
-            tag,
-        )),
-        _ => Err(ShellError::unimplemented(
-            "'into column-path' for unsupported type",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/command.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/command.rs
deleted file mode 100644
index 3ae2ff897..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/command.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "into"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into")
-    }
-
-    fn usage(&self) -> &str {
-        "Apply into function."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/filepath.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/filepath.rs
deleted file mode 100644
index 08e7fff1c..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/filepath.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::path::PathBuf;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into path"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into path").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "column paths to convert to filepath (for table input)",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to filepath"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_filepath(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert string to filepath in table",
-                example: "echo [[name]; ['/dev/null'] ['C:\\Program Files'] ['../../Cargo.toml']] | into path name",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::filepath("/dev/null").into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::filepath("C:\\Program Files").into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "name".to_string() => UntaggedValue::filepath("../../Cargo.toml").into(),
-                    })
-                    .into(),
-                ]),
-            },
-            Example {
-                description: "Convert string to filepath",
-                example: "echo 'Cargo.toml' | into path",
-                result: Some(vec![UntaggedValue::filepath("Cargo.toml").into()]),
-            },
-        ]
-    }
-}
-
-fn into_filepath(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::filepath(match prim {
-            Primitive::String(a_string) => match filepath_from_string(a_string, &tag) {
-                Ok(n) => n,
-                Err(e) => {
-                    return Err(e);
-                }
-            },
-            Primitive::FilePath(a_filepath) => a_filepath.clone(),
-            _ => {
-                return Err(ShellError::unimplemented(
-                    "'into path' for non-string primitives",
-                ))
-            }
-        })
-        .into_value(&tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column name to use, with 'into path COLUMN'",
-            "found table",
-            tag,
-        )),
-        _ => Err(ShellError::unimplemented(
-            "'into path' for unsupported type",
-        )),
-    }
-}
-
-fn filepath_from_string(a_string: &str, _tag: &Tag) -> Result<PathBuf, ShellError> {
-    Ok(PathBuf::from(a_string))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/filesize.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/filesize.rs
deleted file mode 100644
index 7a3a64834..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/filesize.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::convert::TryInto;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use num_bigint::ToBigInt;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into filesize"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into filesize").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "column paths to convert to filesize (for table input)",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to filesize"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_filesize(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert string to filesize in table",
-                example: "echo [[bytes]; ['5'] [3.2] [4] [2kb]] | into filesize bytes",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        "bytes".to_string() => UntaggedValue::filesize(5).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "bytes".to_string() => UntaggedValue::filesize(3).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "bytes".to_string() => UntaggedValue::filesize(4).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "bytes".to_string() => UntaggedValue::filesize(2000).into(),
-                    })
-                    .into(),
-                ]),
-            },
-            Example {
-                description: "Convert string to filesize",
-                example: "echo '2' | into filesize",
-                result: Some(vec![UntaggedValue::filesize(2).into()]),
-            },
-            Example {
-                description: "Convert decimal to filesize",
-                example: "echo 8.3 | into filesize",
-                result: Some(vec![UntaggedValue::filesize(8).into()]),
-            },
-            Example {
-                description: "Convert int to filesize",
-                example: "echo 5 | into filesize",
-                result: Some(vec![UntaggedValue::filesize(5).into()]),
-            },
-            Example {
-                description: "Convert file size to filesize",
-                example: "echo 4KB | into filesize",
-                result: Some(vec![UntaggedValue::filesize(4000).into()]),
-            },
-        ]
-    }
-}
-
-fn into_filesize(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::filesize(match prim {
-            Primitive::String(a_string) => match int_from_string(a_string.trim(), &tag) {
-                Ok(n) => n,
-                Err(e) => {
-                    return Err(e);
-                }
-            },
-            Primitive::Decimal(dec) => match dec.to_bigint() {
-                Some(n) => match n.to_u64() {
-                    Some(i) => i,
-                    None => {
-                        return Err(ShellError::unimplemented(
-                            "failed to convert decimal to filesize",
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::unimplemented(
-                        "failed to convert decimal to filesize",
-                    ));
-                }
-            },
-            Primitive::Int(n_ref) => (*n_ref).try_into().map_err(|_| {
-                ShellError::unimplemented("cannot convert negative integer to filesize")
-            })?,
-            Primitive::Filesize(a_filesize) => *a_filesize,
-            _ => {
-                return Err(ShellError::unimplemented(
-                    "'into filesize' for non-numeric primitives",
-                ))
-            }
-        })
-        .into_value(&tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column name to use, with 'into filesize COLUMN'",
-            "found table",
-            tag,
-        )),
-        _ => Err(ShellError::unimplemented(
-            "'into filesize' for unsupported type",
-        )),
-    }
-}
-
-fn int_from_string(a_string: &str, tag: &Tag) -> Result<u64, ShellError> {
-    match a_string.parse::<u64>() {
-        Ok(n) => Ok(n),
-        Err(_) => match a_string.parse::<f64>() {
-            Ok(f) => match f.to_u64() {
-                Some(i) => Ok(i),
-                None => Err(ShellError::labeled_error(
-                    "Could not convert string value to filesize",
-                    "original value",
-                    tag.clone(),
-                )),
-            },
-            Err(_) => Err(ShellError::labeled_error(
-                "Could not convert string value to filesize",
-                "original value",
-                tag.clone(),
-            )),
-        },
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/int.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/int.rs
deleted file mode 100644
index afa2a04fe..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/int.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use num_bigint::ToBigInt;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into int"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into int").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "column paths to convert to int (for table input)",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to integer"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_int(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert string to integer in table",
-                example: "echo [[num]; ['-5'] [4] [1.5]] | into int num",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        "num".to_string() => UntaggedValue::int(-5).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "num".to_string() => UntaggedValue::int(4).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "num".to_string() => UntaggedValue::int(1).into(),
-                    })
-                    .into(),
-                ]),
-            },
-            Example {
-                description: "Convert string to integer",
-                example: "echo '2' | into int",
-                result: Some(vec![UntaggedValue::int(2).into()]),
-            },
-            Example {
-                description: "Convert decimal to integer",
-                example: "echo 5.9 | into int",
-                result: Some(vec![UntaggedValue::int(5).into()]),
-            },
-            Example {
-                description: "Convert decimal string to integer",
-                example: "echo '5.9' | into int",
-                result: Some(vec![UntaggedValue::int(5).into()]),
-            },
-            Example {
-                description: "Convert file size to integer",
-                example: "echo 4KB | into int",
-                result: Some(vec![UntaggedValue::int(4000).into()]),
-            },
-            Example {
-                description: "Convert bool to integer",
-                example: "echo $false $true | into int",
-                result: Some(vec![
-                    UntaggedValue::int(0).into(),
-                    UntaggedValue::int(1).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn into_int(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::int(match prim {
-            Primitive::String(a_string) => match int_from_string(a_string, &tag) {
-                Ok(n) => n,
-                Err(e) => {
-                    return Err(e);
-                }
-            },
-            Primitive::Decimal(dec) => match dec.to_bigint() {
-                Some(n) => match n.to_i64() {
-                    Some(i) => i,
-                    None => {
-                        return Err(ShellError::unimplemented(
-                            "failed to convert decimal to int",
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::unimplemented(
-                        "failed to convert decimal to int",
-                    ));
-                }
-            },
-            Primitive::Int(n_ref) => *n_ref,
-            Primitive::Boolean(a_bool) => match a_bool {
-                false => 0,
-                true => 1,
-            },
-            Primitive::Filesize(a_filesize) => match a_filesize.to_bigint() {
-                Some(n) => match n.to_i64() {
-                    Some(i) => i,
-                    None => {
-                        return Err(ShellError::unimplemented(
-                            "failed to convert filesize to bigint",
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::unimplemented(
-                        "failed to convert filesize to bigint",
-                    ));
-                }
-            },
-            _ => {
-                return Err(ShellError::unimplemented(
-                    "'into int' for non-numeric primitives",
-                ))
-            }
-        })
-        .into_value(&tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column name to use, with 'into int COLUMN'",
-            "found table",
-            tag,
-        )),
-        _ => Err(ShellError::unimplemented("'into int' for unsupported type")),
-    }
-}
-
-fn int_from_string(a_string: &str, tag: &Tag) -> Result<i64, ShellError> {
-    match a_string.parse::<i64>() {
-        Ok(n) => Ok(n),
-        Err(_) => match a_string.parse::<f64>() {
-            Ok(f) => match f.to_i64() {
-                Some(i) => Ok(i),
-                None => Err(ShellError::labeled_error(
-                    "Could not convert string value to int",
-                    "original value",
-                    tag.clone(),
-                )),
-            },
-            Err(_) => Err(ShellError::labeled_error(
-                "Could not convert string value to int",
-                "original value",
-                tag.clone(),
-            )),
-        },
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/mod.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/mod.rs
deleted file mode 100644
index ae029d887..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-mod binary;
-mod column_path;
-mod command;
-mod filepath;
-mod filesize;
-mod int;
-pub mod string;
-
-pub use self::filesize::SubCommand as IntoFilesize;
-pub use binary::SubCommand as IntoBinary;
-pub use column_path::SubCommand as IntoColumnPath;
-pub use command::Command as Into;
-pub use filepath::SubCommand as IntoFilepath;
-pub use int::SubCommand as IntoInt;
-pub use string::SubCommand as IntoString;
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/into/string.rs b/old_nushell/crates/nu-command/src/commands/conversions/into/string.rs
deleted file mode 100644
index 70f19fe66..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/into/string.rs
+++ /dev/null
@@ -1,279 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use num_bigint::{BigInt, BigUint, ToBigInt};
-// TODO num_format::SystemLocale once platform-specific dependencies are stable (see Cargo.toml)
-use nu_data::base::shape::InlineShape;
-use num_format::Locale;
-use num_traits::{Pow, Signed};
-use std::iter;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "into string"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("into string")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "column paths to convert to string (for table input)",
-            )
-            .named(
-                "decimals",
-                SyntaxShape::Int,
-                "decimal digits to which to round",
-                Some('d'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert value to string"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        into_string(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "convert decimal to string and round to nearest integer",
-                example: "echo 1.7 | into string -d 0",
-                result: Some(vec![UntaggedValue::string("2").into_untagged_value()]),
-            },
-            Example {
-                description: "convert decimal to string",
-                example: "echo 4.3 | into string",
-                result: Some(vec![UntaggedValue::string("4.3").into_untagged_value()]),
-            },
-            Example {
-                description: "convert string to string",
-                example: "echo '1234' | into string",
-                result: Some(vec![UntaggedValue::string("1234").into_untagged_value()]),
-            },
-            Example {
-                description: "convert boolean to string",
-                example: "echo $true | into string",
-                result: Some(vec![UntaggedValue::string("true").into_untagged_value()]),
-            },
-            Example {
-                description: "convert date to string",
-                example: "date now | into string",
-                result: None,
-            },
-            Example {
-                description: "convert filepath to string",
-                example: "ls Cargo.toml | get name | into string",
-                result: None,
-            },
-            Example {
-                description: "convert filesize to string",
-                example: "ls Cargo.toml | get size | into string",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn into_string(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let decimals: Option<Tagged<u64>> = args.get_flag("decimals")?;
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    let digits = decimals.as_ref().map(|tagged| tagged.item);
-    let group_digits = false;
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag(), digits, group_digits)
-            } else {
-                let mut ret = v;
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag(), digits, group_digits)),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action(
-    input: &Value,
-    tag: impl Into<Tag>,
-    digits: Option<u64>,
-    group_digits: bool,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(prim) => Ok(UntaggedValue::string(match prim {
-            Primitive::Int(int) => {
-                if group_digits {
-                    format_int(*int) // int.to_formatted_string(*locale)
-                } else {
-                    int.to_string()
-                }
-            }
-            Primitive::BigInt(int) => {
-                if group_digits {
-                    format_bigint(int) // int.to_formatted_string(*locale)
-                } else {
-                    int.to_string()
-                }
-            }
-            Primitive::Decimal(dec) => format_decimal(dec.clone(), digits, group_digits),
-            Primitive::String(a_string) => a_string.to_string(),
-            Primitive::Boolean(a_bool) => a_bool.to_string(),
-            Primitive::Date(a_date) => a_date.format("%c").to_string(),
-            Primitive::FilePath(a_filepath) => a_filepath.as_path().display().to_string(),
-            Primitive::Filesize(a_filesize) => {
-                let byte_string = InlineShape::format_bytes(*a_filesize, None);
-                byte_string.1
-            }
-            Primitive::Nothing => "nothing".to_string(),
-            _ => {
-                return Err(ShellError::unimplemented(&format!(
-                    "into string for primitive: {:?}",
-                    prim
-                )))
-            }
-        })
-        .into_value(tag)),
-        UntaggedValue::Row(_) => Err(ShellError::labeled_error(
-            "specify column to use 'into string'",
-            "found table",
-            input.tag.clone(),
-        )),
-        UntaggedValue::Table(_) => Err(ShellError::unimplemented("into string for table")),
-        _ => Err(ShellError::unimplemented("into string for non-primitive")),
-    }
-}
-
-fn format_int(int: i64) -> String {
-    int.to_string()
-
-    // TODO once platform-specific dependencies are stable (see Cargo.toml)
-    // #[cfg(windows)]
-    // {
-    //     int.to_formatted_string(&Locale::en)
-    // }
-    // #[cfg(not(windows))]
-    // {
-    //     match SystemLocale::default() {
-    //         Ok(locale) => int.to_formatted_string(&locale),
-    //         Err(_) => int.to_formatted_string(&Locale::en),
-    //     }
-    // }
-}
-
-fn format_bigint(int: &BigInt) -> String {
-    int.to_string()
-
-    // TODO once platform-specific dependencies are stable (see Cargo.toml)
-    // #[cfg(windows)]
-    // {
-    //     int.to_formatted_string(&Locale::en)
-    // }
-    // #[cfg(not(windows))]
-    // {
-    //     match SystemLocale::default() {
-    //         Ok(locale) => int.to_formatted_string(&locale),
-    //         Err(_) => int.to_formatted_string(&Locale::en),
-    //     }
-    // }
-}
-
-fn format_decimal(mut decimal: BigDecimal, digits: Option<u64>, group_digits: bool) -> String {
-    if let Some(n) = digits {
-        decimal = round_decimal(&decimal, n)
-    }
-
-    if decimal.is_integer() && (digits.is_none() || digits == Some(0)) {
-        let int = decimal
-            .to_bigint()
-            .expect("integer BigDecimal should convert to BigInt");
-        return if group_digits {
-            int.to_string()
-        } else {
-            format_bigint(&int)
-        };
-    }
-
-    let (int, exp) = decimal.as_bigint_and_exponent();
-    let factor = BigInt::from(10).pow(BigUint::from(exp as u64)); // exp > 0 for non-int decimal
-    let int_part = &int / &factor;
-    let dec_part = (&int % &factor)
-        .abs()
-        .to_biguint()
-        .expect("BigInt::abs should always produce positive signed BigInt and thus BigUInt")
-        .to_str_radix(10);
-
-    let dec_str = if let Some(n) = digits {
-        dec_part
-            .chars()
-            .chain(iter::repeat('0'))
-            .take(n as usize)
-            .collect()
-    } else {
-        String::from(dec_part.trim_end_matches('0'))
-    };
-
-    let format_default_loc = |int_part: BigInt| {
-        let loc = Locale::en;
-        //TODO: when num_format is available for recent bigint, replace this with the locale-based format
-        let (int_str, sep) = (int_part.to_string(), String::from(loc.decimal()));
-
-        format!("{}{}{}", int_str, sep, dec_str)
-    };
-
-    format_default_loc(int_part)
-
-    // TODO once platform-specific dependencies are stable (see Cargo.toml)
-    // #[cfg(windows)]
-    // {
-    //     format_default_loc(int_part)
-    // }
-    // #[cfg(not(windows))]
-    // {
-    //     match SystemLocale::default() {
-    //         Ok(sys_loc) => {
-    //             let int_str = int_part.to_formatted_string(&sys_loc);
-    //             let sep = String::from(sys_loc.decimal());
-    //             format!("{}{}{}", int_str, sep, dec_str)
-    //         }
-    //         Err(_) => format_default_loc(int_part),
-    //     }
-    // }
-}
-
-fn round_decimal(decimal: &BigDecimal, mut digits: u64) -> BigDecimal {
-    let mut mag = decimal.clone();
-    while mag >= BigDecimal::from(1) {
-        mag = mag / 10;
-        digits += 1;
-    }
-
-    decimal.with_prec(digits)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/conversions/mod.rs b/old_nushell/crates/nu-command/src/commands/conversions/mod.rs
deleted file mode 100644
index 70608f782..000000000
--- a/old_nushell/crates/nu-command/src/commands/conversions/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub(crate) mod into;
-
-pub use into::*;
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/alias.rs b/old_nushell/crates/nu-command/src/commands/core_commands/alias.rs
deleted file mode 100644
index 4ce2a426d..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/alias.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-
-pub struct Alias;
-
-impl WholeStreamCommand for Alias {
-    fn name(&self) -> &str {
-        "alias"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("alias")
-            .required("name", SyntaxShape::String, "the name of the alias")
-            .required("equals", SyntaxShape::String, "the equals sign")
-            .rest("rest", SyntaxShape::Any, "the expansion for the alias")
-    }
-
-    fn usage(&self) -> &str {
-        "Alias a command to an expansion."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        alias(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Alias ll to ls -l",
-            example: "alias ll = ls -l",
-            result: None,
-        }]
-    }
-}
-
-pub fn alias(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    // TODO: is there a better way of checking whether no arguments were passed?
-    if args.nth(0).is_none() {
-        let aliases = UntaggedValue::string(
-            &args
-                .scope()
-                .get_aliases()
-                .iter()
-                .map(|val| format!("{} = '{}'", val.0, val.1.iter().map(|x| &x.item).join(" ")))
-                .join("\n"),
-        );
-        return Ok(OutputStream::one(aliases));
-    }
-    Ok(OutputStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/debug.rs b/old_nushell/crates/nu-command/src/commands/core_commands/debug.rs
deleted file mode 100644
index d92380e0d..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/debug.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-
-pub struct Debug;
-
-impl WholeStreamCommand for Debug {
-    fn name(&self) -> &str {
-        "debug"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("debug").switch("raw", "Prints the raw value representation.", Some('r'))
-    }
-
-    fn usage(&self) -> &str {
-        "Print the Rust debug representation of the values."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        debug_value(args)
-    }
-}
-
-fn debug_value(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let raw = args.has_flag("raw");
-    let input = args.input;
-
-    Ok(input
-        .map(move |v| {
-            if raw {
-                ReturnSuccess::value(
-                    UntaggedValue::string(format!("{:#?}", v)).into_untagged_value(),
-                )
-            } else {
-                ReturnSuccess::debug_value(v)
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Debug;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Debug {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/def.rs b/old_nushell/crates/nu-command/src/commands/core_commands/def.rs
deleted file mode 100644
index f247bd7a1..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/def.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{hir::CapturedBlock, Signature, SyntaxShape, Value};
-use nu_source::Tagged;
-
-pub struct Def;
-
-#[derive(Deserialize)]
-pub struct DefArgs {
-    pub name: Tagged<String>,
-    pub args: Tagged<Vec<Value>>,
-    pub block: CapturedBlock,
-}
-
-impl WholeStreamCommand for Def {
-    fn name(&self) -> &str {
-        "def"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("def")
-            .required("name", SyntaxShape::String, "the name of the command")
-            .required(
-                "params",
-                SyntaxShape::Table,
-                "the parameters of the command",
-            )
-            .required("block", SyntaxShape::Block, "the body of the command")
-    }
-
-    fn usage(&self) -> &str {
-        "Create a command and set it to a definition."
-    }
-
-    fn run_with_actions(&self, _args: CommandArgs) -> Result<ActionStream, ShellError> {
-        // Currently, we don't do anything here because we should have already
-        // installed the definition as we entered the scope
-        // We just create a command so that we can get proper coloring
-        Ok(ActionStream::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/describe.rs b/old_nushell/crates/nu-command/src/commands/core_commands/describe.rs
deleted file mode 100644
index fa48a9ee9..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/describe.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-
-pub struct Describe;
-
-#[derive(Deserialize)]
-pub struct DescribeArgs {}
-
-impl WholeStreamCommand for Describe {
-    fn name(&self) -> &str {
-        "describe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("describe")
-    }
-
-    fn usage(&self) -> &str {
-        "Describes the objects in the stream."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        describe(args)
-    }
-}
-
-pub fn describe(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    Ok(args
-        .input
-        .map(|row| {
-            let name = value::plain_type(&row, 100);
-            ReturnSuccess::value(
-                UntaggedValue::string(name).into_value(Tag::unknown_anchor(row.tag.span)),
-            )
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Describe;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Describe {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/do_.rs b/old_nushell/crates/nu-command/src/commands/core_commands/do_.rs
deleted file mode 100644
index 413a9ab37..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/do_.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ExternalRedirection, Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-pub struct Do;
-
-struct DoArgs {
-    block: CapturedBlock,
-    ignore_errors: bool,
-    rest: Vec<Value>,
-}
-
-impl WholeStreamCommand for Do {
-    fn name(&self) -> &str {
-        "do"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("do")
-            .required("block", SyntaxShape::Block, "the block to run ")
-            .switch(
-                "ignore-errors",
-                "ignore errors as the block runs",
-                Some('i'),
-            )
-            .rest("rest", SyntaxShape::Any, "the parameter(s) for the block")
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a block, optionally ignoring errors."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        do_(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Run the block",
-                example: r#"do { echo hello }"#,
-                result: Some(vec![Value::from("hello")]),
-            },
-            Example {
-                description: "Run the block and ignore errors",
-                example: r#"do -i { thisisnotarealcommand }"#,
-                result: Some(vec![]),
-            },
-            Example {
-                description: "Run the block with a parameter",
-                example: r#"do { |x| $x + 100 } 55"#,
-                result: Some(vec![UntaggedValue::int(155).into()]),
-            },
-        ]
-    }
-}
-
-fn do_(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let external_redirection = args.call_info.args.external_redirection;
-
-    let context = args.context().clone();
-    let do_args = DoArgs {
-        block: args.req(0)?,
-        ignore_errors: args.has_flag("ignore-errors"),
-        rest: args.rest(1)?,
-    };
-
-    let block_redirection = match external_redirection {
-        ExternalRedirection::None => {
-            if do_args.ignore_errors {
-                ExternalRedirection::Stderr
-            } else {
-                ExternalRedirection::None
-            }
-        }
-        ExternalRedirection::Stdout => {
-            if do_args.ignore_errors {
-                ExternalRedirection::StdoutAndStderr
-            } else {
-                ExternalRedirection::Stdout
-            }
-        }
-        x => x,
-    };
-
-    context.scope.enter_scope();
-
-    context.scope.add_vars(&do_args.block.captured.entries);
-
-    for (param, value) in do_args
-        .block
-        .block
-        .params
-        .positional
-        .iter()
-        .zip(do_args.rest)
-    {
-        context.scope.add_var(param.0.name(), value.clone());
-    }
-
-    let result = run_block(
-        &do_args.block.block,
-        &context,
-        args.input,
-        block_redirection,
-    );
-    context.scope.exit_scope();
-
-    if do_args.ignore_errors {
-        // To properly ignore errors we need to redirect stderr, consume it, and remove
-        // any errors we see in the process.
-
-        match result {
-            Ok(mut stream) => {
-                let output = stream.drain_vec();
-                context.clear_errors();
-                Ok(output.into_iter().into_output_stream())
-            }
-            Err(_) => Ok(OutputStream::empty()),
-        }
-    } else {
-        result.map(|x| x.into_output_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Do;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Do {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/echo.rs b/old_nushell/crates/nu-command/src/commands/core_commands/echo.rs
deleted file mode 100644
index cddd5081a..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/echo.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::hir::Operator;
-use nu_protocol::{Primitive, Range, RangeInclusion, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct Echo;
-
-impl WholeStreamCommand for Echo {
-    fn name(&self) -> &str {
-        "echo"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("echo").rest("rest", SyntaxShape::Any, "the values to echo")
-    }
-
-    fn usage(&self) -> &str {
-        "Echo the arguments back to the user."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<InputStream, ShellError> {
-        echo(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Put a hello message in the pipeline",
-                example: "echo 'hello'",
-                result: Some(vec![Value::from("hello")]),
-            },
-            Example {
-                description: "Print the value of the special '$nu' variable",
-                example: "echo $nu",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn expand_value_to_stream(v: Value) -> InputStream {
-    match v {
-        Value {
-            value: UntaggedValue::Table(table),
-            ..
-        } => InputStream::from_stream(table.into_iter()),
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Range(range)),
-            tag,
-        } => InputStream::from_stream(RangeIterator::new(*range, tag)),
-        x => InputStream::one(x),
-    }
-}
-
-fn echo(args: CommandArgs) -> Result<InputStream, ShellError> {
-    let rest: Vec<Value> = args.rest(0)?;
-
-    let stream = rest.into_iter().map(|i| match i.as_string() {
-        Ok(s) => InputStream::one(UntaggedValue::string(s).into_value(i.tag)),
-        _ => expand_value_to_stream(i),
-    });
-
-    Ok(InputStream::from_stream(stream.flatten()))
-}
-
-struct RangeIterator {
-    curr: UntaggedValue,
-    end: UntaggedValue,
-    tag: Tag,
-    is_end_inclusive: bool,
-    moves_up: bool,
-    one: UntaggedValue,
-    negative_one: UntaggedValue,
-    done: bool,
-}
-
-impl RangeIterator {
-    pub fn new(range: Range, tag: Tag) -> RangeIterator {
-        let start = match range.from.0.item {
-            Primitive::Nothing => Primitive::Int(0.into()),
-            x => x,
-        };
-
-        let end = match range.to.0.item {
-            Primitive::Nothing => Primitive::Int(i64::MAX),
-            x => x,
-        };
-
-        RangeIterator {
-            moves_up: start <= end,
-            curr: UntaggedValue::Primitive(start),
-            end: UntaggedValue::Primitive(end),
-            tag,
-            is_end_inclusive: matches!(range.to.1, RangeInclusion::Inclusive),
-            one: UntaggedValue::int(1),
-            negative_one: UntaggedValue::int(-1),
-            done: false,
-        }
-    }
-}
-
-impl Iterator for RangeIterator {
-    type Item = Value;
-    fn next(&mut self) -> Option<Self::Item> {
-        use std::cmp::Ordering;
-        if self.done {
-            return None;
-        }
-
-        let ordering = if self.end == UntaggedValue::Primitive(Primitive::Nothing) {
-            Ordering::Less
-        } else {
-            match (&self.curr, &self.end) {
-                (
-                    UntaggedValue::Primitive(Primitive::Int(x)),
-                    UntaggedValue::Primitive(Primitive::Int(y)),
-                ) => x.cmp(y),
-                (
-                    UntaggedValue::Primitive(Primitive::Decimal(x)),
-                    UntaggedValue::Primitive(Primitive::Decimal(y)),
-                ) => x.cmp(y),
-                (
-                    UntaggedValue::Primitive(Primitive::Decimal(x)),
-                    UntaggedValue::Primitive(Primitive::Int(y)),
-                ) => x.cmp(&(BigDecimal::from(*y))),
-                (
-                    UntaggedValue::Primitive(Primitive::Int(x)),
-                    UntaggedValue::Primitive(Primitive::Decimal(y)),
-                ) => (BigDecimal::from(*x)).cmp(y),
-                _ => {
-                    self.done = true;
-                    return Some(
-                        UntaggedValue::Error(ShellError::labeled_error(
-                            "Cannot create range",
-                            "unsupported range",
-                            self.tag.span,
-                        ))
-                        .into_untagged_value(),
-                    );
-                }
-            }
-        };
-
-        if self.moves_up
-            && (ordering == Ordering::Less || self.is_end_inclusive && ordering == Ordering::Equal)
-        {
-            let next_value = nu_data::value::compute_values(Operator::Plus, &self.curr, &self.one);
-
-            let mut next = match next_value {
-                Ok(result) => result,
-
-                Err((left_type, right_type)) => {
-                    self.done = true;
-                    return Some(
-                        UntaggedValue::Error(ShellError::coerce_error(
-                            left_type.spanned(self.tag.span),
-                            right_type.spanned(self.tag.span),
-                        ))
-                        .into_untagged_value(),
-                    );
-                }
-            };
-            std::mem::swap(&mut self.curr, &mut next);
-
-            Some(next.into_value(self.tag.clone()))
-        } else if !self.moves_up
-            && (ordering == Ordering::Greater
-                || self.is_end_inclusive && ordering == Ordering::Equal)
-        {
-            let next_value =
-                nu_data::value::compute_values(Operator::Plus, &self.curr, &self.negative_one);
-
-            let mut next = match next_value {
-                Ok(result) => result,
-                Err((left_type, right_type)) => {
-                    self.done = true;
-                    return Some(
-                        UntaggedValue::Error(ShellError::coerce_error(
-                            left_type.spanned(self.tag.span),
-                            right_type.spanned(self.tag.span),
-                        ))
-                        .into_untagged_value(),
-                    );
-                }
-            };
-            std::mem::swap(&mut self.curr, &mut next);
-
-            Some(next.into_value(self.tag.clone()))
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Echo;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Echo {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/error/make.rs b/old_nushell/crates/nu-command/src/commands/core_commands/error/make.rs
deleted file mode 100644
index 0d3ca69fe..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/error/make.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "error make"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("error make")
-    }
-
-    fn usage(&self) -> &str {
-        "Create an error."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let input = args.input;
-
-        Ok(input
-            .map(|value| {
-                make_error(&value)
-                    .map(|err| UntaggedValue::Error(err).into_value(value.tag()))
-                    .unwrap_or_else(|| {
-                        UntaggedValue::Error(ShellError::untagged_runtime_error(
-                            "Creating error value not supported.",
-                        ))
-                        .into_value(value.tag())
-                    })
-            })
-            .into_output_stream())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates a labeled error",
-            example: r#"[
-  [          msg,                 labels,                      span];
-  ["The message", "Helpful message here", ([[start, end]; [0, 141]])]
-] | error make"#,
-            result: None,
-        }]
-    }
-}
-
-fn make_error(value: &Value) -> Option<ShellError> {
-    if let Value {
-        value: UntaggedValue::Row(dict),
-        ..
-    } = value
-    {
-        let msg = dict.get_data_by_key("msg".spanned_unknown());
-
-        let labels =
-            dict.get_data_by_key("labels".spanned_unknown())
-                .and_then(|table| match &table.value {
-                    UntaggedValue::Table(_) => table
-                        .table_entries()
-                        .map(|value| value.as_string().ok())
-                        .collect(),
-                    UntaggedValue::Primitive(Primitive::String(label)) => {
-                        Some(vec![label.to_string()])
-                    }
-                    _ => None,
-                });
-
-        let _anchor = dict.get_data_by_key("tag".spanned_unknown());
-        let span = dict.get_data_by_key("span".spanned_unknown());
-
-        if msg.is_none() || labels.is_none() || span.is_none() {
-            return None;
-        }
-
-        let msg = msg.and_then(|msg| msg.as_string().ok());
-
-        if let Some(labels) = labels {
-            if labels.is_empty() {
-                return None;
-            }
-
-            return Some(ShellError::labeled_error(
-                msg.expect("Message will always be present."),
-                &labels[0],
-                span.map(|data| match data {
-                    Value {
-                        value: UntaggedValue::Row(vals),
-                        ..
-                    } => match (vals.entries.get("start"), vals.entries.get("end")) {
-                        (Some(start), Some(end)) => {
-                            let start = start.as_usize().ok().unwrap_or(0);
-                            let end = end.as_usize().ok().unwrap_or(0);
-
-                            Span::new(start, end)
-                        }
-                        (_, _) => Span::unknown(),
-                    },
-                    _ => Span::unknown(),
-                })
-                .unwrap_or_else(Span::unknown),
-            ));
-        }
-    }
-
-    None
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/error/mod.rs b/old_nushell/crates/nu-command/src/commands/core_commands/error/mod.rs
deleted file mode 100644
index 4a2ff564f..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/error/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod make;
-
-pub use make::SubCommand as ErrorMake;
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/find.rs b/old_nushell/crates/nu-command/src/commands/core_commands/find.rs
deleted file mode 100644
index 559f9fa3b..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/find.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct Find;
-
-impl WholeStreamCommand for Find {
-    fn name(&self) -> &str {
-        "find"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("find").rest("rest", SyntaxShape::String, "search term")
-    }
-
-    fn usage(&self) -> &str {
-        "Find text in the output of a previous command"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        find(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Search pipeline output for multiple terms",
-                example: r#"ls | find toml md sh"#,
-                result: None,
-            },
-            Example {
-                description: "Search strings for term(s)",
-                example: r#"echo Cargo.toml | find toml"#,
-                result: Some(vec![Value::from("Cargo.toml")]),
-            },
-            Example {
-                description: "Search a number list for term(s)",
-                example: r#"[1 2 3 4 5] | find 5"#,
-                result: Some(vec![UntaggedValue::int(5).into()]),
-            },
-            Example {
-                description: "Search string list for term(s)",
-                example: r#"[moe larry curly] | find l"#,
-                result: Some(vec![Value::from("larry"), Value::from("curly")]),
-            },
-        ]
-    }
-}
-
-fn row_contains(row: &Dictionary, search_terms: Vec<String>) -> bool {
-    for term in search_terms {
-        for (k, v) in &row.entries {
-            let key = k.to_string().trim().to_lowercase();
-            let value = v.convert_to_string().trim().to_lowercase();
-            if key.contains(&term) || value.contains(&term) {
-                return true;
-            }
-        }
-    }
-
-    false
-}
-
-fn find(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let rest: Vec<Value> = args.rest(0)?;
-
-    Ok(args
-        .input
-        .filter(move |row| match &row.value {
-            UntaggedValue::Row(row) => {
-                let sterms: Vec<String> = rest
-                    .iter()
-                    .map(|t| t.convert_to_string().trim().to_lowercase())
-                    .collect();
-                row_contains(row, sterms)
-            }
-            UntaggedValue::Primitive(_p) => {
-                // eprint!("prim {}", p.type_name());
-                let sterms: Vec<String> = rest
-                    .iter()
-                    .map(|t| t.convert_to_string().trim().to_lowercase())
-                    .collect();
-
-                let prim_string = &row.convert_to_string().trim().to_lowercase();
-                for term in sterms {
-                    if prim_string.contains(&term) {
-                        return true;
-                    }
-                }
-
-                false
-            }
-            _ => false,
-        })
-        .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Find;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Find {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/help.rs b/old_nushell/crates/nu-command/src/commands/core_commands/help.rs
deleted file mode 100644
index 08a74bffa..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/help.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use crate::prelude::*;
-use crate::TaggedListBuilder;
-use nu_engine::{documentation::generate_docs, Command, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{
-    Dictionary, NamedType, PositionalType, ReturnSuccess, Signature, SyntaxShape,
-    TaggedDictBuilder, UntaggedValue, Value,
-};
-use nu_source::{SpannedItem, Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct Help;
-
-impl WholeStreamCommand for Help {
-    fn name(&self) -> &str {
-        "help"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("help")
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the name of command to get help on",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "string to find in command usage",
-                Some('f'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Display help information about commands."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        help(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "show all commands and sub-commands",
-                example: "help commands",
-                result: None,
-            },
-            Example {
-                description: "generate documentation",
-                example: "help generate_docs",
-                result: None,
-            },
-            Example {
-                description: "show help for single command",
-                example: "help match",
-                result: None,
-            },
-            Example {
-                description: "show help for single sub-command",
-                example: "help str lpad",
-                result: None,
-            },
-            Example {
-                description: "search for string in command usage",
-                example: "help --find char",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn help(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let scope = args.scope().clone();
-    let find: Option<Tagged<String>> = args.get_flag("find")?;
-    let rest: Vec<Tagged<String>> = args.rest(0)?;
-
-    if let Some(f) = find {
-        let search_string = f.item;
-        let full_commands = scope.get_commands_info();
-        let mut found_cmds_vec = Vec::new();
-
-        for (key, cmd) in full_commands {
-            let mut indexmap = IndexMap::new();
-
-            let c = cmd.usage().to_string();
-            let e = cmd.extra_usage().to_string();
-            if key.to_lowercase().contains(&search_string)
-                || c.to_lowercase().contains(&search_string)
-                || e.to_lowercase().contains(&search_string)
-            {
-                indexmap.insert(
-                    "name".to_string(),
-                    UntaggedValue::string(key).into_value(&name),
-                );
-
-                indexmap.insert(
-                    "usage".to_string(),
-                    UntaggedValue::string(cmd.usage().to_string()).into_value(&name),
-                );
-
-                indexmap.insert(
-                    "extra_usage".to_string(),
-                    UntaggedValue::string(cmd.extra_usage().to_string()).into_value(&name),
-                );
-
-                found_cmds_vec
-                    .push(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&name));
-            }
-        }
-
-        return Ok(found_cmds_vec.into_iter().into_action_stream());
-    }
-
-    if !rest.is_empty() {
-        if rest[0].item == "commands" {
-            let mut sorted_names = scope.get_command_names();
-            sorted_names.sort();
-
-            let (mut subcommand_names, command_names) = sorted_names
-                .into_iter()
-                // private only commands shouldn't be displayed
-                .filter(|cmd_name| {
-                    scope
-                        .get_command(cmd_name)
-                        .filter(|command| !command.is_private())
-                        .is_some()
-                })
-                .partition::<Vec<_>, _>(|cmd_name| cmd_name.contains(' '));
-
-            fn process_name(
-                dict: &mut TaggedDictBuilder,
-                cmd_name: &str,
-                scope: Scope,
-                rest: Vec<Tagged<String>>,
-                name: Tag,
-            ) -> Result<(), ShellError> {
-                let document_tag = rest[0].tag.clone();
-                let value = command_dict(
-                    scope.get_command(cmd_name).ok_or_else(|| {
-                        ShellError::labeled_error(
-                            format!("Could not load {}", cmd_name),
-                            "could not load command",
-                            document_tag,
-                        )
-                    })?,
-                    name,
-                );
-
-                dict.insert_untagged("name", cmd_name);
-                dict.insert_untagged(
-                    "description",
-                    value
-                        .get_data_by_key("usage".spanned_unknown())
-                        .ok_or_else(|| {
-                            ShellError::labeled_error(
-                                "Expected a usage key",
-                                "expected a 'usage' key",
-                                &value.tag,
-                            )
-                        })?
-                        .as_string()?,
-                );
-
-                Ok(())
-            }
-
-            fn make_subcommands_table(
-                subcommand_names: &mut Vec<String>,
-                cmd_name: &str,
-                scope: Scope,
-                rest: Vec<Tagged<String>>,
-                name: Tag,
-            ) -> Result<Value, ShellError> {
-                let (matching, not_matching) =
-                    subcommand_names.drain(..).partition(|subcommand_name| {
-                        subcommand_name.starts_with(&format!("{} ", cmd_name))
-                    });
-                *subcommand_names = not_matching;
-                Ok(if !matching.is_empty() {
-                    UntaggedValue::table(
-                        &(matching
-                            .into_iter()
-                            .map(|cmd_name: String| -> Result<_, ShellError> {
-                                let mut short_desc = TaggedDictBuilder::new(name.clone());
-                                process_name(
-                                    &mut short_desc,
-                                    &cmd_name,
-                                    scope.clone(),
-                                    rest.clone(),
-                                    name.clone(),
-                                )?;
-                                Ok(short_desc.into_value())
-                            })
-                            .collect::<Result<Vec<_>, _>>()?[..]),
-                    )
-                    .into_value(name)
-                } else {
-                    UntaggedValue::nothing().into_value(name)
-                })
-            }
-
-            let iterator =
-                command_names
-                    .into_iter()
-                    .map(move |cmd_name| -> Result<_, ShellError> {
-                        let mut short_desc = TaggedDictBuilder::new(name.clone());
-                        process_name(
-                            &mut short_desc,
-                            &cmd_name,
-                            scope.clone(),
-                            rest.clone(),
-                            name.clone(),
-                        )?;
-                        short_desc.insert_value(
-                            "subcommands",
-                            make_subcommands_table(
-                                &mut subcommand_names,
-                                &cmd_name,
-                                scope.clone(),
-                                rest.clone(),
-                                name.clone(),
-                            )?,
-                        );
-                        ReturnSuccess::value(short_desc.into_value())
-                    });
-
-            Ok(iterator.into_action_stream())
-        } else if rest[0].item == "generate_docs" {
-            Ok(ActionStream::one(ReturnSuccess::value(generate_docs(
-                &scope,
-            ))))
-        } else if rest.len() == 2 {
-            // Check for a subcommand
-            let command_name = format!("{} {}", rest[0].item, rest[1].item);
-            if let Some(command) = scope.get_command(&command_name) {
-                Ok(ActionStream::one(ReturnSuccess::value(
-                    UntaggedValue::string(get_full_help(command.stream_command(), &scope))
-                        .into_value(Tag::unknown()),
-                )))
-            } else {
-                Ok(ActionStream::empty())
-            }
-        } else if let Some(command) = scope.get_command(&rest[0].item) {
-            Ok(ActionStream::one(ReturnSuccess::value(
-                UntaggedValue::string(get_full_help(command.stream_command(), &scope))
-                    .into_value(Tag::unknown()),
-            )))
-        } else {
-            Err(ShellError::labeled_error(
-                "Can't find command (use 'help commands' for full list)",
-                "can't find command",
-                rest[0].tag.span,
-            ))
-        }
-    } else {
-        let msg = r#"Welcome to Nushell.
-
-Here are some tips to help you get started.
-  * help commands - list all available commands
-  * help <command name> - display help about a particular command
-
-Nushell works on the idea of a "pipeline". Pipelines are commands connected with the '|' character.
-Each stage in the pipeline works together to load, parse, and display information to you.
-
-[Examples]
-
-List the files in the current directory, sorted by size:
-    ls | sort-by size
-
-Get information about the current system:
-    sys | get host
-
-Get the processes on your system actively using CPU:
-    ps | where cpu > 0
-
-You can also learn more at https://www.nushell.sh/book/"#;
-
-        Ok(ActionStream::one(ReturnSuccess::value(
-            UntaggedValue::string(msg).into_value(Tag::unknown()),
-        )))
-    }
-}
-
-fn for_spec(name: &str, ty: &str, required: bool, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-
-    let mut spec = TaggedDictBuilder::new(tag);
-
-    spec.insert_untagged("name", UntaggedValue::string(name));
-    spec.insert_untagged("type", UntaggedValue::string(ty));
-    spec.insert_untagged(
-        "required",
-        UntaggedValue::string(if required { "yes" } else { "no" }),
-    );
-
-    spec.into_value()
-}
-
-pub fn signature_dict(signature: Signature, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-    let mut sig = TaggedListBuilder::new(&tag);
-
-    for arg in &signature.positional {
-        let is_required = matches!(arg.0, PositionalType::Mandatory(_, _));
-
-        sig.push_value(for_spec(arg.0.name(), "argument", is_required, &tag));
-    }
-
-    if signature.rest_positional.is_some() {
-        let is_required = false;
-        sig.push_value(for_spec("rest", "argument", is_required, &tag));
-    }
-
-    for (name, ty) in &signature.named {
-        match ty.0 {
-            NamedType::Mandatory(_, _) => sig.push_value(for_spec(name, "flag", true, &tag)),
-            NamedType::Optional(_, _) => sig.push_value(for_spec(name, "flag", false, &tag)),
-            NamedType::Switch(_) => sig.push_value(for_spec(name, "switch", false, &tag)),
-        }
-    }
-
-    sig.into_value()
-}
-
-fn command_dict(command: Command, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-
-    let mut cmd_dict = TaggedDictBuilder::new(&tag);
-
-    cmd_dict.insert_untagged("name", UntaggedValue::string(command.name()));
-
-    cmd_dict.insert_untagged("type", UntaggedValue::string("Command"));
-
-    cmd_dict.insert_value("signature", signature_dict(command.signature(), tag));
-    cmd_dict.insert_untagged("usage", UntaggedValue::string(command.usage()));
-
-    cmd_dict.into_value()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Help;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Help {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/history.rs b/old_nushell/crates/nu-command/src/commands/core_commands/history.rs
deleted file mode 100644
index 76447b246..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/history.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-use std::fs::File;
-use std::io::{BufRead, BufReader};
-
-pub struct History;
-
-impl WholeStreamCommand for History {
-    fn name(&self) -> &str {
-        "history"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("history").switch("clear", "Clears out the history entries", Some('c'))
-    }
-
-    fn usage(&self) -> &str {
-        "Display command history."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        history(args)
-    }
-}
-
-fn history(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let clear = args.has_flag("clear");
-
-    let path = if let Some(global_cfg) = &ctx.configs().lock().global_config {
-        nu_data::config::path::history_path_or_default(global_cfg)
-    } else {
-        nu_data::config::path::default_history_path()
-    };
-
-    if clear {
-        // This is a NOOP, the logic to clear is handled in cli.rs
-        Ok(ActionStream::empty())
-    } else if let Ok(file) = File::open(path) {
-        let reader = BufReader::new(file);
-        // Skips the first line, which is a Rustyline internal
-        let output = reader.lines().skip(1).filter_map(move |line| match line {
-            Ok(line) => Some(ReturnSuccess::value(
-                UntaggedValue::string(line).into_value(tag.clone()),
-            )),
-            Err(_) => None,
-        });
-
-        Ok(output.into_action_stream())
-    } else {
-        Err(ShellError::labeled_error(
-            "Could not open history",
-            "history file could not be opened",
-            tag,
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::History;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(History {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/if_.rs b/old_nushell/crates/nu-command/src/commands/core_commands/if_.rs
deleted file mode 100644
index 85451ec19..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/if_.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
-};
-use nu_stream::OutputStream;
-
-pub struct If;
-
-impl WholeStreamCommand for If {
-    fn name(&self) -> &str {
-        "if"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("if")
-            .required(
-                "condition",
-                SyntaxShape::MathExpression,
-                "the condition that must match",
-            )
-            .required(
-                "then_case",
-                SyntaxShape::Block,
-                "block to run if condition is true",
-            )
-            .required(
-                "else_case",
-                SyntaxShape::Block,
-                "block to run if condition is false",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Run blocks if a condition is true or false."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        if_command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Run a block if a condition is true",
-                example: "let x = 10; if $x > 5 { echo 'greater than 5' } { echo 'less than or equal to 5' }",
-                result: Some(vec![UntaggedValue::string("greater than 5").into()]),
-            },
-            Example {
-                description: "Run a block if a condition is false",
-                example: "let x = 1; if $x > 5 { echo 'greater than 5' } { echo 'less than or equal to 5' }",
-                result: Some(vec![UntaggedValue::string("less than or equal to 5").into()]),
-            },
-        ]
-    }
-}
-fn if_command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let external_redirection = args.call_info.args.external_redirection;
-    let context = Arc::new(args.context.clone());
-
-    let condition: CapturedBlock = args.req(0)?;
-    let then_case: CapturedBlock = args.req(1)?;
-    let else_case: CapturedBlock = args.req(2)?;
-    let input = args.input;
-
-    let cond = {
-        if condition.block.block.len() != 1 {
-            return Err(ShellError::labeled_error(
-                "Expected a condition",
-                "expected a condition",
-                tag,
-            ));
-        }
-        match condition.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => expr,
-                _ => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            },
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-        }
-    };
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&condition.captured.entries);
-
-    //FIXME: should we use the scope that's brought in as well?
-    let condition = evaluate_baseline_expr(cond, &context);
-    let result = match condition {
-        Ok(condition) => match condition.as_bool() {
-            Ok(b) => {
-                if b {
-                    run_block(&then_case.block, &context, input, external_redirection)
-                } else {
-                    run_block(&else_case.block, &context, input, external_redirection)
-                }
-            }
-            Err(e) => Ok(OutputStream::from_stream(
-                vec![UntaggedValue::Error(e).into_untagged_value()].into_iter(),
-            )),
-        },
-        Err(e) => Ok(OutputStream::from_stream(
-            vec![UntaggedValue::Error(e).into_untagged_value()].into_iter(),
-        )),
-    };
-    context.scope.exit_scope();
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use super::If;
-    use super::ShellError;
-    use nu_test_support::nu;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(If {})
-    }
-
-    #[test]
-    fn if_doesnt_leak_on_error() {
-        let actual = nu!(
-            ".",
-            r#"
-                def test-leak [] {
-                    let var = "hello"
-                    if 0 == "" {echo ok} {echo not}
-                }
-                test-leak
-                echo $var
-            "#
-        );
-
-        assert!(actual.err.contains("unknown variable"));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/ignore.rs b/old_nushell/crates/nu-command/src/commands/core_commands/ignore.rs
deleted file mode 100644
index 9283a4885..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/ignore.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-extern crate unicode_segmentation;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-
-pub struct Ignore;
-
-impl WholeStreamCommand for Ignore {
-    fn name(&self) -> &str {
-        "ignore"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ignore")
-    }
-
-    fn usage(&self) -> &str {
-        "Ignore the output of the previous command in the pipeline"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let _: Vec<_> = args.input.collect();
-
-        Ok(OutputStream::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Ignore the output of an echo command",
-            example: r#"echo done | ignore"#,
-            result: None,
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Ignore;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Ignore {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/let_.rs b/old_nushell/crates/nu-command/src/commands/core_commands/let_.rs
deleted file mode 100644
index fb52df72b..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/let_.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{evaluate_baseline_expr, FromValue, WholeStreamCommand};
-
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ClassifiedCommand},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-pub struct Let;
-
-impl WholeStreamCommand for Let {
-    fn name(&self) -> &str {
-        "let"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("let")
-            .required("name", SyntaxShape::String, "the name of the variable")
-            .required("equals", SyntaxShape::String, "the equals sign")
-            .required(
-                "expr",
-                SyntaxShape::MathExpression,
-                "the value for the variable",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Create a variable and give it a value."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        letcmd(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Assign a simple value to a variable",
-                example: "let x = 3",
-                result: Some(vec![]),
-            },
-            Example {
-                description: "Assign the result of an expression to a variable",
-                example: "let result = (3 + 7); echo $result",
-                result: Some(vec![UntaggedValue::int(1).into()]),
-            },
-            Example {
-                description: "Create a variable using the full name",
-                example: "let $three = 3",
-                result: Some(vec![]),
-            },
-        ]
-    }
-}
-
-pub fn letcmd(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let ctx = &args.context;
-    let positional = args
-        .call_info
-        .args
-        .positional
-        .expect("Internal error: type checker should require args");
-
-    let var_name = positional[0].var_name()?;
-    let rhs_raw = evaluate_baseline_expr(&positional[2], ctx)?;
-    let tag: Tag = positional[2].span.into();
-
-    let rhs: CapturedBlock = FromValue::from_value(&rhs_raw)?;
-
-    let (expr, _) = {
-        if rhs.block.block.len() != 1 {
-            return Err(ShellError::labeled_error(
-                "Expected a value",
-                "expected a value",
-                tag,
-            ));
-        }
-        match rhs.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => (expr, &rhs.captured),
-                _ => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a value",
-                        "expected a value",
-                        tag,
-                    ));
-                }
-            },
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Expected a value",
-                    "expected a value",
-                    tag,
-                ));
-            }
-        }
-    };
-
-    ctx.scope.enter_scope();
-    let value = evaluate_baseline_expr(expr, ctx);
-    ctx.scope.exit_scope();
-
-    let value = value?;
-
-    // Note: this is a special case for setting the context from a command
-    // In this case, if we don't set it now, we'll lose the scope that this
-    // variable should be set into.
-    ctx.scope.add_var(var_name, value);
-
-    Ok(ActionStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/mod.rs b/old_nushell/crates/nu-command/src/commands/core_commands/mod.rs
deleted file mode 100644
index c7fd932d5..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/mod.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-mod alias;
-mod debug;
-mod def;
-mod describe;
-mod do_;
-pub(crate) mod echo;
-mod error;
-mod find;
-mod help;
-mod history;
-mod if_;
-mod ignore;
-mod let_;
-mod nu_plugin;
-mod nu_signature;
-mod source;
-mod tags;
-mod tutor;
-mod unalias;
-mod version;
-
-pub use self::nu_plugin::SubCommand as NuPlugin;
-pub use self::nu_signature::{
-    loglevels, testbins, version as core_version, Command as NuSignature,
-};
-pub use alias::Alias;
-pub use debug::Debug;
-pub use def::Def;
-pub use describe::Describe;
-pub use do_::Do;
-pub use echo::Echo;
-pub use error::*;
-pub use find::Find;
-pub use help::Help;
-pub use history::History;
-pub use if_::If;
-pub use ignore::Ignore;
-pub use let_::Let;
-pub use source::Source;
-pub use tags::Tags;
-pub use tutor::Tutor;
-pub use unalias::Unalias;
-pub use version::{version, Version};
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/nu_plugin.rs b/old_nushell/crates/nu-command/src/commands/core_commands/nu_plugin.rs
deleted file mode 100644
index 0f91a6c14..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/nu_plugin.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use std::path::PathBuf;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_path::canonicalize_with;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
-
-pub struct SubCommand;
-
-#[derive(Deserialize)]
-pub struct Arguments {
-    #[serde(rename = "load")]
-    pub load_path: Option<Tagged<PathBuf>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "nu plugin"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("nu plugin").named(
-            "load",
-            SyntaxShape::FilePath,
-            "a path to load the plugins from",
-            Some('l'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Nu Plugin"
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Load all plugins in the current directory",
-            example: "nu plugin --load .",
-            result: None,
-        }]
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let scope = args.scope().clone();
-        let shell_manager = args.shell_manager();
-
-        let load_path: Option<Tagged<PathBuf>> = args.get_flag("load")?;
-
-        if let Some(Tagged {
-            item: load_path,
-            tag,
-        }) = load_path
-        {
-            let path = canonicalize_with(load_path, shell_manager.path()).map_err(|_| {
-                ShellError::labeled_error(
-                    "Cannot load plugins from directory",
-                    "directory not found",
-                    &tag,
-                )
-            })?;
-
-            if !path.is_dir() {
-                return Err(ShellError::labeled_error(
-                    "Cannot load plugins from directory",
-                    "is not a directory",
-                    &tag,
-                ));
-            }
-
-            #[cfg(unix)]
-            {
-                let has_exec = path
-                    .metadata()
-                    .map(|m| umask::Mode::from(m.permissions().mode()).has(umask::USER_READ))
-                    .map_err(|e| {
-                        ShellError::labeled_error(
-                            "Cannot load plugins from directory",
-                            format!("cannot stat ({})", e),
-                            &tag,
-                        )
-                    })?;
-
-                if !has_exec {
-                    return Err(ShellError::labeled_error(
-                        "Cannot load plugins from directory",
-                        "permission denied",
-                        &tag,
-                    ));
-                }
-            }
-
-            return Ok(vec![ReturnSuccess::action(CommandAction::AddPlugins(
-                path.to_string_lossy().to_string(),
-            ))]
-            .into());
-        }
-
-        Ok(ActionStream::one(ReturnSuccess::value(
-            UntaggedValue::string(get_full_help(&SubCommand, &scope)).into_value(Tag::unknown()),
-        )))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/nu_signature.rs b/old_nushell/crates/nu-command/src/commands/core_commands/nu_signature.rs
deleted file mode 100644
index d8a74295d..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/nu_signature.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use nu_engine::WholeStreamCommand;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "nu"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("nu")
-            .switch("version", "Display Nu version", Some('v'))
-            .switch("stdin", "redirect stdin", None)
-            .switch("skip-plugins", "do not load plugins", None)
-            .switch("no-history", "don't save history", None)
-            .switch("perf", "show startup performance metrics", None)
-            .switch("login", "start Nu as if it was a login shell", Some('l'))
-            .named(
-                "commands",
-                SyntaxShape::String,
-                "commands to run",
-                Some('c'),
-            )
-            .named(
-                "testbin",
-                SyntaxShape::String,
-                "test bin: echo_env, cococo, iecho, fail, nonu, chop, repeater, meow",
-                None,
-            )
-            .named("develop", SyntaxShape::String, "trace mode", None)
-            .named("debug", SyntaxShape::String, "debug mode", None)
-            .named(
-                "loglevel",
-                SyntaxShape::String,
-                "LEVEL: error, warn, info, debug, trace",
-                None,
-            )
-            .named(
-                "config-file",
-                SyntaxShape::FilePath,
-                "custom configuration source file",
-                None,
-            )
-            .rest("rest", SyntaxShape::String, "source file(s) to run")
-    }
-
-    fn usage(&self) -> &str {
-        "Nu - A new type of shell."
-    }
-}
-
-pub fn version() -> &'static str {
-    env!("CARGO_PKG_VERSION")
-}
-
-pub fn testbins() -> Vec<String> {
-    vec![
-        "echo_env", "cococo", "iecho", "fail", "nonu", "chop", "repeater", "meow",
-    ]
-    .into_iter()
-    .map(String::from)
-    .collect()
-}
-
-pub fn loglevels() -> Vec<String> {
-    vec!["error", "warn", "info", "debug", "trace"]
-        .into_iter()
-        .map(String::from)
-        .collect()
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/source.rs b/old_nushell/crates/nu-command/src/commands/core_commands/source.rs
deleted file mode 100644
index 862ef6286..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/source.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{script, WholeStreamCommand};
-
-use nu_errors::ShellError;
-use nu_path::{canonicalize, canonicalize_with};
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-
-use std::path::Path;
-
-pub struct Source;
-
-#[derive(Deserialize)]
-pub struct SourceArgs {
-    pub filename: Tagged<String>,
-}
-
-impl WholeStreamCommand for Source {
-    fn name(&self) -> &str {
-        "source"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("source").required(
-            "filename",
-            SyntaxShape::FilePath,
-            "the filepath to the script file to source",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a script file in the current context."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        source(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![]
-    }
-}
-
-pub fn source(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-    let filename: Tagged<String> = args.req(0)?;
-
-    let source_file = Path::new(&filename.item);
-
-    // Note: this is a special case for setting the context from a command
-    // In this case, if we don't set it now, we'll lose the scope that this
-    // variable should be set into.
-
-    let lib_dirs = &ctx
-        .configs()
-        .lock()
-        .global_config
-        .as_ref()
-        .map(|configuration| match configuration.var("lib_dirs") {
-            Some(paths) => paths
-                .table_entries()
-                .cloned()
-                .map(|path| path.as_string())
-                .collect(),
-            None => vec![],
-        });
-
-    if let Some(dir) = lib_dirs {
-        for lib_path in dir {
-            match lib_path {
-                Ok(name) => {
-                    let path = if let Ok(p) = canonicalize_with(&source_file, name) {
-                        p
-                    } else {
-                        continue;
-                    };
-
-                    if let Ok(contents) = std::fs::read_to_string(path) {
-                        let result = script::run_script_standalone(contents, true, ctx, false);
-
-                        if let Err(err) = result {
-                            ctx.error(err);
-                        }
-                        return Ok(OutputStream::empty());
-                    }
-                }
-                Err(reason) => {
-                    ctx.error(reason.clone());
-                }
-            }
-        }
-    }
-
-    let path = canonicalize(source_file).map_err(|e| {
-        ShellError::labeled_error(
-            format!("Can't load source file. Reason: {}", e),
-            "Can't load this file",
-            filename.span(),
-        )
-    })?;
-
-    let contents = std::fs::read_to_string(path);
-
-    match contents {
-        Ok(contents) => {
-            let result = script::run_script_standalone(contents, true, ctx, false);
-
-            if let Err(err) = result {
-                ctx.error(err);
-            }
-            Ok(OutputStream::empty())
-        }
-        Err(e) => {
-            ctx.error(ShellError::labeled_error(
-                format!("Can't load source file. Reason: {}", e),
-                "Can't load this file",
-                filename.span(),
-            ));
-
-            Ok(OutputStream::empty())
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/tags.rs b/old_nushell/crates/nu-command/src/commands/core_commands/tags.rs
deleted file mode 100644
index 73e39b274..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/tags.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, TaggedDictBuilder, UntaggedValue, Value};
-
-pub struct Tags;
-
-impl WholeStreamCommand for Tags {
-    fn name(&self) -> &str {
-        "tags"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("tags")
-    }
-
-    fn usage(&self) -> &str {
-        "Read the tags (metadata) for values."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(tags(args))
-    }
-}
-
-fn build_tag_table(tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-    let span = tag.span;
-
-    TaggedDictBuilder::build(tag.clone(), |tags| {
-        if let Some(anchor) = anchor_as_value(&tag) {
-            tags.insert_value("anchor", anchor);
-        }
-
-        tags.insert_value(
-            "span",
-            TaggedDictBuilder::build(tag.clone(), |span_dict| {
-                span_dict.insert_untagged("start", UntaggedValue::int(span.start() as i64));
-                span_dict.insert_untagged("end", UntaggedValue::int(span.end() as i64));
-            }),
-        );
-    })
-}
-
-fn tags(args: CommandArgs) -> OutputStream {
-    if args.input.is_empty() {
-        OutputStream::one(build_tag_table(&args.name_tag()))
-    } else {
-        args.input
-            .map(move |v| build_tag_table(v.tag()))
-            .into_output_stream()
-    }
-}
-
-fn anchor_as_value(tag: &Tag) -> Option<Value> {
-    let anchor = tag.anchor.as_ref();
-
-    anchor.as_ref()?;
-
-    Some(TaggedDictBuilder::build(tag, |table| {
-        let value = match anchor {
-            Some(AnchorLocation::File(path)) => {
-                Some(("file", UntaggedValue::from(path.to_string())))
-            }
-            Some(AnchorLocation::Url(destination)) => {
-                Some(("url", UntaggedValue::from(destination.to_string())))
-            }
-            Some(AnchorLocation::Source(text)) => Some((
-                "source",
-                UntaggedValue::Primitive(Primitive::String(text.to_string())),
-            )),
-            None => None,
-        };
-
-        if let Some((key, value)) = value {
-            table.insert_untagged(key, value);
-        }
-    }))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Tags;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Tags {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/tutor.rs b/old_nushell/crates/nu-command/src/commands/core_commands/tutor.rs
deleted file mode 100644
index 284515ae5..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/tutor.rs
+++ /dev/null
@@ -1,431 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-
-pub struct Tutor;
-
-impl WholeStreamCommand for Tutor {
-    fn name(&self) -> &str {
-        "tutor"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("tutor")
-            .optional(
-                "search",
-                SyntaxShape::String,
-                "item to search for, or 'list' to list available tutorials",
-            )
-            .named(
-                "find",
-                SyntaxShape::String,
-                "Search tutorial for a phrase",
-                Some('f'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Run the tutorial. To begin, run: tutor"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        tutor(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Begin the tutorial",
-                example: "tutor begin",
-                result: None,
-            },
-            Example {
-                description: "Search a tutorial by phrase",
-                example: "tutor -f \"$in\"",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn tutor(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let scope = args.scope().clone();
-
-    let search: Option<String> = args.opt(0).unwrap_or(None);
-    let find: Option<String> = args.get_flag("find")?;
-
-    let search_space = [
-        (vec!["begin"], begin_tutor()),
-        (
-            vec!["table", "tables", "row", "rows", "column", "columns"],
-            table_tutor(),
-        ),
-        (vec!["cell", "cells"], cell_tutor()),
-        (
-            vec![
-                "expr",
-                "exprs",
-                "expressions",
-                "subexpression",
-                "subexpressions",
-                "sub-expression",
-                "sub-expressions",
-            ],
-            expression_tutor(),
-        ),
-        (vec!["echo"], echo_tutor()),
-        (vec!["each", "iteration", "iter"], each_tutor()),
-        (
-            vec!["var", "vars", "variable", "variables"],
-            variable_tutor(),
-        ),
-        (vec!["engine-q", "e-q"], engineq_tutor()),
-        (vec!["block", "blocks"], block_tutor()),
-        (vec!["shorthand", "shorthands"], shorthand_tutor()),
-    ];
-
-    if let Some(find) = find {
-        let mut results = vec![];
-        for search_group in search_space {
-            if search_group.1.contains(&find) {
-                results.push(search_group.0[0].to_string())
-            }
-        }
-
-        let message = format!("You can find '{}' in the following topics:\n{}\n\nYou can learn about a topic using `tutor` followed by the name of the topic.\nFor example: `tutor table` to open the table topic.\n\n",
-            find,
-            results.into_iter().map(|x| format!("- {}", x)).join("\n")
-        );
-
-        return Ok(display(tag, &scope, &message));
-    } else if let Some(search) = search {
-        for search_group in search_space {
-            if search_group.0.contains(&search.as_str()) {
-                return Ok(display(tag, &scope, search_group.1));
-            }
-        }
-    }
-    Ok(display(tag, &scope, default_tutor()))
-}
-
-fn default_tutor() -> &'static str {
-    r#"
-Welcome to the Nushell tutorial!
-
-With the `tutor` command, you'll be able to learn a lot about how Nushell
-works along with many fun tips and tricks to speed up everyday tasks.
-
-To get started, you can use `tutor begin`.
-
-"#
-}
-
-fn begin_tutor() -> &'static str {
-    r#"
-Nushell is a structured shell and programming language. One way to begin
-using it is to try a few of the commands.
-
-The first command to try is `ls`. The `ls` command will show you a list
-of the files in the current directory. Notice that these files are shown
-as a table. Each column of this table not only tells us what is being
-shown, but also gives us a way to work with the data.
-
-You can combine the `ls` command with other commands using the pipeline
-symbol '|'. This allows data to flow from one command to the next.
-
-For example, if we only wanted the name column, we could do:
-```
-ls | select name
-```
-Notice that we still get a table, but this time it only has one column:
-the name column.
-
-You can continue to learn more about tables by running:
-```
-tutor tables
-```
-If at any point, you'd like to restart this tutorial, you can run:
-```
-tutor begin
-```
-"#
-}
-
-fn table_tutor() -> &'static str {
-    r#"
-The most common form of data in Nushell is the table. Tables contain rows and
-columns of data. In each cell of the table, there is data that you can access
-using Nushell commands.
-
-To get the 3rd row in the table, you can use the `nth` command:
-```
-ls | nth 2
-```
-This will get the 3rd (note that `nth` is zero-based) row in the table created
-by the `ls` command. You can use `nth` on any table created by other commands
-as well.
-
-You can also access the column of data in one of two ways. If you want
-to keep the column as part of a new table, you can use `select`.
-```
-ls | select name
-```
-This runs `ls` and returns only the "name" column of the table.
-
-If, instead, you'd like to get access to the values inside of the column, you
-can use the `get` command.
-```
-ls | get name
-```
-This allows us to get to the list of strings that are the filenames rather
-than having a full table. In some cases, this can make the names easier to 
-work with.
-
-You can continue to learn more about working with cells of the table by
-running:
-```
-tutor cells
-```
-"#
-}
-
-fn cell_tutor() -> &'static str {
-    r#"
-Working with cells of data in the table is a key part of working with data in
-Nushell. Because of this, there is a rich list of commands to work with cells
-as well as handy shorthands for accessing cells.
-
-Cells can hold simple values like strings and numbers, or more complex values
-like lists and tables.
-
-To reach a cell of data from a table, you can combine a row operation and a
-column operation.
-```
-ls | nth 4 | get name
-```
-You can combine these operations into one step using a shortcut.
-```
-(ls).4.name
-```
-Names/strings represent columns names and numbers represent row numbers.
-
-The `(ls)` is a form of expression. You can continue to learn more about
-expressions by running:
-```
-tutor expressions
-```
-You can also learn about these cell shorthands by running:
-```
-tutor shorthands
-```
-"#
-}
-
-fn expression_tutor() -> &'static str {
-    r#"
-Expressions give you the power to mix calls to commands with math. The
-simplest expression is a single value like a string or number.
-```
-3
-```
-Expressions can also include math operations like addition or division.
-```
-10 / 2
-```
-Normally, an expression is one type of operation: math or commands. You can
-mix these types by using subexpressions. Subexpressions are just like
-expressions, but they're wrapped in parentheses `()`.
-```
-10 * (3 + 4)
-```
-Here we use parentheses to create a higher math precedence in the math 
-expression.
-```
-echo (2 + 3)
-```
-You can continue to learn more about the `echo` command by running:
-```
-tutor echo
-```
-"#
-}
-
-fn echo_tutor() -> &'static str {
-    r#"
-The `echo` command in Nushell is a powerful tool for not only seeing values,
-but also for creating new ones.
-```
-echo "Hello"
-```
-You can echo output. This output, if it's not redirected using a "|" pipeline
-will be displayed to the screen.
-```
-echo 1..10
-```
-You can also use echo to work with individual values of a range. In this
-example, `echo` will create the values from 1 to 10 as a list.
-```
-echo 1 2 3 4 5
-```
-You can also create lists of values by passing `echo` multiple arguments.
-This can be helpful if you want to later processes these values.
-
-The `echo` command can pair well with the `each` command which can run
-code on each row, or item, of input.
-
-You can continue to learn more about the `each` command by running:
-```
-tutor each
-```
-"#
-}
-
-fn each_tutor() -> &'static str {
-    r#"
-The `each` command gives us a way of working with each individual row or
-element of a list one at a time. It reads these in from the pipeline and
-runs a block on each element. A block is a group of pipelines.
-```
-echo 1 2 3 | each { $it + 10}
-```
-This example iterates over each element sent by `echo`, giving us three new
-values that are the original value + 10. Here, the `$it` is a variable that
-is the name given to the block's parameter by default.
-
-You can learn more about blocks by running:
-```
-tutor blocks
-```
-You can also learn more about variables by running:
-```
-tutor variables
-```
-"#
-}
-
-fn variable_tutor() -> &'static str {
-    r#"
-Variables are an important way to store values to be used later. To create a
-variable, you can use the `let` keyword. The `let` command will create a
-variable and then assign it a value in one step.
-```
-let $x = 3
-```
-Once created, we can refer to this variable by name.
-```
-$x
-```
-Nushell also comes with built-in variables. The `$nu` variable is a reserved
-variable that contains a lot of information about the currently running
-instance of Nushell. The `$it` variable is the name given to block parameters
-if you don't specify one. And `$in` is the variable that allows you to work
-with all of the data coming in from the pipeline in one place.
-
-"#
-}
-
-fn block_tutor() -> &'static str {
-    r#"
-Blocks are a special form of expression that hold code to be run at a later
-time. Often, you'll see blocks as one of the arguments given to commands
-like `each` and `if`.
-```
-ls | each {|x| $x.name}
-```
-The above will create a list of the filenames in the directory.
-```
-if $true { echo "it's true" } { echo "it's not true" }
-```
-This `if` call will run the first block if the expression is true, or the
-second block if the expression is false.
-
-"#
-}
-
-fn shorthand_tutor() -> &'static str {
-    r#"
-You can access cells in a table using a shorthand notation sometimes called a
-"column path" or "cell path". These paths allow you to go from a table to
-rows, columns, or cells inside of the table.
-
-Shorthand paths are made from rows numbers, column names, or both. You can use
-them on any variable or subexpression.
-```
-$nu.cwd
-```
-The above accesses the built-in `$nu` variable, gets its table, and then uses
-the shorthand path to retrieve only the cell data inside the "cwd" column.
-```
-(ls).name.4
-```
-This will retrieve the cell data in the "name" column on the 5th row (note: 
-row numbers are zero-based).
-
-Rows and columns don't need to come in any specific order. You can get the
-same value using:
-```
-(ls).4.name
-```
-"#
-}
-
-fn engineq_tutor() -> &'static str {
-    r#"
-Engine-q is the upcoming engine for Nushell. Build for speed and correctness, 
-it also comes with a set of changes from Nushell versions prior to 0.60. To 
-get ready for engine-q look for some of these changes that might impact your
-current scripts:
-
-* Engine-q now uses a few new data structures, including a record syntax
-  that allows you to model key-value pairs similar to JSON objects.
-* Environment variables can now contain more than just strings. Structured
-  values are converted to strings for external commands using converters.
-* `if` will now use an `else` keyword before the else block.
-* We're moving from "config.toml" to "config.nu". This means startup will 
-  now be a script file.
-* `config` and its subcommands are being replaced by a record that you can
-  update in the shell which contains all the settings under the variable
-  `$config`.
-* bigint/bigdecimal values are now machine i64 and f64 values
-* And more, you can read more about upcoming changes in the up-to-date list
-  at: https://github.com/nushell/engine-q/issues/522
-"#
-}
-
-fn display(tag: Tag, scope: &Scope, help: &str) -> OutputStream {
-    let help = help.split('`');
-
-    let mut build = String::new();
-    let mut code_mode = false;
-    let palette = nu_engine::DefaultPalette {};
-
-    for item in help {
-        if code_mode {
-            code_mode = false;
-
-            //TODO: support no-color mode
-            let colored_example = nu_engine::Painter::paint_string(item, scope, &palette);
-            build.push_str(&colored_example);
-        } else {
-            code_mode = true;
-            build.push_str(item);
-        }
-    }
-
-    OutputStream::one(UntaggedValue::string(build).into_value(tag))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Tutor;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Tutor {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/unalias.rs b/old_nushell/crates/nu-command/src/commands/core_commands/unalias.rs
deleted file mode 100644
index 75de72b95..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/unalias.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Unalias;
-
-impl WholeStreamCommand for Unalias {
-    fn name(&self) -> &str {
-        "unalias"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("unalias").required("name", SyntaxShape::String, "the name of the alias")
-    }
-
-    fn usage(&self) -> &str {
-        "Removes an alias"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        unalias(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Remove the 'v' alias",
-            example: "unalias v",
-            result: None,
-        }]
-    }
-}
-
-pub fn unalias(_: CommandArgs) -> Result<OutputStream, ShellError> {
-    Ok(OutputStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/core_commands/version.rs b/old_nushell/crates/nu-command/src/commands/core_commands/version.rs
deleted file mode 100644
index dcd08bcf0..000000000
--- a/old_nushell/crates/nu-command/src/commands/core_commands/version.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-use crate::prelude::*;
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{value::StrExt, value::StringExt, Dictionary, Signature, UntaggedValue};
-
-pub mod shadow {
-    include!(concat!(env!("OUT_DIR"), "/shadow.rs"));
-}
-
-pub struct Version;
-
-impl WholeStreamCommand for Version {
-    fn name(&self) -> &str {
-        "version"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("version")
-    }
-
-    fn usage(&self) -> &str {
-        "Display Nu version."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        version(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Display Nu version",
-            example: "version",
-            result: None,
-        }]
-    }
-}
-
-pub fn version(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.args.span;
-
-    let mut indexmap = IndexMap::with_capacity(4);
-
-    indexmap.insert(
-        "version".to_string(),
-        UntaggedValue::string(super::nu_signature::version()).into_value(&tag),
-    );
-
-    let branch: Option<&str> = Some(shadow::BRANCH).filter(|x| !x.is_empty());
-    if let Some(branch) = branch {
-        indexmap.insert(
-            "branch".to_string(),
-            branch.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let short_commit: Option<&str> = Some(shadow::SHORT_COMMIT).filter(|x| !x.is_empty());
-    if let Some(short_commit) = short_commit {
-        indexmap.insert(
-            "short_commit".to_string(),
-            short_commit.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-    let commit_hash: Option<&str> = Some(shadow::COMMIT_HASH).filter(|x| !x.is_empty());
-    if let Some(commit_hash) = commit_hash {
-        indexmap.insert(
-            "commit_hash".to_string(),
-            commit_hash.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-    let commit_date: Option<&str> = Some(shadow::COMMIT_DATE).filter(|x| !x.is_empty());
-    if let Some(commit_date) = commit_date {
-        indexmap.insert(
-            "commit_date".to_string(),
-            commit_date.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let build_os: Option<&str> = Some(shadow::BUILD_OS).filter(|x| !x.is_empty());
-    if let Some(build_os) = build_os {
-        indexmap.insert(
-            "build_os".to_string(),
-            build_os.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let rust_version: Option<&str> = Some(shadow::RUST_VERSION).filter(|x| !x.is_empty());
-    if let Some(rust_version) = rust_version {
-        indexmap.insert(
-            "rust_version".to_string(),
-            rust_version.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let rust_channel: Option<&str> = Some(shadow::RUST_CHANNEL).filter(|x| !x.is_empty());
-    if let Some(rust_channel) = rust_channel {
-        indexmap.insert(
-            "rust_channel".to_string(),
-            rust_channel.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let cargo_version: Option<&str> = Some(shadow::CARGO_VERSION).filter(|x| !x.is_empty());
-    if let Some(cargo_version) = cargo_version {
-        indexmap.insert(
-            "cargo_version".to_string(),
-            cargo_version.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let pkg_version: Option<&str> = Some(shadow::PKG_VERSION).filter(|x| !x.is_empty());
-    if let Some(pkg_version) = pkg_version {
-        indexmap.insert(
-            "pkg_version".to_string(),
-            pkg_version.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let build_time: Option<&str> = Some(shadow::BUILD_TIME).filter(|x| !x.is_empty());
-    if let Some(build_time) = build_time {
-        indexmap.insert(
-            "build_time".to_string(),
-            build_time.to_pattern_untagged_value().into_value(&tag),
-        );
-    }
-
-    let build_rust_channel: Option<&str> =
-        Some(shadow::BUILD_RUST_CHANNEL).filter(|x| !x.is_empty());
-    if let Some(build_rust_channel) = build_rust_channel {
-        indexmap.insert(
-            "build_rust_channel".to_string(),
-            build_rust_channel
-                .to_pattern_untagged_value()
-                .into_value(&tag),
-        );
-    }
-
-    indexmap.insert(
-        "features".to_string(),
-        features_enabled().join(", ").to_string_value_create_tag(),
-    );
-
-    // Manually create a list of all possible plugin names
-    let all_plugins = vec![
-        "fetch",
-        "inc",
-        "match",
-        "post",
-        "ps",
-        "sys",
-        "textview",
-        "binaryview",
-        "chart bar",
-        "chart line",
-        "from bson",
-        "from sqlite",
-        "query json",
-        "s3",
-        "selector",
-        "start",
-        "to bson",
-        "to sqlite",
-        "tree",
-        "xpath",
-    ];
-
-    // Get a list of command names and check for plugins
-    let installed_plugins = args
-        .scope()
-        .get_command_names()
-        .into_iter()
-        .filter(|cmd| all_plugins.contains(&cmd.as_str()))
-        .collect::<Vec<_>>();
-
-    indexmap.insert(
-        "installed_plugins".to_string(),
-        installed_plugins.join(", ").to_string_value_create_tag(),
-    );
-
-    let value = UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag);
-    Ok(OutputStream::one(value))
-}
-
-fn features_enabled() -> Vec<String> {
-    let mut names = vec!["default".to_string()];
-
-    // NOTE: There should be another way to know
-    // features on.
-    #[cfg(feature = "ctrlc")]
-    {
-        names.push("ctrlc".to_string());
-    }
-
-    // #[cfg(feature = "rich-benchmark")]
-    // {
-    //     names.push("rich-benchmark".to_string());
-    // }
-
-    #[cfg(feature = "rustyline-support")]
-    {
-        names.push("rustyline".to_string());
-    }
-
-    #[cfg(feature = "term")]
-    {
-        names.push("term".to_string());
-    }
-
-    #[cfg(feature = "uuid_crate")]
-    {
-        names.push("uuid".to_string());
-    }
-
-    #[cfg(feature = "which")]
-    {
-        names.push("which".to_string());
-    }
-
-    #[cfg(feature = "zip")]
-    {
-        names.push("zip".to_string());
-    }
-
-    #[cfg(feature = "trash-support")]
-    {
-        names.push("trash".to_string());
-    }
-
-    #[cfg(feature = "dataframe")]
-    {
-        names.push("dataframe".to_string());
-    }
-
-    #[cfg(feature = "table-pager")]
-    {
-        names.push("table-pager".to_string());
-    }
-
-    // #[cfg(feature = "binaryview")]
-    // {
-    //     names.push("binaryview".to_string());
-    // }
-
-    // #[cfg(feature = "start")]
-    // {
-    //     names.push("start".to_string());
-    // }
-
-    // #[cfg(feature = "bson")]
-    // {
-    //     names.push("bson".to_string());
-    // }
-
-    // #[cfg(feature = "sqlite")]
-    // {
-    //     names.push("sqlite".to_string());
-    // }
-
-    // #[cfg(feature = "s3")]
-    // {
-    //     names.push("s3".to_string());
-    // }
-
-    // #[cfg(feature = "chart")]
-    // {
-    //     names.push("chart".to_string());
-    // }
-
-    // #[cfg(feature = "xpath")]
-    // {
-    //     names.push("xpath".to_string());
-    // }
-
-    // #[cfg(feature = "selector")]
-    // {
-    //     names.push("selector".to_string());
-    // }
-
-    // #[cfg(feature = "extra")]
-    // {
-    //     names.push("extra".to_string());
-    // }
-
-    // #[cfg(feature = "preserve_order")]
-    // {
-    //     names.push("preserve_order".to_string());
-    // }
-
-    // #[cfg(feature = "wee_alloc")]
-    // {
-    //     names.push("wee_alloc".to_string());
-    // }
-
-    // #[cfg(feature = "console_error_panic_hook")]
-    // {
-    //     names.push("console_error_panic_hook".to_string());
-    // }
-
-    names.sort();
-
-    names
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Version;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Version {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/aggregate.rs b/old_nushell/crates/nu-command/src/commands/dataframe/aggregate.rs
deleted file mode 100644
index b5649a56b..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/aggregate.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, FrameStruct, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::{frame::groupby::GroupBy, prelude::PolarsError};
-
-enum Operation {
-    Mean,
-    Sum,
-    Min,
-    Max,
-    First,
-    Last,
-    Nunique,
-    Quantile(f64),
-    Median,
-    Var,
-    Std,
-    Count,
-}
-
-impl Operation {
-    fn from_tagged(
-        name: &Tagged<String>,
-        quantile: Option<Tagged<f64>>,
-    ) -> Result<Operation, ShellError> {
-        match name.item.as_ref() {
-            "mean" => Ok(Operation::Mean),
-            "sum" => Ok(Operation::Sum),
-            "min" => Ok(Operation::Min),
-            "max" => Ok(Operation::Max),
-            "first" => Ok(Operation::First),
-            "last" => Ok(Operation::Last),
-            "nunique" => Ok(Operation::Nunique),
-            "quantile" => {
-                match quantile {
-                    None => Err(ShellError::labeled_error(
-                        "Quantile value not fount",
-                        "Quantile operation requires quantile value",
-                        &name.tag,
-                    )),
-                Some(value ) => {
-                    if (value.item < 0.0) | (value.item > 1.0) {
-                        Err(ShellError::labeled_error(
-                            "Inappropriate quantile",
-                            "Quantile value should be between 0.0 and 1.0",
-                            &value.tag,
-                        ))
-                    } else {
-                        Ok(Operation::Quantile(value.item))
-                    }
-                }
-                }
-            }
-            "median" => Ok(Operation::Median),
-            "var" => Ok(Operation::Var),
-            "std" => Ok(Operation::Std),
-            "count" => Ok(Operation::Count),
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Operation not fount",
-                "Operation does not exist",
-                &name.tag,
-                "Perhaps you want: mean, sum, min, max, first, last, nunique, quantile, median, var, std, or count",
-                &name.tag,
-            )),
-        }
-    }
-}
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe aggregate"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame, GroupBy, Series] Performs an aggregation operation on a dataframe, groupby or series object"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe aggregate")
-            .required("operation", SyntaxShape::String, "aggregate operation")
-            .named(
-                "quantile",
-                SyntaxShape::Number,
-                "quantile value for quantile operation",
-                Some('q'),
-            )
-            .switch(
-                "explicit",
-                "returns explicit names for groupby aggregations",
-                Some('e'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Aggregate sum by grouping by column a and summing on col b",
-                example:
-                    "[[a b]; [one 1] [one 2]] | dataframe to-df | dataframe group-by a | dataframe aggregate sum",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![UntaggedValue::string("one").into()]),
-                        Column::new("b".to_string(), vec![UntaggedValue::int(3).into()]),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Aggregate sum in dataframe columns",
-                example: "[[a b]; [4 1] [5 2]] | dataframe to-df | dataframe aggregate sum",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![UntaggedValue::int(9).into()]),
-                        Column::new("b".to_string(), vec![UntaggedValue::int(3).into()]),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Aggregate sum in series",
-                example: "[4 1 5 6] | dataframe to-df | dataframe aggregate sum",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("0".to_string(), vec![UntaggedValue::int(16).into()]),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let quantile: Option<Tagged<f64>> = args.get_flag("quantile")?;
-    let operation: Tagged<String> = args.req(0)?;
-    let op = Operation::from_tagged(&operation, quantile)?;
-
-    let value = args.input.next().ok_or_else(|| {
-        ShellError::labeled_error("Empty stream", "No value found in the stream", &tag)
-    })?;
-
-    match value.value {
-        UntaggedValue::FrameStruct(FrameStruct::GroupBy(nu_groupby)) => {
-            let groupby = nu_groupby.to_groupby()?;
-
-            let res = perform_groupby_aggregation(
-                groupby,
-                op,
-                &operation.tag,
-                &tag.span,
-                args.has_flag("explicit"),
-            )?;
-
-            Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-        }
-        UntaggedValue::DataFrame(df) => {
-            let df = df.as_ref();
-
-            let res = perform_dataframe_aggregation(df, op, &operation.tag)?;
-
-            Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "No groupby, dataframe or series in stream",
-            "no groupby, dataframe or series found in input stream",
-            &value.tag.span,
-        )),
-    }
-}
-
-fn perform_groupby_aggregation(
-    groupby: GroupBy,
-    operation: Operation,
-    operation_tag: &Tag,
-    agg_span: &Span,
-    explicit: bool,
-) -> Result<polars::prelude::DataFrame, ShellError> {
-    let mut res = match operation {
-        Operation::Mean => groupby.mean(),
-        Operation::Sum => groupby.sum(),
-        Operation::Min => groupby.min(),
-        Operation::Max => groupby.max(),
-        Operation::First => groupby.first(),
-        Operation::Last => groupby.last(),
-        Operation::Nunique => groupby.n_unique(),
-        Operation::Quantile(quantile) => groupby.quantile(quantile),
-        Operation::Median => groupby.median(),
-        Operation::Var => groupby.var(),
-        Operation::Std => groupby.std(),
-        Operation::Count => groupby.count(),
-    }
-    .map_err(|e| {
-        let span = match &e {
-            PolarsError::NotFound(_) => agg_span,
-            _ => &operation_tag.span,
-        };
-
-        parse_polars_error::<&str>(&e, span, None)
-    })?;
-
-    if !explicit {
-        let col_names = res
-            .get_column_names()
-            .iter()
-            .map(|name| name.to_string())
-            .collect::<Vec<String>>();
-
-        for col in col_names {
-            let from = match operation {
-                Operation::Mean => "_mean",
-                Operation::Sum => "_sum",
-                Operation::Min => "_min",
-                Operation::Max => "_max",
-                Operation::First => "_first",
-                Operation::Last => "_last",
-                Operation::Nunique => "_n_unique",
-                Operation::Quantile(_) => "_quantile",
-                Operation::Median => "_median",
-                Operation::Var => "_agg_var",
-                Operation::Std => "_agg_std",
-                Operation::Count => "_count",
-            };
-
-            let new_col = match col.find(from) {
-                Some(index) => &col[..index],
-                None => &col[..],
-            };
-
-            res.rename(&col, new_col)
-                .expect("Column is always there. Looping with known names");
-        }
-    }
-
-    Ok(res)
-}
-
-fn perform_dataframe_aggregation(
-    dataframe: &polars::prelude::DataFrame,
-    operation: Operation,
-    operation_tag: &Tag,
-) -> Result<polars::prelude::DataFrame, ShellError> {
-    match operation {
-        Operation::Mean => Ok(dataframe.mean()),
-        Operation::Sum => Ok(dataframe.sum()),
-        Operation::Min => Ok(dataframe.min()),
-        Operation::Max => Ok(dataframe.max()),
-        Operation::Quantile(quantile) => dataframe
-            .quantile(quantile)
-            .map_err(|e| parse_polars_error::<&str>(&e, &operation_tag.span, None)),
-        Operation::Median => Ok(dataframe.median()),
-        Operation::Var => Ok(dataframe.var()),
-        Operation::Std => Ok(dataframe.std()),
-        _ => Err(ShellError::labeled_error_with_secondary(
-            "Not valid operation",
-            "operation not valid for dataframe",
-            &operation_tag.span,
-            "Perhaps you want: mean, sum, min, max, quantile, median, var, or std",
-            &operation_tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/append.rs b/old_nushell/crates/nu-command/src/commands/dataframe/append.rs
deleted file mode 100644
index 503daac65..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/append.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Axis, Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe append"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Appends a new dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe append")
-            .required_named(
-                "other",
-                SyntaxShape::Any,
-                "dataframe to be appended",
-                Some('o'),
-            )
-            .required_named(
-                "axis",
-                SyntaxShape::String,
-                "row or col axis orientation",
-                Some('a'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Appends a dataframe as new columns",
-                example: r#"let a = ([[a b]; [1 2] [3 4]] | dataframe to-df);
-    $a | dataframe append -o $a -a row"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                        ),
-                        Column::new(
-                            "a_x".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                        ),
-                        Column::new(
-                            "b_x".to_string(),
-                            vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Appends a dataframe merging at the end of columns",
-                example: r#"let a = ([[a b]; [1 2] [3 4]] | dataframe to-df);
-    $a | dataframe append -o $a -a col"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(3).into(),
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(3).into(),
-                            ],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![
-                                UntaggedValue::int(2).into(),
-                                UntaggedValue::int(4).into(),
-                                UntaggedValue::int(2).into(),
-                                UntaggedValue::int(4).into(),
-                            ],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let other: Value = args.req_named("other")?;
-    let axis: Tagged<String> = args.req_named("axis")?;
-
-    let axis = Axis::try_from_str(&axis.item, &axis.tag.span)?;
-
-    let df_other = match other.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only append a dataframe to a dataframe",
-            other.tag.span,
-        )),
-    }?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let df_new = df.append_df(&df_other, axis, &tag.span)?;
-    Ok(OutputStream::one(df_new.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/column.rs b/old_nushell/crates/nu-command/src/commands/dataframe/column.rs
deleted file mode 100644
index e0b566818..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/column.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe column"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Returns the selected column as Series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe column").required("column", SyntaxShape::String, "column name")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns the selected column as series",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe column a",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "a".to_string(),
-                    vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let column: Tagged<String> = args.req(0)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_ref()
-        .column(&column.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &column.tag.span, None))?;
-
-    let df = NuDataFrame::try_from_series(vec![res.clone()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/command.rs b/old_nushell/crates/nu-command/src/commands/dataframe/command.rs
deleted file mode 100644
index 09ea55aba..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/command.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "dataframe"
-    }
-
-    fn usage(&self) -> &str {
-        "Commands to work with polars dataframes"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/describe.rs b/old_nushell/crates/nu-command/src/commands/dataframe/describe.rs
deleted file mode 100644
index 6cd06bfbc..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/describe.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::{
-    chunked_array::ChunkedArray,
-    prelude::{
-        AnyValue, DataFrame as PolarsDF, DataType, Float64Type, IntoSeries, NewChunkedArray,
-        Series, Utf8Type,
-    },
-};
-
-use super::utils::parse_polars_error;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe describe"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Describes dataframes numeric columns"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe describe")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Describes dataframe",
-            example: "[[a b]; [1 1] [1 1]] | dataframe to-df | dataframe describe",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "descriptor".to_string(),
-                        vec![
-                            UntaggedValue::string("count").into(),
-                            UntaggedValue::string("sum").into(),
-                            UntaggedValue::string("mean").into(),
-                            UntaggedValue::string("median").into(),
-                            UntaggedValue::string("std").into(),
-                            UntaggedValue::string("min").into(),
-                            UntaggedValue::string("25%").into(),
-                            UntaggedValue::string("50%").into(),
-                            UntaggedValue::string("75%").into(),
-                            UntaggedValue::string("max").into(),
-                        ],
-                    ),
-                    Column::new(
-                        "a (i64)".to_string(),
-                        vec![
-                            UntaggedValue::decimal_from_float(2.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(2.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(0.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "b (i64)".to_string(),
-                        vec![
-                            UntaggedValue::decimal_from_float(2.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(2.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(0.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                            UntaggedValue::decimal_from_float(1.0, Span::default()).into(),
-                        ],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let names = ChunkedArray::<Utf8Type>::new_from_opt_slice(
-        "descriptor",
-        &[
-            Some("count"),
-            Some("sum"),
-            Some("mean"),
-            Some("median"),
-            Some("std"),
-            Some("min"),
-            Some("25%"),
-            Some("50%"),
-            Some("75%"),
-            Some("max"),
-        ],
-    )
-    .into_series();
-
-    let head = std::iter::once(names);
-
-    let tail = df.as_ref().get_columns().iter().map(|col| {
-        let count = col.len() as f64;
-
-        let sum = match col.sum_as_series().cast(&DataType::Float64) {
-            Ok(ca) => match ca.get(0) {
-                AnyValue::Float64(v) => Some(v),
-                _ => None,
-            },
-            Err(_) => None,
-        };
-
-        let mean = match col.mean_as_series().get(0) {
-            AnyValue::Float64(v) => Some(v),
-            _ => None,
-        };
-
-        let median = match col.median_as_series().get(0) {
-            AnyValue::Float64(v) => Some(v),
-            _ => None,
-        };
-
-        let std = match col.std_as_series().get(0) {
-            AnyValue::Float64(v) => Some(v),
-            _ => None,
-        };
-
-        let min = match col.min_as_series().cast(&DataType::Float64) {
-            Ok(ca) => match ca.get(0) {
-                AnyValue::Float64(v) => Some(v),
-                _ => None,
-            },
-            Err(_) => None,
-        };
-
-        let q_25 = match col.quantile_as_series(0.25) {
-            Ok(ca) => match ca.cast(&DataType::Float64) {
-                Ok(ca) => match ca.get(0) {
-                    AnyValue::Float64(v) => Some(v),
-                    _ => None,
-                },
-                Err(_) => None,
-            },
-            Err(_) => None,
-        };
-
-        let q_50 = match col.quantile_as_series(0.50) {
-            Ok(ca) => match ca.cast(&DataType::Float64) {
-                Ok(ca) => match ca.get(0) {
-                    AnyValue::Float64(v) => Some(v),
-                    _ => None,
-                },
-                Err(_) => None,
-            },
-            Err(_) => None,
-        };
-
-        let q_75 = match col.quantile_as_series(0.75) {
-            Ok(ca) => match ca.cast(&DataType::Float64) {
-                Ok(ca) => match ca.get(0) {
-                    AnyValue::Float64(v) => Some(v),
-                    _ => None,
-                },
-                Err(_) => None,
-            },
-            Err(_) => None,
-        };
-
-        let max = match col.max_as_series().cast(&DataType::Float64) {
-            Ok(ca) => match ca.get(0) {
-                AnyValue::Float64(v) => Some(v),
-                _ => None,
-            },
-            Err(_) => None,
-        };
-
-        let name = format!("{} ({})", col.name(), col.dtype());
-        ChunkedArray::<Float64Type>::new_from_opt_slice(
-            &name,
-            &[
-                Some(count),
-                sum,
-                mean,
-                median,
-                std,
-                min,
-                q_25,
-                q_50,
-                q_75,
-                max,
-            ],
-        )
-        .into_series()
-    });
-
-    let res = head.chain(tail).collect::<Vec<Series>>();
-    let df = PolarsDF::new(res).map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-    let df = NuDataFrame::dataframe_to_value(df, tag);
-    Ok(OutputStream::one(df))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/drop.rs b/old_nushell/crates/nu-command/src/commands/dataframe/drop.rs
deleted file mode 100644
index eef03a3ff..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/drop.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe drop"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates a new dataframe by dropping the selected columns"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe drop").rest(
-            "rest",
-            SyntaxShape::Any,
-            "column names to be dropped",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop column a",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe drop a",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "b".to_string(),
-                    vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let columns: Vec<Value> = args.rest(0)?;
-    let (col_string, col_span) = convert_columns(&columns, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let new_df = match col_string.get(0) {
-        Some(col) => df
-            .as_ref()
-            .drop(col)
-            .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None)),
-        None => Err(ShellError::labeled_error(
-            "Empty names list",
-            "No column names where found",
-            &col_span,
-        )),
-    }?;
-
-    // If there are more columns in the drop selection list, these
-    // are added from the resulting dataframe
-    let res = col_string.iter().skip(1).try_fold(new_df, |new_df, col| {
-        new_df
-            .drop(col)
-            .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))
-    })?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/drop_duplicates.rs b/old_nushell/crates/nu-command/src/commands/dataframe/drop_duplicates.rs
deleted file mode 100644
index 31420c3bc..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/drop_duplicates.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe drop-duplicates"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Drops duplicate values in dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe drop-duplicates")
-            .optional(
-                "subset",
-                SyntaxShape::Table,
-                "subset of columns to drop duplicates",
-            )
-            .switch("maintain", "maintain order", Some('m'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop duplicates",
-            example: "[[a b]; [1 2] [3 4] [1 2]] | dataframe to-df | dataframe drop-duplicates",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    // Extracting the selection columns of the columns to perform the aggregation
-    let columns: Option<Vec<Value>> = args.opt(0)?;
-    let (subset, col_span) = match columns {
-        Some(cols) => {
-            let (agg_string, col_span) = convert_columns(&cols, &tag)?;
-            (Some(agg_string), col_span)
-        }
-        None => (None, Span::unknown()),
-    };
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let subset_slice = subset.as_ref().map(|cols| &cols[..]);
-
-    let res = df
-        .as_ref()
-        .drop_duplicates(args.has_flag("maintain"), subset_slice)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/drop_nulls.rs b/old_nushell/crates/nu-command/src/commands/dataframe/drop_nulls.rs
deleted file mode 100644
index f974d914a..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/drop_nulls.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe drop-nulls"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame, Series] Drops null values in dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe drop-nulls").optional(
-            "subset",
-            SyntaxShape::Table,
-            "subset of columns to drop duplicates",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "drop null values in dataframe",
-                example: r#"let df = ([[a b]; [1 2] [3 0] [1 2]] | dataframe to-df);
-    let res = ($df.b / $df.b);
-    let df = ($df | dataframe with-column $res --name res);
-    $df | dataframe drop-nulls"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(1).into()],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![UntaggedValue::int(2).into(), UntaggedValue::int(2).into()],
-                        ),
-                        Column::new(
-                            "res".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(1).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "drop null values in dataframe",
-                example: r#"let s = ([1 2 0 0 3 4] | dataframe to-df);
-    ($s / $s) | dataframe drop-nulls"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "div_0_0".to_string(),
-                        vec![
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(1).into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let value = args.input.next().ok_or_else(|| {
-        ShellError::labeled_error("Empty stream", "No value found in stream", &tag.span)
-    })?;
-
-    match value.value {
-        UntaggedValue::DataFrame(df) => {
-            // Extracting the selection columns of the columns to perform the aggregation
-            let columns: Option<Vec<Value>> = args.opt(0)?;
-            let (subset, col_span) = match columns {
-                Some(cols) => {
-                    let (agg_string, col_span) = convert_columns(&cols, &tag)?;
-                    (Some(agg_string), col_span)
-                }
-                None => (None, Span::unknown()),
-            };
-
-            let subset_slice = subset.as_ref().map(|cols| &cols[..]);
-
-            let res = df
-                .as_ref()
-                .drop_nulls(subset_slice)
-                .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-            Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "drop nulls cannot be done with this value",
-            &value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/dtypes.rs b/old_nushell/crates/nu-command/src/commands/dataframe/dtypes.rs
deleted file mode 100644
index ac997ef55..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/dtypes.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe dtypes"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Show dataframe data types"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe dtypes")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "drop column a",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe dtypes",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "column".to_string(),
-                        vec![
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("b").into(),
-                        ],
-                    ),
-                    Column::new(
-                        "dtype".to_string(),
-                        vec![
-                            UntaggedValue::string("i64").into(),
-                            UntaggedValue::string("i64").into(),
-                        ],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-#[allow(clippy::needless_collect)]
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut dtypes: Vec<Value> = Vec::new();
-    let names: Vec<Value> = df
-        .as_ref()
-        .get_column_names()
-        .iter()
-        .map(|v| {
-            let dtype = df
-                .as_ref()
-                .column(v)
-                .expect("using name from list of names from dataframe")
-                .dtype();
-
-            let dtype_str = dtype.to_string();
-            dtypes.push(Value {
-                value: dtype_str.into(),
-                tag: Tag::default(),
-            });
-
-            Value {
-                value: v.to_string().into(),
-                tag: Tag::default(),
-            }
-        })
-        .collect();
-
-    let names_col = Column::new("column".to_string(), names);
-    let dtypes_col = Column::new("dtype".to_string(), dtypes);
-
-    let df = NuDataFrame::try_from_columns(vec![names_col, dtypes_col], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/dummies.rs b/old_nushell/crates/nu-command/src/commands/dataframe/dummies.rs
deleted file mode 100644
index cd977712e..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/dummies.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use super::utils::parse_polars_error;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-dummies"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates a new dataframe with dummy variables"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-dummies")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create new dataframe with dummy variables from a dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe to-dummies",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a_1".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(0).into()],
-                        ),
-                        Column::new(
-                            "a_3".to_string(),
-                            vec![UntaggedValue::int(0).into(), UntaggedValue::int(1).into()],
-                        ),
-                        Column::new(
-                            "b_2".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(0).into()],
-                        ),
-                        Column::new(
-                            "b_4".to_string(),
-                            vec![UntaggedValue::int(0).into(), UntaggedValue::int(1).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Create new dataframe with dummy variables from a series",
-                example: "[1 2 2 3 3] | dataframe to-df | dataframe to-dummies",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "0_1".to_string(),
-                            vec![
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                            ],
-                        ),
-                        Column::new(
-                            "0_2".to_string(),
-                            vec![
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                            ],
-                        ),
-                        Column::new(
-                            "0_3".to_string(),
-                            vec![
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(0).into(),
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(1).into(),
-                            ],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let value = args.input.next().ok_or_else(|| {
-        ShellError::labeled_error("Empty stream", "No value found in stream", &tag.span)
-    })?;
-
-    match value.value {
-        UntaggedValue::DataFrame(df) => {
-            let res = df.as_ref().to_dummies().map_err(|e| {
-                parse_polars_error(
-                    &e,
-                    &tag.span,
-                    Some("The only allowed column types for dummies are String or Int"),
-                )
-            })?;
-
-            Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "dummies cannot be done with this value",
-            &value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/filter.rs b/old_nushell/crates/nu-command/src/commands/dataframe/filter.rs
deleted file mode 100644
index 26a485028..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/filter.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe filter-with"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Filters dataframe using a mask as reference"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe filter-with").required(
-            "mask",
-            SyntaxShape::Any,
-            "boolean mask used to filter data",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Filter dataframe using a bool mask",
-                example: r#"let mask = ([$true $false] | dataframe to-df);
-    [[a b]; [1 2] [3 4]] | dataframe to-df | dataframe filter-with $mask"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new("a".to_string(), vec![UntaggedValue::int(1).into()]),
-                        Column::new("b".to_string(), vec![UntaggedValue::int(2).into()]),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Filter dataframe by creating a mask from operation",
-                example: r#"let mask = (([5 6] | dataframe to-df) > 5);
-    [[a b]; [1 2] [3 4]] | dataframe to-df | dataframe filter-with $mask"#,
-                result: None,
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-
-    let series_span = value.tag.span;
-    let df = match value.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only add a series to a dataframe",
-            value.tag.span,
-        )),
-    }?;
-    let series = df.as_series(&series_span)?;
-    let casted = series.bool().map_err(|e| {
-        parse_polars_error(
-            &e,
-            &series_span,
-            Some("Perhaps you want to use a series with booleans as mask"),
-        )
-    })?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_ref()
-        .filter(casted)
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/first.rs b/old_nushell/crates/nu-command/src/commands/dataframe/first.rs
deleted file mode 100644
index 0c23f4d59..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/first.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe first"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates new dataframe with first rows"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe select").optional(
-            "rows",
-            SyntaxShape::Number,
-            "Number of rows for head",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create new dataframe with head rows",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe first 1",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("a".to_string(), vec![UntaggedValue::int(1).into()]),
-                    Column::new("b".to_string(), vec![UntaggedValue::int(2).into()]),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let rows: Option<Tagged<usize>> = args.opt(0)?;
-
-    let rows = match rows {
-        Some(val) => val.item,
-        None => 5,
-    };
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let res = df.as_ref().head(Some(rows));
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/get.rs b/old_nushell/crates/nu-command/src/commands/dataframe/get.rs
deleted file mode 100644
index ebb8e6b85..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/get.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates dataframe with the selected columns"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get").rest(
-            "rest",
-            SyntaxShape::Any,
-            "column names to sort dataframe",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates dataframe with selected columns",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe get a",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "a".to_string(),
-                    vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let columns: Vec<Value> = args.rest(0)?;
-
-    let (col_string, col_span) = convert_columns(&columns, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_ref()
-        .select(&col_string)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/groupby.rs b/old_nushell/crates/nu-command/src/commands/dataframe/groupby.rs
deleted file mode 100644
index 3236f6d1c..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/groupby.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{FrameStruct, NuDataFrame, NuGroupBy},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::convert_columns;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe group-by"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates a groupby object that can be used for other aggregations"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe group-by").rest("rest", SyntaxShape::Any, "groupby columns")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Grouping by column a",
-            example: "[[a b]; [one 1] [one 2]] | dataframe to-df | dataframe group-by a",
-            result: None,
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    // Extracting the names of the columns to perform the groupby
-    let by_columns: Vec<Value> = args.rest(0)?;
-    let (columns_string, col_span) = convert_columns(&by_columns, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    // This is the expensive part of the groupby; to create the
-    // groups that will be used for grouping the data in the
-    // dataframe. Once it has been done these values can be stored
-    // in a NuGroupBy
-    let groupby = df
-        .as_ref()
-        .groupby(&columns_string)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-    let groups = groupby.get_groups().to_vec();
-    let groupby = Value {
-        tag,
-        value: UntaggedValue::FrameStruct(FrameStruct::GroupBy(NuGroupBy::new(
-            NuDataFrame::new(df.as_ref().clone()),
-            columns_string,
-            groups,
-        ))),
-    };
-
-    Ok(OutputStream::one(groupby))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/join.rs b/old_nushell/crates/nu-command/src/commands/dataframe/join.rs
deleted file mode 100644
index da18eb8bf..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/join.rs
+++ /dev/null
@@ -1,233 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-
-use polars::prelude::JoinType;
-
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe join"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Joins a dataframe using columns as reference"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe join")
-            .required("dataframe", SyntaxShape::Any, "right dataframe to join")
-            .required_named(
-                "left",
-                SyntaxShape::Table,
-                "left column names to perform join",
-                Some('l'),
-            )
-            .required_named(
-                "right",
-                SyntaxShape::Table,
-                "right column names to perform join",
-                Some('r'),
-            )
-            .named(
-                "type",
-                SyntaxShape::String,
-                "type of join. Inner by default",
-                Some('t'),
-            )
-            .named(
-                "suffix",
-                SyntaxShape::String,
-                "suffix for the columns of the right dataframe",
-                Some('s'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "inner join dataframe",
-            example: r#"let right = ([[a b c]; [1 2 5] [3 4 5] [5 6 6]] | dataframe to-df);
-    $right | dataframe join $right -l [a b] -r [a b]"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(3).into(),
-                            UntaggedValue::int(5).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(4).into(),
-                            UntaggedValue::int(6).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "c".to_string(),
-                        vec![
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(6).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "c_right".to_string(),
-                        vec![
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(6).into(),
-                        ],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let r_df: Value = args.req(0)?;
-    let l_col: Vec<Value> = args.req_named("left")?;
-    let r_col: Vec<Value> = args.req_named("right")?;
-    let r_suffix: Option<Tagged<String>> = args.get_flag("suffix")?;
-    let join_type_op: Option<Tagged<String>> = args.get_flag("type")?;
-
-    let join_type = match join_type_op {
-        None => JoinType::Inner,
-        Some(val) => match val.item.as_ref() {
-            "inner" => JoinType::Inner,
-            "outer" => JoinType::Outer,
-            "left" => JoinType::Left,
-            _ => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Incorrect join type",
-                    "Invalid join type",
-                    &val.tag,
-                    "Perhaps you mean: inner, outer or left",
-                    &val.tag,
-                ))
-            }
-        },
-    };
-
-    let suffix = r_suffix.map(|s| s.item);
-
-    let (l_col_string, l_col_span) = convert_columns(&l_col, &tag)?;
-    let (r_col_string, r_col_span) = convert_columns(&r_col, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = match r_df.value {
-        UntaggedValue::DataFrame(r_df) => {
-            // Checking the column types before performing the join
-            check_column_datatypes(
-                df.as_ref(),
-                r_df.as_ref(),
-                &l_col_string,
-                &l_col_span,
-                &r_col_string,
-                &r_col_span,
-            )?;
-
-            df.as_ref()
-                .join(
-                    r_df.as_ref(),
-                    &l_col_string,
-                    &r_col_string,
-                    join_type,
-                    suffix,
-                )
-                .map_err(|e| parse_polars_error::<&str>(&e, &l_col_span, None))
-        }
-        _ => Err(ShellError::labeled_error(
-            "Not a dataframe",
-            "not a dataframe type value",
-            &r_df.tag,
-        )),
-    }?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-fn check_column_datatypes<T: AsRef<str>>(
-    df_l: &polars::prelude::DataFrame,
-    df_r: &polars::prelude::DataFrame,
-    l_cols: &[T],
-    l_col_span: &Span,
-    r_cols: &[T],
-    r_col_span: &Span,
-) -> Result<(), ShellError> {
-    if l_cols.len() != r_cols.len() {
-        return Err(ShellError::labeled_error_with_secondary(
-            "Mismatched number of column names",
-            format!(
-                "found {} left names vs {} right names",
-                l_cols.len(),
-                r_cols.len()
-            ),
-            l_col_span,
-            "perhaps you need to change the number of columns to join",
-            r_col_span,
-        ));
-    }
-
-    for (l, r) in l_cols.iter().zip(r_cols) {
-        let l_series = df_l
-            .column(l.as_ref())
-            .map_err(|e| parse_polars_error::<&str>(&e, l_col_span, None))?;
-
-        let r_series = df_r
-            .column(r.as_ref())
-            .map_err(|e| parse_polars_error::<&str>(&e, r_col_span, None))?;
-
-        if l_series.dtype() != r_series.dtype() {
-            return Err(ShellError::labeled_error_with_secondary(
-                "Mismatched datatypes",
-                format!(
-                    "left column type '{}' doesn't match '{}' right column match",
-                    l_series.dtype(),
-                    r_series.dtype()
-                ),
-                l_col_span,
-                "perhaps you need to select other column to match",
-                r_col_span,
-            ));
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/last.rs b/old_nushell/crates/nu-command/src/commands/dataframe/last.rs
deleted file mode 100644
index 1838570ca..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/last.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe last"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates new dataframe with tail rows"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe last").optional(
-            "n_rows",
-            SyntaxShape::Number,
-            "Number of rows for tail",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create new dataframe with last rows",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe last 1",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("a".to_string(), vec![UntaggedValue::int(3).into()]),
-                    Column::new("b".to_string(), vec![UntaggedValue::int(4).into()]),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let rows: Option<Tagged<usize>> = args.opt(0)?;
-
-    let rows = match rows {
-        Some(val) => val.item,
-        None => 5,
-    };
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_ref().tail(Some(rows));
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/list.rs b/old_nushell/crates/nu-command/src/commands/dataframe/list.rs
deleted file mode 100644
index 56e78ce8b..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/list.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe list"
-    }
-
-    fn usage(&self) -> &str {
-        "Lists stored dataframes"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe list")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let data = args
-            .context
-            .scope
-            .get_vars()
-            .into_iter()
-            .filter_map(|(name, value)| {
-                if let UntaggedValue::DataFrame(df) = &value.value {
-                    let rows = Value {
-                        value: (df.as_ref().height() as i64).into(),
-                        tag: Tag::default(),
-                    };
-
-                    let cols = Value {
-                        value: (df.as_ref().width() as i64).into(),
-                        tag: Tag::default(),
-                    };
-
-                    let location = match value.tag.anchor {
-                        Some(AnchorLocation::File(name)) => name,
-                        Some(AnchorLocation::Url(name)) => name,
-                        Some(AnchorLocation::Source(text)) => text.slice(0..text.end).text,
-                        None => "stream".to_string(),
-                    };
-
-                    let location = Value {
-                        value: location.into(),
-                        tag: Tag::default(),
-                    };
-
-                    let name = Value {
-                        value: name.into(),
-                        tag: Tag::default(),
-                    };
-
-                    Some((name, rows, cols, location))
-                } else {
-                    None
-                }
-            });
-
-        let mut name = Column::new_empty("name".to_string());
-        let mut rows = Column::new_empty("rows".to_string());
-        let mut cols = Column::new_empty("columns".to_string());
-        let mut location = Column::new_empty("location".to_string());
-
-        for tuple in data {
-            name.push(tuple.0);
-            rows.push(tuple.1);
-            cols.push(tuple.2);
-            location.push(tuple.3);
-        }
-
-        let tag = args.call_info.name_tag;
-        let df = NuDataFrame::try_from_columns(vec![name, rows, cols, location], &tag.span)?;
-        Ok(OutputStream::one(df.into_value(tag)))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Lists loaded dataframes in current scope",
-            example: "let a = ([[a b];[1 2] [3 4]] | dataframe to-df); dataframe list",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("name".to_string(), vec![UntaggedValue::string("$a").into()]),
-                    Column::new("rows".to_string(), vec![UntaggedValue::int(2).into()]),
-                    Column::new("columns".to_string(), vec![UntaggedValue::int(2).into()]),
-                    Column::new(
-                        "location".to_string(),
-                        vec![UntaggedValue::string("stream").into()],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/melt.rs b/old_nushell/crates/nu-command/src/commands/dataframe/melt.rs
deleted file mode 100644
index 702571920..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/melt.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-use super::utils::convert_columns;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe melt"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Unpivot a DataFrame from wide to long format"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe melt")
-            .required_named(
-                "columns",
-                SyntaxShape::Table,
-                "column names for melting",
-                Some('c'),
-            )
-            .required_named(
-                "values",
-                SyntaxShape::Table,
-                "column names used as value columns",
-                Some('v'),
-            )
-            .named(
-                "variable_name",
-                SyntaxShape::String,
-                "optional name for variable column",
-                Some('r'),
-            )
-            .named(
-                "value_name",
-                SyntaxShape::String,
-                "optional name for value column",
-                Some('l'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "melt dataframe",
-            example:
-                "[[a b c d]; [x 1 4 a] [y 2 5 b] [z 3 6 c]] | dataframe to-df | dataframe melt -c [b c] -v [a d]",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "b".to_string(),
-                        vec![
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(3).into(),
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(3).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "c".to_string(),
-                        vec![
-                            UntaggedValue::int(4).into(),
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(6).into(),
-                            UntaggedValue::int(4).into(),
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(6).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "variable".to_string(),
-                        vec![
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("d").into(),
-                            UntaggedValue::string("d").into(),
-                            UntaggedValue::string("d").into(),
-                        ],
-                    ),
-                    Column::new(
-                        "value".to_string(),
-                        vec![
-                            UntaggedValue::string("x").into(),
-                            UntaggedValue::string("y").into(),
-                            UntaggedValue::string("z").into(),
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("b").into(),
-                            UntaggedValue::string("c").into(),
-                        ],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let id_col: Vec<Value> = args.req_named("columns")?;
-    let val_col: Vec<Value> = args.req_named("values")?;
-
-    let value_name: Option<Tagged<String>> = args.get_flag("value_name")?;
-    let variable_name: Option<Tagged<String>> = args.get_flag("variable_name")?;
-
-    let (id_col_string, id_col_span) = convert_columns(&id_col, &tag)?;
-    let (val_col_string, val_col_span) = convert_columns(&val_col, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    check_column_datatypes(df.as_ref(), &id_col_string, &id_col_span)?;
-    check_column_datatypes(df.as_ref(), &val_col_string, &val_col_span)?;
-
-    let mut res = df
-        .as_ref()
-        .melt(&id_col_string, &val_col_string)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    if let Some(name) = &variable_name {
-        res.rename("variable", &name.item)
-            .map_err(|e| parse_polars_error::<&str>(&e, &name.tag.span, None))?;
-    }
-
-    if let Some(name) = &value_name {
-        res.rename("value", &name.item)
-            .map_err(|e| parse_polars_error::<&str>(&e, &name.tag.span, None))?;
-    }
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-fn check_column_datatypes<T: AsRef<str>>(
-    df: &polars::prelude::DataFrame,
-    cols: &[T],
-    col_span: &Span,
-) -> Result<(), ShellError> {
-    if cols.is_empty() {
-        return Err(ShellError::labeled_error(
-            "Merge error",
-            "empty column list",
-            col_span,
-        ));
-    }
-
-    // Checking if they are same type
-    if cols.len() > 1 {
-        for w in cols.windows(2) {
-            let l_series = df
-                .column(w[0].as_ref())
-                .map_err(|e| parse_polars_error::<&str>(&e, col_span, None))?;
-
-            let r_series = df
-                .column(w[1].as_ref())
-                .map_err(|e| parse_polars_error::<&str>(&e, col_span, None))?;
-
-            if l_series.dtype() != r_series.dtype() {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Merge error",
-                    "found different column types in list",
-                    col_span,
-                    format!(
-                        "datatypes {} and {} are incompatible",
-                        l_series.dtype(),
-                        r_series.dtype()
-                    ),
-                    col_span,
-                ));
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/mod.rs b/old_nushell/crates/nu-command/src/commands/dataframe/mod.rs
deleted file mode 100644
index 4df4a935f..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/mod.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-pub mod aggregate;
-pub mod append;
-pub mod column;
-pub mod command;
-pub mod describe;
-pub mod drop;
-pub mod drop_duplicates;
-pub mod drop_nulls;
-pub mod dtypes;
-pub mod dummies;
-pub mod filter;
-pub mod first;
-pub mod get;
-pub mod groupby;
-pub mod join;
-pub mod last;
-pub mod list;
-pub mod melt;
-pub mod open;
-pub mod pivot;
-pub mod rename;
-pub mod sample;
-pub mod select;
-pub mod shape;
-pub mod show;
-pub mod slice;
-pub mod sort;
-pub mod take;
-pub mod to_csv;
-pub mod to_df;
-pub mod to_parquet;
-pub(crate) mod utils;
-pub mod where_;
-pub mod with_column;
-
-pub use aggregate::DataFrame as DataFrameAggregate;
-pub use append::DataFrame as DataFrameAppend;
-pub use column::DataFrame as DataFrameColumn;
-pub use command::Command as DataFrame;
-pub use describe::DataFrame as DataFrameDescribe;
-pub use drop::DataFrame as DataFrameDrop;
-pub use drop_duplicates::DataFrame as DataFrameDropDuplicates;
-pub use drop_nulls::DataFrame as DataFrameDropNulls;
-pub use dtypes::DataFrame as DataFrameDTypes;
-pub use dummies::DataFrame as DataFrameDummies;
-pub use filter::DataFrame as DataFrameFilter;
-pub use first::DataFrame as DataFrameFirst;
-pub use get::DataFrame as DataFrameGet;
-pub use groupby::DataFrame as DataFrameGroupBy;
-pub use join::DataFrame as DataFrameJoin;
-pub use last::DataFrame as DataFrameLast;
-pub use list::DataFrame as DataFrameList;
-pub use melt::DataFrame as DataFrameMelt;
-pub use open::DataFrame as DataFrameOpen;
-pub use pivot::DataFrame as DataFramePivot;
-pub use rename::DataFrame as DataFrameRename;
-pub use sample::DataFrame as DataFrameSample;
-pub use select::DataFrame as DataFrameSelect;
-pub use shape::DataFrame as DataFrameShape;
-pub use show::DataFrame as DataFrameShow;
-pub use slice::DataFrame as DataFrameSlice;
-pub use sort::DataFrame as DataFrameSort;
-pub use take::DataFrame as DataFrameTake;
-pub use to_csv::DataFrame as DataFrameToCsv;
-pub use to_df::DataFrame as DataFrameToDF;
-pub use to_parquet::DataFrame as DataFrameToParquet;
-pub use where_::DataFrame as DataFrameWhere;
-pub use with_column::DataFrame as DataFrameWithColumn;
-
-pub mod series;
-pub use series::DataFrameAllFalse;
-pub use series::DataFrameAllTrue;
-pub use series::DataFrameArgMax;
-pub use series::DataFrameArgMin;
-pub use series::DataFrameArgSort;
-pub use series::DataFrameArgTrue;
-pub use series::DataFrameArgUnique;
-pub use series::DataFrameConcatenate;
-pub use series::DataFrameContains;
-pub use series::DataFrameCumulative;
-pub use series::DataFrameGetDay;
-pub use series::DataFrameGetHour;
-pub use series::DataFrameGetMinute;
-pub use series::DataFrameGetMonth;
-pub use series::DataFrameGetNanoSecond;
-pub use series::DataFrameGetOrdinal;
-pub use series::DataFrameGetSecond;
-pub use series::DataFrameGetWeek;
-pub use series::DataFrameGetWeekDay;
-pub use series::DataFrameGetYear;
-pub use series::DataFrameIsDuplicated;
-pub use series::DataFrameIsIn;
-pub use series::DataFrameIsNotNull;
-pub use series::DataFrameIsNull;
-pub use series::DataFrameIsUnique;
-pub use series::DataFrameNNull;
-pub use series::DataFrameNUnique;
-pub use series::DataFrameNot;
-pub use series::DataFrameReplace;
-pub use series::DataFrameReplaceAll;
-pub use series::DataFrameRolling;
-pub use series::DataFrameSeriesRename;
-pub use series::DataFrameSet;
-pub use series::DataFrameSetWithIdx;
-pub use series::DataFrameShift;
-pub use series::DataFrameStrFTime;
-pub use series::DataFrameStringLengths;
-pub use series::DataFrameStringSlice;
-pub use series::DataFrameToLowercase;
-pub use series::DataFrameToUppercase;
-pub use series::DataFrameUnique;
-pub use series::DataFrameValueCounts;
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/open.rs b/old_nushell/crates/nu-command/src/commands/dataframe/open.rs
deleted file mode 100644
index 72ce158d0..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/open.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-use std::path::PathBuf;
-
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::NuDataFrame, Primitive, Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use nu_source::Tagged;
-use polars::prelude::{CsvEncoding, CsvReader, JsonReader, ParquetReader, SerReader};
-use std::fs::File;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe open"
-    }
-
-    fn usage(&self) -> &str {
-        "Opens csv, json or parquet file to create dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe open")
-            .required(
-                "file",
-                SyntaxShape::FilePath,
-                "file path to load values from",
-            )
-            .named(
-                "delimiter",
-                SyntaxShape::String,
-                "file delimiter character. CSV file",
-                Some('d'),
-            )
-            .switch(
-                "no_header",
-                "Indicates if file doesn't have header. CSV file",
-                None,
-            )
-            .named(
-                "infer_schema",
-                SyntaxShape::Number,
-                "Set number of rows to infer the schema of the file. CSV file",
-                None,
-            )
-            .named(
-                "skip_rows",
-                SyntaxShape::Number,
-                "Number of rows to skip from file. CSV file",
-                None,
-            )
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Columns to be selected from csv file. CSV file",
-                None,
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Takes a file name and creates a dataframe",
-            example: "dataframe open test.csv",
-            result: None,
-        }]
-    }
-}
-
-fn command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let file: Tagged<PathBuf> = args.req(0)?;
-
-    let df = match file.item().extension() {
-        Some(e) => match e.to_str() {
-            Some("csv") => from_csv(args),
-            Some("parquet") => from_parquet(args),
-            Some("json") => from_json(args),
-            _ => Err(ShellError::labeled_error(
-                "Error with file",
-                "Not a csv, parquet or json file",
-                &file.tag,
-            )),
-        },
-        None => Err(ShellError::labeled_error(
-            "Error with file",
-            "File without extension",
-            &file.tag,
-        )),
-    }?;
-
-    let file_name = match file.item.into_os_string().into_string() {
-        Ok(name) => name,
-        Err(e) => {
-            return Err(ShellError::labeled_error(
-                "File Name Error",
-                format!("{:?}", e),
-                &file.tag,
-            ))
-        }
-    };
-
-    let df_tag = Tag {
-        anchor: Some(AnchorLocation::File(file_name)),
-        span: tag.span,
-    };
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(
-        df, df_tag,
-    )))
-}
-
-fn from_parquet(args: CommandArgs) -> Result<polars::prelude::DataFrame, ShellError> {
-    let file: Tagged<PathBuf> = args.req(0)?;
-
-    let r = File::open(&file.item)
-        .map_err(|e| ShellError::labeled_error("Error with file", format!("{:?}", e), &file.tag))?;
-
-    let reader = ParquetReader::new(r);
-
-    reader
-        .finish()
-        .map_err(|e| parse_polars_error::<&str>(&e, &file.tag.span, None))
-}
-
-fn from_json(args: CommandArgs) -> Result<polars::prelude::DataFrame, ShellError> {
-    let file: Tagged<PathBuf> = args.req(0)?;
-
-    let r = File::open(&file.item)
-        .map_err(|e| ShellError::labeled_error("Error with file", format!("{:?}", e), &file.tag))?;
-
-    let reader = JsonReader::new(r);
-
-    reader
-        .finish()
-        .map_err(|e| parse_polars_error::<&str>(&e, &file.tag.span, None))
-}
-
-fn from_csv(args: CommandArgs) -> Result<polars::prelude::DataFrame, ShellError> {
-    let file: Tagged<PathBuf> = args.req(0)?;
-    let delimiter: Option<Tagged<String>> = args.get_flag("delimiter")?;
-    let no_header: bool = args.has_flag("no_header");
-    let infer_schema: Option<Tagged<usize>> = args.get_flag("infer_schema")?;
-    let skip_rows: Option<Tagged<usize>> = args.get_flag("skip_rows")?;
-    let columns: Option<Vec<Value>> = args.get_flag("columns")?;
-
-    let csv_reader = CsvReader::from_path(&file.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &file.tag.span, None))?
-        .with_encoding(CsvEncoding::LossyUtf8);
-
-    let csv_reader = match delimiter {
-        None => csv_reader,
-        Some(d) => {
-            if d.item.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Incorrect delimiter",
-                    "Delimiter has to be one char",
-                    &d.tag,
-                ));
-            } else {
-                let delimiter = match d.item.chars().next() {
-                    Some(d) => d as u8,
-                    None => unreachable!(),
-                };
-                csv_reader.with_delimiter(delimiter)
-            }
-        }
-    };
-
-    let csv_reader = csv_reader.has_header(!no_header);
-
-    let csv_reader = match infer_schema {
-        None => csv_reader,
-        Some(r) => csv_reader.infer_schema(Some(r.item)),
-    };
-
-    let csv_reader = match skip_rows {
-        None => csv_reader,
-        Some(r) => csv_reader.with_skip_rows(r.item),
-    };
-
-    let csv_reader = match columns {
-        None => csv_reader,
-        Some(c) => {
-            let columns = c
-                .into_iter()
-                .map(|value| match value.value {
-                    UntaggedValue::Primitive(Primitive::String(s)) => Ok(s),
-                    _ => Err(ShellError::labeled_error(
-                        "Incorrect type for column",
-                        "Only string as columns",
-                        &value.tag,
-                    )),
-                })
-                .collect::<Result<Vec<String>, ShellError>>();
-
-            csv_reader.with_columns(Some(columns?))
-        }
-    };
-
-    match csv_reader.finish() {
-        Ok(df) => Ok(df),
-        Err(e) => Err(parse_polars_error::<&str>(&e, &file.tag.span, None)),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/pivot.rs b/old_nushell/crates/nu-command/src/commands/dataframe/pivot.rs
deleted file mode 100644
index 22dfa2728..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/pivot.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{NuDataFrame, NuGroupBy},
-    Signature, SyntaxShape,
-};
-use nu_source::Tagged;
-
-use polars::prelude::DataType;
-
-enum Operation {
-    First,
-    Sum,
-    Min,
-    Max,
-    Mean,
-    Median,
-}
-
-impl Operation {
-    fn from_tagged(name: &Tagged<String>) -> Result<Operation, ShellError> {
-        match name.item.as_ref() {
-            "first" => Ok(Operation::First),
-            "sum" => Ok(Operation::Sum),
-            "min" => Ok(Operation::Min),
-            "max" => Ok(Operation::Max),
-            "mean" => Ok(Operation::Mean),
-            "median" => Ok(Operation::Median),
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Operation not fount",
-                "Operation does not exist for pivot",
-                &name.tag,
-                "Perhaps you want: first, sum, min, max, mean, median",
-                &name.tag,
-            )),
-        }
-    }
-}
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe pivot"
-    }
-
-    fn usage(&self) -> &str {
-        "[GroupBy] Performs a pivot operation on a groupby object"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe pivot")
-            .required(
-                "pivot column",
-                SyntaxShape::String,
-                "pivot column to perform pivot",
-            )
-            .required(
-                "value column",
-                SyntaxShape::String,
-                "value column to perform pivot",
-            )
-            .required("operation", SyntaxShape::String, "aggregate operation")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Pivot a dataframe on b and aggregation on col c",
-            example:
-                "[[a b c]; [one x 1] [two y 2]] | dataframe to-df | dataframe group-by a | dataframe pivot b c sum",
-            result: None, // No sample because there are nulls in the result dataframe
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    // Extracting the pivot col from arguments
-    let pivot_col: Tagged<String> = args.req(0)?;
-
-    // Extracting the value col from arguments
-    let value_col: Tagged<String> = args.req(1)?;
-
-    let operation: Tagged<String> = args.req(2)?;
-    let op = Operation::from_tagged(&operation)?;
-
-    // The operation is only done in one groupby. Only one input is
-    // expected from the InputStream
-    let nu_groupby = NuGroupBy::try_from_stream(&mut args.input, &tag.span)?;
-    let df_ref = nu_groupby.as_ref();
-
-    check_pivot_column(df_ref, &pivot_col)?;
-    check_value_column(df_ref, &value_col)?;
-
-    let mut groupby = nu_groupby.to_groupby()?;
-
-    let pivot = groupby.pivot(&pivot_col.item, &value_col.item);
-
-    let res = match op {
-        Operation::Mean => pivot.mean(),
-        Operation::Sum => pivot.sum(),
-        Operation::Min => pivot.min(),
-        Operation::Max => pivot.max(),
-        Operation::First => pivot.first(),
-        Operation::Median => pivot.median(),
-    }
-    .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-fn check_pivot_column(
-    df: &polars::prelude::DataFrame,
-    col: &Tagged<String>,
-) -> Result<(), ShellError> {
-    let series = df
-        .column(&col.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col.tag.span, None))?;
-
-    match series.dtype() {
-        DataType::UInt8
-        | DataType::UInt16
-        | DataType::UInt32
-        | DataType::UInt64
-        | DataType::Int8
-        | DataType::Int16
-        | DataType::Int32
-        | DataType::Int64
-        | DataType::Utf8 => Ok(()),
-        _ => Err(ShellError::labeled_error(
-            "Pivot error",
-            format!("Unsupported datatype {}", series.dtype()),
-            col.tag.span,
-        )),
-    }
-}
-
-fn check_value_column(
-    df: &polars::prelude::DataFrame,
-    col: &Tagged<String>,
-) -> Result<(), ShellError> {
-    let series = df
-        .column(&col.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col.tag.span, None))?;
-
-    match series.dtype() {
-        DataType::UInt8
-        | DataType::UInt16
-        | DataType::UInt32
-        | DataType::UInt64
-        | DataType::Int8
-        | DataType::Int16
-        | DataType::Int32
-        | DataType::Int64
-        | DataType::Float32
-        | DataType::Float64 => Ok(()),
-        _ => Err(ShellError::labeled_error(
-            "Pivot error",
-            format!("Unsupported datatype {}", series.dtype()),
-            col.tag.span,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/rename.rs b/old_nushell/crates/nu-command/src/commands/dataframe/rename.rs
deleted file mode 100644
index 28e922b6d..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/rename.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe rename-col"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] rename a dataframe column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe rename-col")
-            .required("from", SyntaxShape::String, "column name to be renamed")
-            .required("to", SyntaxShape::String, "new column name")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Renames a dataframe column",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe rename-col a ab",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "ab".to_string(),
-                        vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let from: Tagged<String> = args.req(0)?;
-    let to: Tagged<String> = args.req(1)?;
-
-    let (mut df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    df.as_mut()
-        .rename(&from.item, &to.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/sample.rs b/old_nushell/crates/nu-command/src/commands/dataframe/sample.rs
deleted file mode 100644
index d32a09283..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/sample.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{dataframe::NuDataFrame, Signature, SyntaxShape};
-
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe sample"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Create sample dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe sample")
-            .named(
-                "n_rows",
-                SyntaxShape::Number,
-                "number of rows to be taken from dataframe",
-                Some('n'),
-            )
-            .named(
-                "fraction",
-                SyntaxShape::Number,
-                "fraction of dataframe to be taken",
-                Some('f'),
-            )
-            .switch("replace", "sample with replace", Some('e'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sample rows from dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe sample -n 1",
-                result: None, // No expected value because sampling is random
-            },
-            Example {
-                description: "Shows sample row using fraction and replace",
-                example:
-                    "[[a b]; [1 2] [3 4] [5 6]] | dataframe to-df | dataframe sample -f 0.5 -e",
-                result: None, // No expected value because sampling is random
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let rows: Option<Tagged<usize>> = args.get_flag("n_rows")?;
-    let fraction: Option<Tagged<f64>> = args.get_flag("fraction")?;
-    let replace: bool = args.has_flag("replace");
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = match (rows, fraction) {
-        (Some(rows), None) => df
-            .as_ref()
-            .sample_n(rows.item, replace)
-            .map_err(|e| parse_polars_error::<&str>(&e, &rows.tag.span, None)),
-        (None, Some(frac)) => df
-            .as_ref()
-            .sample_frac(frac.item, replace)
-            .map_err(|e| parse_polars_error::<&str>(&e, &frac.tag.span, None)),
-        (Some(_), Some(_)) => Err(ShellError::labeled_error(
-            "Incompatible flags",
-            "Only one selection criterion allowed",
-            &tag,
-        )),
-        (None, None) => Err(ShellError::labeled_error_with_secondary(
-            "No selection",
-            "No selection criterion was found",
-            &tag,
-            "Perhaps you want to use the flag -n or -f",
-            &tag,
-        )),
-    }?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/select.rs b/old_nushell/crates/nu-command/src/commands/dataframe/select.rs
deleted file mode 100644
index 4d6c7d817..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/select.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe select"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates a new dataframe with the selected columns"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe select").rest("rest", SyntaxShape::Any, "selected column names")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create new dataframe with column a",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe select a",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "a".to_string(),
-                    vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let columns: Vec<Value> = args.rest(0)?;
-
-    let (col_string, col_span) = convert_columns(&columns, &tag)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_ref()
-        .select(&col_string)
-        .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/all_false.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/all_false.rs
deleted file mode 100644
index 88c5b3fdb..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/all_false.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe all-false"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns true if all values are false"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe all-false")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns true if all values are false",
-                example: "[$false $false $false] | dataframe to-df | dataframe all-false",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "all_false".to_string(),
-                        vec![UntaggedValue::boolean(true).into()],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Checks the result from a comparison",
-                example: r#"let s = ([5 6 2 10] | dataframe to-df);
-    let res = ($s > 9);
-    $res | dataframe all-false"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "all_false".to_string(),
-                        vec![UntaggedValue::boolean(false).into()],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let bool = series.bool().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &tag.span,
-            Some("all-false only works with series of type bool"),
-        )
-    })?;
-
-    let res = bool.all_false();
-
-    let value = Value {
-        value: UntaggedValue::Primitive(res.into()),
-        tag: tag.clone(),
-    };
-
-    let df = NuDataFrame::try_from_columns(
-        vec![Column::new("all_false".to_string(), vec![value])],
-        &tag.span,
-    )?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/all_true.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/all_true.rs
deleted file mode 100644
index 46a8e3e3c..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/all_true.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe all-true"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns true if all values are true"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe all-true")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns true if all values are true",
-                example: "[$true $true $true] | dataframe to-df | dataframe all-true",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "all_true".to_string(),
-                        vec![UntaggedValue::boolean(true).into()],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Checks the result from a comparison",
-                example: r#"let s = ([5 6 2 8] | dataframe to-df);
-    let res = ($s > 9);
-    $res | dataframe all-true"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "all_true".to_string(),
-                        vec![UntaggedValue::boolean(false).into()],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let bool = series.bool().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &tag.span,
-            Some("all-true only works with series of type bool"),
-        )
-    })?;
-
-    let res = bool.all_true();
-
-    let value = Value {
-        value: UntaggedValue::Primitive(res.into()),
-        tag: tag.clone(),
-    };
-
-    let df = NuDataFrame::try_from_columns(
-        vec![Column::new("all_true".to_string(), vec![value])],
-        &tag.span,
-    )?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_max.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_max.rs
deleted file mode 100644
index 050f4534f..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_max.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::{IntoSeries, NewChunkedArray, UInt32Chunked};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe arg-max"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Return index for max value in series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe arg-max")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns index for max value",
-            example: "[1 3 2] | dataframe to-df | dataframe arg-max",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "arg_max".to_string(),
-                    vec![UntaggedValue::int(1).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let res = series.arg_max();
-
-    let chunked = match res {
-        Some(index) => UInt32Chunked::new_from_slice("arg_max", &[index as u32]),
-        None => UInt32Chunked::new_from_slice("arg_max", &[]),
-    };
-
-    let res = chunked.into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_min.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_min.rs
deleted file mode 100644
index 710410bdb..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_min.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::{IntoSeries, NewChunkedArray, UInt32Chunked};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe arg-min"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Return index for min value in series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe arg-min")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns index for min value",
-            example: "[1 3 2] | dataframe to-df | dataframe arg-min",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "arg_min".to_string(),
-                    vec![UntaggedValue::int(0).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_series(&df_tag.span)?.arg_min();
-
-    let chunked = match res {
-        Some(index) => UInt32Chunked::new_from_slice("arg_min", &[index as u32]),
-        None => UInt32Chunked::new_from_slice("arg_min", &[]),
-    };
-
-    let res = chunked.into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_sort.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_sort.rs
deleted file mode 100644
index af5cf7a48..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_sort.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe arg-sort"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns indexes for a sorted series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe arg-sort").switch("reverse", "reverse order", Some('r'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns indexes for a sorted series",
-            example: "[1 2 2 3 3] | dataframe to-df | dataframe arg-sort",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "arg_sort".to_string(),
-                    vec![
-                        UntaggedValue::int(0).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(2).into(),
-                        UntaggedValue::int(3).into(),
-                        UntaggedValue::int(4).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let reverse = args.has_flag("reverse");
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut res = df.as_series(&df_tag.span)?.argsort(reverse).into_series();
-    res.rename("arg_sort");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_true.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_true.rs
deleted file mode 100644
index 1f278f91d..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_true.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe arg-true"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns indexes where values are true"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe arg-true")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns indexes where values are true",
-            example: "[$false $true $false] | dataframe to-df | dataframe arg-true",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "arg_true".to_string(),
-                    vec![UntaggedValue::int(1).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let bool = series.bool().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &tag.span,
-            Some("arg-true only works with series of type bool"),
-        )
-    })?;
-
-    let mut res = bool.arg_true().into_series();
-    res.rename("arg_true");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_unique.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_unique.rs
deleted file mode 100644
index dc33e14e2..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/arg_unique.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe arg-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns indexes for unique values"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe arg-unique")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns indexes for unique values",
-            example: "[1 2 2 3 3] | dataframe to-df | dataframe arg-unique",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "arg_unique".to_string(),
-                    vec![
-                        UntaggedValue::int(0).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(3).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut res = df
-        .as_series(&df_tag.span)?
-        .arg_unique()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?
-        .into_series();
-
-    res.rename("arg_unique");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/concatenate.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/concatenate.rs
deleted file mode 100644
index e6dc0ef26..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/concatenate.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe concatenate"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Concatenates strings with other array"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe concatenate").required(
-            "other",
-            SyntaxShape::Any,
-            "Other array with string to be concatenated",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Concatenate string",
-            example: r#"let other = ([za xs cd] | dataframe to-df);
-    [abc abc abc] | dataframe to-df | dataframe concatenate $other"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("abcza").into(),
-                        UntaggedValue::string("abcxs").into(),
-                        UntaggedValue::string("abccd").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let other: Value = args.req(0)?;
-
-    let other_df = match &other.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only concatenate another series",
-            other.tag.span,
-        )),
-    }?;
-
-    let other_series = other_df.as_series(&other.tag.span)?;
-    let other_chunked = other_series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &other.tag.span,
-            Some("The concatenate command can only be used with string columns"),
-        )
-    })?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The concatenate command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked.concat(other_chunked);
-
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/contains.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/contains.rs
deleted file mode 100644
index b99f6f715..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/contains.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe contains"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Checks if a pattern is contained in a string"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe contains").required(
-            "pattern",
-            SyntaxShape::String,
-            "Regex pattern to be searched",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns boolean indicating if pattern was found",
-            example: "[abc acb acb] | dataframe to-df | dataframe contains ab",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let pattern: Tagged<String> = args.req(0)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The contains command can only be used with string columns"),
-        )
-    })?;
-
-    let res = chunked
-        .contains(&pattern.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/cumulative.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/cumulative.rs
deleted file mode 100644
index c2cb72728..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/cumulative.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::prelude::DataType;
-
-enum CumType {
-    Min,
-    Max,
-    Sum,
-}
-
-impl CumType {
-    fn from_str(roll_type: &str, span: &Span) -> Result<Self, ShellError> {
-        match roll_type {
-            "min" => Ok(Self::Min),
-            "max" => Ok(Self::Max),
-            "sum" => Ok(Self::Sum),
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Wrong operation",
-                "Operation not valid for cumulative",
-                span,
-                "Perhaps you want to use: max, min, sum",
-                span,
-            )),
-        }
-    }
-
-    fn to_str(&self) -> &'static str {
-        match self {
-            CumType::Min => "cum_min",
-            CumType::Max => "cum_max",
-            CumType::Sum => "cum_sum",
-        }
-    }
-}
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe cum"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Cumulative calculation for a series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe cum")
-            .required("type", SyntaxShape::String, "rolling operation")
-            .switch("reverse", "Reverse cumulative calculation", Some('r'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Cumulative sum for a series",
-            example: "[1 2 3 4 5] | dataframe to-df | dataframe cum sum",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0_cum_sum".to_string(),
-                    vec![
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(3).into(),
-                        UntaggedValue::int(6).into(),
-                        UntaggedValue::int(10).into(),
-                        UntaggedValue::int(15).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let cum_type: Tagged<String> = args.req(0)?;
-    let reverse = args.has_flag("reverse");
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    if let DataType::Object(_) = series.dtype() {
-        return Err(ShellError::labeled_error(
-            "Found object series",
-            "Series of type object cannot be used for cumulative operation",
-            &df_tag.span,
-        ));
-    }
-
-    let cum_type = CumType::from_str(&cum_type.item, &cum_type.tag.span)?;
-    let mut res = match cum_type {
-        CumType::Max => series.cummax(reverse),
-        CumType::Min => series.cummin(reverse),
-        CumType::Sum => series.cumsum(reverse),
-    };
-
-    let name = format!("{}_{}", series.name(), cum_type.to_str());
-    res.rename(&name);
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_day.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_day.rs
deleted file mode 100644
index 7a2d96405..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_day.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-day"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets day from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-day")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns day from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-day"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(4).into(), UntaggedValue::int(4).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.day().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_hour.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_hour.rs
deleted file mode 100644
index 96baef7fd..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_hour.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-hour"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets hour from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-hour")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns hour from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-hour"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(16).into(), UntaggedValue::int(16).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.hour().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_minute.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_minute.rs
deleted file mode 100644
index 750040452..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_minute.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-minute"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets minute from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-minute")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns minute from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-minute"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(39).into(), UntaggedValue::int(39).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.minute().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_month.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_month.rs
deleted file mode 100644
index dba70abef..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_month.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-month"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets month from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-month")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns month from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-month"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(8).into(), UntaggedValue::int(8).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.month().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_nanosecond.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_nanosecond.rs
deleted file mode 100644
index 39f89af77..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_nanosecond.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-nanosecond"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets nanosecond from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-nanosecond")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns nanosecond from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-nanosecond"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(0).into(), UntaggedValue::int(0).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.nanosecond().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_ordinal.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_ordinal.rs
deleted file mode 100644
index af8537d38..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_ordinal.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-ordinal"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets ordinal date from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-ordinal")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns ordinal from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-ordinal"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::int(217).into(),
-                        UntaggedValue::int(217).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.ordinal().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_second.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_second.rs
deleted file mode 100644
index 13984dbef..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_second.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-second"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets second from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-second")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns second from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-second"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(18).into(), UntaggedValue::int(18).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.second().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_week.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_week.rs
deleted file mode 100644
index 4d51a470c..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_week.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-week"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets week from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-week")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns week from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-week"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(32).into(), UntaggedValue::int(32).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.week().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_weekday.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_weekday.rs
deleted file mode 100644
index 75cc99754..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_weekday.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-weekday"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets weekday from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-weekday")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns weekday from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-weekday"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(1).into(), UntaggedValue::int(1).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.weekday().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_year.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/get_year.rs
deleted file mode 100644
index 3a03e4ef1..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/get_year.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe get-year"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Gets year from date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe get-year")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns year from a date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe get-year"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::int(2020).into(),
-                        UntaggedValue::int(2020).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.year().into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_duplicated.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/is_duplicated.rs
deleted file mode 100644
index 071cb879b..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_duplicated.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe is-duplicated"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Creates mask indicating duplicated values"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe is-duplicated")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create mask indicating duplicated values",
-            example: "[5 6 6 6 8 8 8] | dataframe to-df | dataframe is-duplicated",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "is_duplicated".to_string(),
-                    vec![
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut res = df
-        .as_series(&df_tag.span)?
-        .is_duplicated()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?
-        .into_series();
-
-    res.rename("is_duplicated");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_in.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/is_in.rs
deleted file mode 100644
index 01f2557a1..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_in.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe is-in"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Checks if elements from a series are contained in right series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe is-in").required("other", SyntaxShape::Any, "right series")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Checks if elements from a series are contained in right series",
-            example: r#"let other = ([1 3 6] | dataframe to-df);
-    [5 6 6 6 8 8 8] | dataframe to-df | dataframe is-in $other"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "is_in".to_string(),
-                    vec![
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-
-    let other_df = match value.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only search in a series",
-            value.tag.span,
-        )),
-    }?;
-
-    let other = other_df.as_series(&value.tag.span)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut res = df
-        .as_series(&df_tag.span)?
-        .is_in(&other)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?
-        .into_series();
-
-    res.rename("is_in");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_not_null.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/is_not_null.rs
deleted file mode 100644
index 6dc6c5e88..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_not_null.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe is-not-null"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Creates mask where value is not null"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe is-not-null")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create mask where values are not null",
-            example: r#"let s = ([5 6 0 8] | dataframe to-df);
-    let res = ($s / $s);
-    $res | dataframe is-not-null"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "is_not_null".to_string(),
-                    vec![
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(true).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_series(&df_tag.span)?.is_not_null();
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_null.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/is_null.rs
deleted file mode 100644
index dcd8f37d1..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_null.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe is-null"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Creates mask where value is null"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe is-null")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create mask where values are null",
-            example: r#"let s = ([5 6 0 8] | dataframe to-df);
-    let res = ($s / $s);
-    $res | dataframe is-null"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "is_null".to_string(),
-                    vec![
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_series(&df_tag.span)?.is_null();
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_unique.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/is_unique.rs
deleted file mode 100644
index 85c539663..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/is_unique.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe is-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Creates mask indicating unique values"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe is-unique")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create mask indicating unique values",
-            example: "[5 6 6 6 8 8 8] | dataframe to-df | dataframe is-unique",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "is_unique".to_string(),
-                    vec![
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(false).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut res = df
-        .as_series(&df_tag.span)?
-        .is_unique()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?
-        .into_series();
-
-    res.rename("is_unique");
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/mod.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/mod.rs
deleted file mode 100644
index a51930f4c..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/mod.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-pub mod all_false;
-pub mod all_true;
-pub mod arg_max;
-pub mod arg_min;
-pub mod arg_sort;
-pub mod arg_true;
-pub mod arg_unique;
-pub mod concatenate;
-pub mod contains;
-pub mod cumulative;
-pub mod get_day;
-pub mod get_hour;
-pub mod get_minute;
-pub mod get_month;
-pub mod get_nanosecond;
-pub mod get_ordinal;
-pub mod get_second;
-pub mod get_week;
-pub mod get_weekday;
-pub mod get_year;
-pub mod is_duplicated;
-pub mod is_in;
-pub mod is_not_null;
-pub mod is_null;
-pub mod is_unique;
-pub mod n_null;
-pub mod n_unique;
-pub mod not;
-pub mod rename;
-pub mod replace;
-pub mod replace_all;
-pub mod rolling;
-pub mod set;
-pub mod set_with_idx;
-pub mod shift;
-pub mod str_lengths;
-pub mod str_slice;
-pub mod strftime;
-pub mod to_lowercase;
-pub mod to_uppercase;
-pub mod unique;
-pub mod value_counts;
-
-pub use all_false::DataFrame as DataFrameAllFalse;
-pub use all_true::DataFrame as DataFrameAllTrue;
-pub use arg_max::DataFrame as DataFrameArgMax;
-pub use arg_min::DataFrame as DataFrameArgMin;
-pub use arg_sort::DataFrame as DataFrameArgSort;
-pub use arg_true::DataFrame as DataFrameArgTrue;
-pub use arg_unique::DataFrame as DataFrameArgUnique;
-pub use concatenate::DataFrame as DataFrameConcatenate;
-pub use contains::DataFrame as DataFrameContains;
-pub use cumulative::DataFrame as DataFrameCumulative;
-pub use get_day::DataFrame as DataFrameGetDay;
-pub use get_hour::DataFrame as DataFrameGetHour;
-pub use get_minute::DataFrame as DataFrameGetMinute;
-pub use get_month::DataFrame as DataFrameGetMonth;
-pub use get_nanosecond::DataFrame as DataFrameGetNanoSecond;
-pub use get_ordinal::DataFrame as DataFrameGetOrdinal;
-pub use get_second::DataFrame as DataFrameGetSecond;
-pub use get_week::DataFrame as DataFrameGetWeek;
-pub use get_weekday::DataFrame as DataFrameGetWeekDay;
-pub use get_year::DataFrame as DataFrameGetYear;
-pub use is_duplicated::DataFrame as DataFrameIsDuplicated;
-pub use is_in::DataFrame as DataFrameIsIn;
-pub use is_not_null::DataFrame as DataFrameIsNotNull;
-pub use is_null::DataFrame as DataFrameIsNull;
-pub use is_unique::DataFrame as DataFrameIsUnique;
-pub use n_null::DataFrame as DataFrameNNull;
-pub use n_unique::DataFrame as DataFrameNUnique;
-pub use not::DataFrame as DataFrameNot;
-pub use rename::DataFrame as DataFrameSeriesRename;
-pub use replace::DataFrame as DataFrameReplace;
-pub use replace_all::DataFrame as DataFrameReplaceAll;
-pub use rolling::DataFrame as DataFrameRolling;
-pub use set::DataFrame as DataFrameSet;
-pub use set_with_idx::DataFrame as DataFrameSetWithIdx;
-pub use shift::DataFrame as DataFrameShift;
-pub use str_lengths::DataFrame as DataFrameStringLengths;
-pub use str_slice::DataFrame as DataFrameStringSlice;
-pub use strftime::DataFrame as DataFrameStrFTime;
-pub use to_lowercase::DataFrame as DataFrameToLowercase;
-pub use to_uppercase::DataFrame as DataFrameToUppercase;
-pub use unique::DataFrame as DataFrameUnique;
-pub use value_counts::DataFrame as DataFrameValueCounts;
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/n_null.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/n_null.rs
deleted file mode 100644
index 42cac40c2..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/n_null.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Primitive, Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe count-null"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Counts null values"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe count-null")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Counts null values",
-            example: r#"let s = ([1 1 0 0 3 3 4] | dataframe to-df);
-    ($s / $s) | dataframe count-null"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "count_null".to_string(),
-                    vec![UntaggedValue::int(2).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_series(&df_tag.span)?.null_count();
-
-    let value = Value {
-        value: UntaggedValue::Primitive(Primitive::Int(res as i64)),
-        tag: tag.clone(),
-    };
-
-    let df = NuDataFrame::try_from_columns(
-        vec![Column::new("count_null".to_string(), vec![value])],
-        &tag.span,
-    )?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/n_unique.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/n_unique.rs
deleted file mode 100644
index cc774f77d..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/n_unique.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Primitive, Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe count-unique"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Counts unique value"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe count-unique")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Counts unique values",
-            example: "[1 1 2 2 3 3 4] | dataframe to-df | dataframe count-unique",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "count_unique".to_string(),
-                    vec![UntaggedValue::int(4).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_series(&df_tag.span)?
-        .n_unique()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    let value = Value {
-        value: UntaggedValue::Primitive(Primitive::Int(res as i64)),
-        tag: tag.clone(),
-    };
-
-    let df = NuDataFrame::try_from_columns(
-        vec![Column::new("count_unique".to_string(), vec![value])],
-        &tag.span,
-    )?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/not.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/not.rs
deleted file mode 100644
index d51fe7e27..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/not.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-use std::ops::Not;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe not"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Inverts boolean mask"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe not")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Inverts boolean mask",
-            example: "[$true $false $true] | dataframe to-df | dataframe not",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::boolean(false).into(),
-                        UntaggedValue::boolean(true).into(),
-                        UntaggedValue::boolean(false).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let bool = series.bool().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &tag.span,
-            Some("not only works with series of type bool"),
-        )
-    })?;
-
-    let res = bool.not();
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/rename.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/rename.rs
deleted file mode 100644
index d14b49a7a..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/rename.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe rename"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Renames a series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe rename").required(
-            "name",
-            SyntaxShape::String,
-            "new series name",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Renames a series",
-            example: "[5 6 7 8] | dataframe to-df | dataframe rename new_name",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "new_name".to_string(),
-                    vec![
-                        UntaggedValue::int(5).into(),
-                        UntaggedValue::int(6).into(),
-                        UntaggedValue::int(7).into(),
-                        UntaggedValue::int(8).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let name: Tagged<String> = args.req(0)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut series = df.as_series(&df_tag.span)?;
-
-    series.rename(&name.item);
-
-    let df = NuDataFrame::try_from_series(vec![series], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/replace.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/replace.rs
deleted file mode 100644
index 7e3fc6ef6..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/replace.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::{Span, Tagged};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe replace"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Replace the leftmost (sub)string by a regex pattern"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe replace")
-            .required_named(
-                "pattern",
-                SyntaxShape::String,
-                "Regex pattern to be matched",
-                Some('p'),
-            )
-            .required_named(
-                "replace",
-                SyntaxShape::String,
-                "replacing string",
-                Some('r'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example: "[abc abc abc] | dataframe to-df | dataframe replace -p ab -r AB",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("ABc").into(),
-                        UntaggedValue::string("ABc").into(),
-                        UntaggedValue::string("ABc").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let pattern: Tagged<String> = args.req_named("pattern")?;
-    let replace: Tagged<String> = args.req_named("replace")?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The replace-all command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked
-        .replace(&pattern.item, &replace.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/replace_all.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/replace_all.rs
deleted file mode 100644
index 6834391e4..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/replace_all.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe replace-all"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Replace all (sub)strings by a regex pattern"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe replace")
-            .required_named(
-                "pattern",
-                SyntaxShape::String,
-                "Regex pattern to be matched",
-                Some('p'),
-            )
-            .required_named(
-                "replace",
-                SyntaxShape::String,
-                "replacing string",
-                Some('r'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Replaces string",
-            example: "[abac abac abac] | dataframe to-df | dataframe replace-all -p a -r A",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("AbAc").into(),
-                        UntaggedValue::string("AbAc").into(),
-                        UntaggedValue::string("AbAc").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let pattern: Tagged<String> = args.req_named("pattern")?;
-    let replace: Tagged<String> = args.req_named("replace")?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The replace command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked
-        .replace_all(&pattern.item, &replace.item)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/rolling.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/rolling.rs
deleted file mode 100644
index 8a37242b7..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/rolling.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::prelude::{DataType, RollingOptions};
-
-enum RollType {
-    Min,
-    Max,
-    Sum,
-    Mean,
-}
-
-impl RollType {
-    fn from_str(roll_type: &str, span: &Span) -> Result<Self, ShellError> {
-        match roll_type {
-            "min" => Ok(Self::Min),
-            "max" => Ok(Self::Max),
-            "sum" => Ok(Self::Sum),
-            "mean" => Ok(Self::Mean),
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Wrong operation",
-                "Operation not valid for rolling",
-                span,
-                "Perhaps you want to use: max, min, sum, mean",
-                span,
-            )),
-        }
-    }
-
-    fn to_str(&self) -> &'static str {
-        match self {
-            RollType::Min => "rolling_min",
-            RollType::Max => "rolling_max",
-            RollType::Sum => "rolling_sum",
-            RollType::Mean => "rolling_mean",
-        }
-    }
-}
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe rolling"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Rolling calculation for a series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe rolling")
-            .required("type", SyntaxShape::String, "rolling operation")
-            .required("window", SyntaxShape::Int, "Window size for rolling")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Rolling sum for a series",
-                example:
-                    "[1 2 3 4 5] | dataframe to-df | dataframe rolling sum 2 | dataframe drop-nulls",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0_rolling_sum".to_string(),
-                        vec![
-                            UntaggedValue::int(3).into(),
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(7).into(),
-                            UntaggedValue::int(9).into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Rolling max for a series",
-                example:
-                    "[1 2 3 4 5] | dataframe to-df | dataframe rolling max 2 | dataframe drop-nulls",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0_rolling_max".to_string(),
-                        vec![
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(3).into(),
-                            UntaggedValue::int(4).into(),
-                            UntaggedValue::int(5).into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let roll_type: Tagged<String> = args.req(0)?;
-    let window_size: Tagged<i64> = args.req(1)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    if let DataType::Object(_) = series.dtype() {
-        return Err(ShellError::labeled_error(
-            "Found object series",
-            "Series of type object cannot be used for rolling operation",
-            &df_tag.span,
-        ));
-    }
-
-    let roll_type = RollType::from_str(&roll_type.item, &roll_type.tag.span)?;
-    let rolling_opts = RollingOptions {
-        window_size: window_size.item as usize,
-        min_periods: window_size.item as usize,
-        weights: None,
-        center: false,
-    };
-    let res = match roll_type {
-        RollType::Max => series.rolling_max(rolling_opts),
-        RollType::Min => series.rolling_min(rolling_opts),
-        RollType::Sum => series.rolling_sum(rolling_opts),
-        RollType::Mean => series.rolling_mean(rolling_opts),
-    };
-
-    let mut res = res.map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let name = format!("{}_{}", series.name(), roll_type.to_str());
-    res.rename(&name);
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/set.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/set.rs
deleted file mode 100644
index 68b13a125..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/set.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Primitive, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use polars::prelude::{ChunkSet, DataType, IntoSeries};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe set"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Sets value where given mask is true"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe set")
-            .required("value", SyntaxShape::Any, "value to be inserted in series")
-            .required_named(
-                "mask",
-                SyntaxShape::Any,
-                "mask indicating insertions",
-                Some('m'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shifts the values by a given period",
-            example: r#"let s = ([1 2 2 3 3] | dataframe to-df | dataframe shift 2);
-    let mask = ($s | dataframe is-null);
-    $s | dataframe set 0 --mask $mask"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::int(0).into(),
-                        UntaggedValue::int(0).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(2).into(),
-                        UntaggedValue::int(2).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-    let mask: Value = args.req_named("mask")?;
-
-    let mask_df = match &mask.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only use a series as mask",
-            value.tag.span,
-        )),
-    }?;
-
-    let mask_series = mask_df.as_series(&mask.tag.span)?;
-
-    let bool_mask = match mask_series.dtype() {
-        DataType::Boolean => mask_series
-            .bool()
-            .map_err(|e| parse_polars_error::<&str>(&e, &mask.tag.span, None)),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only use bool series as mask",
-            value.tag.span,
-        )),
-    }?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Int(val)) => {
-            let chunked = series.i64().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the set value type"),
-                )
-            })?;
-
-            let res = chunked
-                .set(bool_mask, Some(*val))
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        UntaggedValue::Primitive(Primitive::Decimal(val)) => {
-            let chunked = series.as_ref().f64().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the series type"),
-                )
-            })?;
-
-            let res = chunked
-                .set(
-                    bool_mask,
-                    Some(
-                        val.to_f64()
-                            .expect("internal error: expected f64-compatible decimal"),
-                    ),
-                )
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        UntaggedValue::Primitive(Primitive::String(val)) => {
-            let chunked = series.as_ref().utf8().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the series type"),
-                )
-            })?;
-
-            let res = chunked
-                .set(bool_mask, Some(val.as_ref()))
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let mut res = res.into_series();
-            res.rename("string");
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            format!(
-                "this value cannot be set in a series of type '{}'",
-                series.dtype()
-            ),
-            value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/set_with_idx.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/set_with_idx.rs
deleted file mode 100644
index e541be455..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/set_with_idx.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Primitive, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use polars::prelude::{ChunkSet, DataType, IntoSeries};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe set-with-idx"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Sets value in the given index"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe set-with-idx")
-            .required("value", SyntaxShape::Any, "value to be inserted in series")
-            .required_named(
-                "indices",
-                SyntaxShape::Any,
-                "list of indices indicating where to set the value",
-                Some('i'),
-            )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Set value in selected rows from series",
-            example: r#"let series = ([4 1 5 2 4 3] | dataframe to-df);
-    let indices = ([0 2] | dataframe to-df);
-    $series | dataframe set-with-idx 6 -i $indices"#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::int(6).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(6).into(),
-                        UntaggedValue::int(2).into(),
-                        UntaggedValue::int(4).into(),
-                        UntaggedValue::int(3).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-    let indices: Value = args.req_named("indices")?;
-
-    let indices = match &indices.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only use a series for set command",
-            value.tag.span,
-        )),
-    }?;
-
-    let indices = indices.as_series(&value.tag.span)?;
-
-    let casted = match indices.dtype() {
-        DataType::UInt32 | DataType::UInt64 | DataType::Int32 | DataType::Int64 => indices
-            .as_ref()
-            .cast(&DataType::UInt32)
-            .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None)),
-        _ => Err(ShellError::labeled_error_with_secondary(
-            "Incorrect type",
-            "Series with incorrect type",
-            &value.tag.span,
-            "Consider using a Series with type int type",
-            &value.tag.span,
-        )),
-    }?;
-
-    let indices = casted
-        .u32()
-        .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?
-        .into_iter()
-        .filter_map(|val| val.map(|v| v as usize));
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Int(val)) => {
-            let chunked = series.i64().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the set value type"),
-                )
-            })?;
-
-            let res = chunked
-                .set_at_idx(indices, Some(*val))
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        UntaggedValue::Primitive(Primitive::Decimal(val)) => {
-            let chunked = series.as_ref().f64().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the series type"),
-                )
-            })?;
-
-            let res = chunked
-                .set_at_idx(
-                    indices,
-                    Some(
-                        val.to_f64()
-                            .expect("internal error: expected f64-compatible decimal"),
-                    ),
-                )
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        UntaggedValue::Primitive(Primitive::String(val)) => {
-            let chunked = series.as_ref().utf8().map_err(|e| {
-                parse_polars_error::<&str>(
-                    &e,
-                    &value.tag.span,
-                    Some("The value has to match the series type"),
-                )
-            })?;
-
-            let res = chunked
-                .set_at_idx(indices, Some(val.as_ref()))
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            let mut res = res.into_series();
-            res.rename("string");
-
-            let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-            Ok(OutputStream::one(df.into_value(df_tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            format!(
-                "this value cannot be set in a series of type '{}'",
-                series.as_ref().dtype()
-            ),
-            value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/shift.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/shift.rs
deleted file mode 100644
index 6aaa6b60b..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/shift.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{dataframe::NuDataFrame, Signature, SyntaxShape};
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe shift"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Shifts the values by a given period"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe unique").required("period", SyntaxShape::Int, "shift period")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shifts the values by a given period",
-            example: "[1 2 2 3 3] | dataframe to-df | dataframe shift 2",
-            result: None,
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let period: Tagged<i64> = args.req(0)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df.as_series(&df_tag.span)?.shift(period.item);
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/str_lengths.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/str_lengths.rs
deleted file mode 100644
index a2d31e160..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/str_lengths.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe str-lengths"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Get lengths of all strings"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe str-lengths")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns string lengths",
-            example: "[a ab abc] | dataframe to-df | dataframe str-lengths",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(2).into(),
-                        UntaggedValue::int(3).into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The str-lengths command can only be used with string columns"),
-        )
-    })?;
-
-    let res = chunked.as_ref().str_lengths();
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/str_slice.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/str_slice.rs
deleted file mode 100644
index 2689348c3..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/str_slice.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-use nu_source::Tagged;
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe str-slice"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Slices the string from the start position until the selected length"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe replace")
-            .required_named("start", SyntaxShape::Int, "start of slice", Some('s'))
-            .named("length", SyntaxShape::Int, "optional length", Some('l'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Creates slices from the strings",
-            example: "[abcded abc321 abc123] | dataframe to-df | dataframe str-slice -s 1 -l 2",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("bc").into(),
-                        UntaggedValue::string("bc").into(),
-                        UntaggedValue::string("bc").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let start: Tagged<i64> = args.req_named("start")?;
-
-    let length: Option<Tagged<i64>> = args.get_flag("length")?;
-    let length = length.map(|v| v.item as u64);
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The str-slice command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked
-        .str_slice(start.item, length)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/strftime.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/strftime.rs
deleted file mode 100644
index 8be3f31fb..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/strftime.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe strftime"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Formats date based on string rule"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe strftime").required("fmt", SyntaxShape::String, "Format rule")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Formats date",
-            example: r#"let dt = ('2020-08-04T16:39:18+00:00' | str to-datetime -z 'UTC');
-    let df = ([$dt $dt] | dataframe to-df);
-    $df | dataframe strftime "%Y/%m/%d""#,
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("2020/08/04").into(),
-                        UntaggedValue::string("2020/08/04").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let fmt: Tagged<String> = args.req(0)?;
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let series = df.as_series(&df_tag.span)?;
-
-    let casted = series
-        .datetime()
-        .map_err(|e| parse_polars_error::<&str>(&e, &df_tag.span, None))?;
-
-    let res = casted.strftime(&fmt.item).into_series();
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/to_lowercase.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/to_lowercase.rs
deleted file mode 100644
index 7ea88f3b1..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/to_lowercase.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-lowercase"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Lowercase the strings in the column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-lowercase")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to lowercase",
-            example: "[Abc aBc abC] | dataframe to-df | dataframe to-lowercase",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("abc").into(),
-                        UntaggedValue::string("abc").into(),
-                        UntaggedValue::string("abc").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The to-lowercase command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked.to_lowercase();
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/to_uppercase.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/to_uppercase.rs
deleted file mode 100644
index ab0665572..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/to_uppercase.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-use polars::prelude::IntoSeries;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-uppercase"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Uppercase the strings in the column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-uppercase")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Modifies strings to uppercase",
-            example: "[Abc aBc abC] | dataframe to-df | dataframe to-uppercase",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![
-                        UntaggedValue::string("ABC").into(),
-                        UntaggedValue::string("ABC").into(),
-                        UntaggedValue::string("ABC").into(),
-                    ],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let series = df.as_series(&df_tag.span)?;
-    let chunked = series.utf8().map_err(|e| {
-        parse_polars_error::<&str>(
-            &e,
-            &df_tag.span,
-            Some("The to-uppercase command can only be used with string columns"),
-        )
-    })?;
-
-    let mut res = chunked.to_uppercase();
-    res.rename(series.name());
-
-    let df = NuDataFrame::try_from_series(vec![res.into_series()], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/unique.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/unique.rs
deleted file mode 100644
index eac8994b5..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/unique.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use crate::{commands::dataframe::utils::parse_polars_error, prelude::*};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe unique"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns unique values from a series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe unique")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Returns unique values from a series",
-            example: "[2 2 2 2 2] | dataframe to-df | dataframe unique",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![Column::new(
-                    "0".to_string(),
-                    vec![UntaggedValue::int(2).into()],
-                )],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let res = df
-        .as_series(&df_tag.span)?
-        .unique()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    let df = NuDataFrame::try_from_series(vec![res], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(df_tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/series/value_counts.rs b/old_nushell/crates/nu-command/src/commands/dataframe/series/value_counts.rs
deleted file mode 100644
index a992db6a5..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/series/value_counts.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-use crate::commands::dataframe::utils::parse_polars_error;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe value-counts"
-    }
-
-    fn usage(&self) -> &str {
-        "[Series] Returns a dataframe with the counts for unique values in series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe value-counts")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Calculates value counts",
-            example: "[5 5 5 5 6 6] | dataframe to-df | dataframe value-counts",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "0".to_string(),
-                        vec![UntaggedValue::int(5).into(), UntaggedValue::int(6).into()],
-                    ),
-                    Column::new(
-                        "counts".to_string(),
-                        vec![UntaggedValue::int(4).into(), UntaggedValue::int(2).into()],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, df_tag) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let df_new = df
-        .as_series(&df_tag.span)?
-        .value_counts()
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(
-        df_new, tag,
-    )))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/shape.rs b/old_nushell/crates/nu-command/src/commands/dataframe/shape.rs
deleted file mode 100644
index 29424b034..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/shape.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue, Value,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe shape"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Shows column and row size for a dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe shape")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Shows row and column shape",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe shape",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("rows".to_string(), vec![UntaggedValue::int(2).into()]),
-                    Column::new("columns".to_string(), vec![UntaggedValue::int(2).into()]),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let rows = Value {
-        value: (df.as_ref().height() as i64).into(),
-        tag: Tag::default(),
-    };
-
-    let cols = Value {
-        value: (df.as_ref().width() as i64).into(),
-        tag: Tag::default(),
-    };
-
-    let rows_col = Column::new("rows".to_string(), vec![rows]);
-    let cols_col = Column::new("columns".to_string(), vec![cols]);
-
-    let df = NuDataFrame::try_from_columns(vec![rows_col, cols_col], &tag.span)?;
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/show.rs b/old_nushell/crates/nu-command/src/commands/dataframe/show.rs
deleted file mode 100644
index 6a21d24da..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/show.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{dataframe::NuDataFrame, Signature, SyntaxShape};
-
-use nu_source::Tagged;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe show"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Converts a section of the dataframe to a Table or List value"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe show")
-            .named(
-                "n_rows",
-                SyntaxShape::Number,
-                "number of rows to be shown",
-                Some('n'),
-            )
-            .switch("tail", "shows tail rows", Some('t'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Shows head rows from dataframe",
-                example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe show",
-                result: None,
-            },
-            Example {
-                description: "Shows tail rows from dataframe",
-                example: "[[a b]; [1 2] [3 4] [5 6]] | dataframe to-df | dataframe show -t -n 1",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let rows: Option<Tagged<usize>> = args.get_flag("n_rows")?;
-    let tail: bool = args.has_flag("tail");
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let rows = rows.map(|v| v.item);
-    let values = if tail { df.tail(rows)? } else { df.head(rows)? };
-
-    Ok(OutputStream::from_stream(values.into_iter()))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/slice.rs b/old_nushell/crates/nu-command/src/commands/dataframe/slice.rs
deleted file mode 100644
index 5a7b5c6f2..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/slice.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue,
-};
-
-use nu_source::Tagged;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe slice"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Creates new dataframe from a slice of rows"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe slice")
-            .required("offset", SyntaxShape::Number, "start of slice")
-            .required("size", SyntaxShape::Number, "size of slice")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Create new dataframe from a slice of the rows",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe slice 0 1",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("a".to_string(), vec![UntaggedValue::int(1).into()]),
-                    Column::new("b".to_string(), vec![UntaggedValue::int(2).into()]),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let offset: Tagged<usize> = args.req(0)?;
-    let size: Tagged<usize> = args.req(1)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-    let res = df.as_ref().slice(offset.item as i64, size.item);
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/sort.rs b/old_nushell/crates/nu-command/src/commands/dataframe/sort.rs
deleted file mode 100644
index 6146847a8..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/sort.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use super::utils::{convert_columns, parse_polars_error};
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe sort"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame, Series] Creates new sorted dataframe or series"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe sort")
-            .switch("reverse", "invert sort", Some('r'))
-            .rest("rest", SyntaxShape::Any, "column names to sort dataframe")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create new sorted dataframe",
-                example: "[[a b]; [3 4] [1 2]] | dataframe to-df | dataframe sort a",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Create new sorted series",
-                example: "[3 4 1 2] | dataframe to-df | dataframe sort",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(3).into(),
-                            UntaggedValue::int(4).into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let value = args.input.next().ok_or_else(|| {
-        ShellError::labeled_error("Empty stream", "No value found in stream", &tag.span)
-    })?;
-
-    let reverse = args.has_flag("reverse");
-
-    match &value.value {
-        UntaggedValue::DataFrame(df) => {
-            if df.is_series() {
-                let columns = df.as_ref().get_column_names();
-
-                let res = df
-                    .as_ref()
-                    .sort(columns, reverse)
-                    .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-                Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-            } else {
-                let columns: Vec<Value> = args.rest(0)?;
-
-                if !columns.is_empty() {
-                    let (col_string, col_span) = convert_columns(&columns, &tag)?;
-
-                    let res = df
-                        .as_ref()
-                        .sort(&col_string, reverse)
-                        .map_err(|e| parse_polars_error::<&str>(&e, &col_span, None))?;
-
-                    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-                } else {
-                    Err(ShellError::labeled_error(
-                        "Missing columns",
-                        "missing column name to perform sort",
-                        &tag.span,
-                    ))
-                }
-            }
-        }
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "sort cannot be done with this value",
-            &value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/take.rs b/old_nushell/crates/nu-command/src/commands/dataframe/take.rs
deleted file mode 100644
index 1373d8c7d..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/take.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use polars::prelude::DataType;
-
-use super::utils::parse_polars_error;
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe take"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame, Series] Creates new dataframe using the given indices"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe take").required(
-            "indices",
-            SyntaxShape::Any,
-            "list of indices used to take data",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Takes selected rows from dataframe",
-                example: r#"let df = ([[a b]; [4 1] [5 2] [4 3]] | dataframe to-df);
-    let indices = ([0 2] | dataframe to-df);
-    $df | dataframe take $indices"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![UntaggedValue::int(4).into(), UntaggedValue::int(4).into()],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Takes selected rows from series",
-                example: r#"let series = ([4 1 5 2 4 3] | dataframe to-df);
-    let indices = ([0 2] | dataframe to-df);
-    $series | dataframe take $indices"#,
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![UntaggedValue::int(4).into(), UntaggedValue::int(5).into()],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-
-    let df = match &value.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only use a series for take command",
-            value.tag.span,
-        )),
-    }?;
-
-    let series = df.as_series(&value.tag.span)?;
-
-    let casted = match series.dtype() {
-        DataType::UInt32 | DataType::UInt64 | DataType::Int32 | DataType::Int64 => series
-            .as_ref()
-            .cast(&DataType::UInt32)
-            .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None)),
-        _ => Err(ShellError::labeled_error_with_secondary(
-            "Incorrect type",
-            "Series with incorrect type",
-            &value.tag.span,
-            "Consider using a Series with type int type",
-            &value.tag.span,
-        )),
-    }?;
-
-    let indices = casted
-        .u32()
-        .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-    let value = args.input.next().ok_or_else(|| {
-        ShellError::labeled_error("Empty stream", "No value found in the stream", &tag)
-    })?;
-
-    match &value.value {
-        UntaggedValue::DataFrame(df) => {
-            let res = df
-                .as_ref()
-                .take(indices)
-                .map_err(|e| parse_polars_error::<&str>(&e, &value.tag.span, None))?;
-
-            Ok(OutputStream::one(NuDataFrame::dataframe_to_value(res, tag)))
-        }
-        _ => Err(ShellError::labeled_error(
-            "No dataframe or series in stream",
-            "no dataframe or series found in input stream",
-            &value.tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/to_csv.rs b/old_nushell/crates/nu-command/src/commands/dataframe/to_csv.rs
deleted file mode 100644
index d0d9a600a..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/to_csv.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use std::fs::File;
-use std::path::PathBuf;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::dataframe::NuDataFrame;
-use nu_protocol::Primitive;
-use nu_protocol::Value;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-
-use polars::prelude::{CsvWriter, SerWriter};
-
-use nu_source::Tagged;
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-csv"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Saves dataframe to csv file"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-csv")
-            .required("file", SyntaxShape::FilePath, "file path to save dataframe")
-            .named(
-                "delimiter",
-                SyntaxShape::String,
-                "file delimiter character",
-                Some('d'),
-            )
-            .switch("no_header", "Indicates if file doesn't have header", None)
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Saves dataframe to csv file",
-                example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe to-csv test.csv",
-                result: None,
-            },
-            Example {
-                description: "Saves dataframe to csv file using other delimiter",
-                example:
-                    "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe to-csv test.csv -d '|'",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let file_name: Tagged<PathBuf> = args.req(0)?;
-    let delimiter: Option<Tagged<String>> = args.get_flag("delimiter")?;
-    let no_header: bool = args.has_flag("no_header");
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let mut file = File::create(&file_name.item).map_err(|e| {
-        ShellError::labeled_error("Error with file name", e.to_string(), &file_name.tag.span)
-    })?;
-
-    let writer = CsvWriter::new(&mut file);
-
-    let writer = if no_header {
-        writer.has_header(false)
-    } else {
-        writer.has_header(true)
-    };
-
-    let writer = match delimiter {
-        None => writer,
-        Some(d) => {
-            if d.item.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Incorrect delimiter",
-                    "Delimiter has to be one char",
-                    &d.tag,
-                ));
-            } else {
-                let delimiter = match d.item.chars().next() {
-                    Some(d) => d as u8,
-                    None => unreachable!(),
-                };
-
-                writer.with_delimiter(delimiter)
-            }
-        }
-    };
-
-    writer
-        .finish(df.as_ref())
-        .map_err(|e| parse_polars_error::<&str>(&e, &file_name.tag.span, None))?;
-
-    let tagged_value = Value {
-        value: UntaggedValue::Primitive(Primitive::String(format!(
-            "saved {}",
-            &file_name.item.to_str().expect("csv file")
-        ))),
-        tag: Tag::unknown(),
-    };
-
-    Ok(InputStream::one(tagged_value).into_output_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/to_df.rs b/old_nushell/crates/nu-command/src/commands/dataframe/to_df.rs
deleted file mode 100644
index cb85d6b08..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/to_df.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, UntaggedValue,
-};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-df"
-    }
-
-    fn usage(&self) -> &str {
-        "Converts a List, Table or Dictionary into a polars dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-df")
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-
-        let df = NuDataFrame::try_from_iter(args.input, &tag)?;
-
-        Ok(InputStream::one(df.into_value(tag)))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Takes a dictionary and creates a dataframe",
-                example: "[[a b];[1 2] [3 4]] | dataframe to-df",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "a".to_string(),
-                            vec![UntaggedValue::int(1).into(), UntaggedValue::int(3).into()],
-                        ),
-                        Column::new(
-                            "b".to_string(),
-                            vec![UntaggedValue::int(2).into(), UntaggedValue::int(4).into()],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Takes a list of tables and creates a dataframe",
-                example: "[[1 2 a] [3 4 b] [5 6 c]] | dataframe to-df",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![
-                        Column::new(
-                            "0".to_string(),
-                            vec![
-                                UntaggedValue::int(1).into(),
-                                UntaggedValue::int(3).into(),
-                                UntaggedValue::int(5).into(),
-                            ],
-                        ),
-                        Column::new(
-                            "1".to_string(),
-                            vec![
-                                UntaggedValue::int(2).into(),
-                                UntaggedValue::int(4).into(),
-                                UntaggedValue::int(6).into(),
-                            ],
-                        ),
-                        Column::new(
-                            "2".to_string(),
-                            vec![
-                                UntaggedValue::string("a").into(),
-                                UntaggedValue::string("b").into(),
-                                UntaggedValue::string("c").into(),
-                            ],
-                        ),
-                    ],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Takes a list and creates a dataframe",
-                example: "[a b c] | dataframe to-df",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            UntaggedValue::string("a").into(),
-                            UntaggedValue::string("b").into(),
-                            UntaggedValue::string("c").into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-            Example {
-                description: "Takes a list of booleans and creates a dataframe",
-                example: "[$true $true $false] | dataframe to-df",
-                result: Some(vec![NuDataFrame::try_from_columns(
-                    vec![Column::new(
-                        "0".to_string(),
-                        vec![
-                            UntaggedValue::boolean(true).into(),
-                            UntaggedValue::boolean(true).into(),
-                            UntaggedValue::boolean(false).into(),
-                        ],
-                    )],
-                    &Span::default(),
-                )
-                .expect("simple df for test should not fail")
-                .into_value(Tag::default())]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/to_parquet.rs b/old_nushell/crates/nu-command/src/commands/dataframe/to_parquet.rs
deleted file mode 100644
index 87bb4b925..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/to_parquet.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use std::fs::File;
-use std::path::PathBuf;
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::dataframe::NuDataFrame;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-use polars::prelude::ParquetWriter;
-
-use nu_source::Tagged;
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe to-parquet"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Saves dataframe to parquet file"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe to-parquet").required(
-            "file",
-            SyntaxShape::FilePath,
-            "file path to save dataframe",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Saves dataframe to parquet file",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe to-parquet test.parquet",
-            result: None,
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let file_name: Tagged<PathBuf> = args.req(0)?;
-
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    let file = File::create(&file_name.item).map_err(|e| {
-        ShellError::labeled_error("Error with file name", e.to_string(), &file_name.tag.span)
-    })?;
-
-    ParquetWriter::new(file)
-        .finish(df.as_ref())
-        .map_err(|e| parse_polars_error::<&str>(&e, &file_name.tag.span, None))?;
-
-    let tagged_value = Value {
-        value: UntaggedValue::Primitive(Primitive::String(format!(
-            "saved {}",
-            &file_name.item.to_str().expect("parquet file")
-        ))),
-        tag: Tag::unknown(),
-    };
-
-    Ok(InputStream::one(tagged_value).into_output_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/utils.rs b/old_nushell/crates/nu-command/src/commands/dataframe/utils.rs
deleted file mode 100644
index 20245c25c..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/utils.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, UntaggedValue, Value};
-use polars::prelude::PolarsError;
-
-// Converts a Vec<Value> to a Vec<String> with a Span marking the whole
-// location of the columns for error referencing
-pub(crate) fn convert_columns(
-    columns: &[Value],
-    tag: &Tag,
-) -> Result<(Vec<String>, Span), ShellError> {
-    let mut col_span = match columns
-        .get(0)
-        .map(|v| Span::new(v.tag.span.start(), v.tag.span.end()))
-    {
-        Some(span) => span,
-        None => {
-            return Err(ShellError::labeled_error(
-                "Empty column list",
-                "Empty list found for command",
-                tag,
-            ))
-        }
-    };
-
-    let res = columns
-        .iter()
-        .map(|value| match &value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => {
-                col_span = col_span.until(value.tag.span);
-                Ok(s.clone())
-            }
-            _ => Err(ShellError::labeled_error(
-                "Incorrect column format",
-                "Only string as column name",
-                &value.tag,
-            )),
-        })
-        .collect::<Result<Vec<String>, _>>()?;
-
-    Ok((res, col_span))
-}
-
-pub(crate) fn parse_polars_error<T: AsRef<str>>(
-    e: &PolarsError,
-    span: &Span,
-    secondary: Option<T>,
-) -> ShellError {
-    let msg = match e {
-        PolarsError::PolarsArrowError(_) => "PolarsArrow Error",
-        PolarsError::ArrowError(_) => "Arrow Error",
-        PolarsError::InvalidOperation(_) => "Invalid Operation",
-        PolarsError::DataTypeMisMatch(_) => "Data Type Mismatch",
-        PolarsError::NotFound(_) => "Not Found",
-        PolarsError::ShapeMisMatch(_) => "Shape Mismatch",
-        PolarsError::ComputeError(_) => "Computer error",
-        PolarsError::OutOfBounds(_) => "Out Of Bounds",
-        PolarsError::NoSlice => "No Slice",
-        PolarsError::NoData(_) => "No Data",
-        PolarsError::ValueError(_) => "Value Error",
-        PolarsError::MemoryNotAligned => "Memory Not Aligned",
-        PolarsError::RandError(_) => "Rand Error",
-        PolarsError::HasNullValues(_) => "Has Null Values",
-        PolarsError::UnknownSchema(_) => "Unknown Schema",
-        PolarsError::Various(_) => "Various",
-        PolarsError::Io(_) => "Io Error",
-        PolarsError::Regex(_) => "Regex Error",
-        PolarsError::Duplicate(_) => "Duplicate Error",
-        PolarsError::ImplementationError => "Implementation Error",
-    };
-
-    let label = e.to_string();
-
-    match secondary {
-        None => ShellError::labeled_error(msg, label, span),
-        Some(s) => ShellError::labeled_error_with_secondary(msg, label, span, s.as_ref(), span),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/where_.rs b/old_nushell/crates/nu-command/src/commands/dataframe/where_.rs
deleted file mode 100644
index aaf5d2b25..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/where_.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{evaluate_baseline_expr, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    hir::{CapturedBlock, ClassifiedCommand, Expression, Literal, Operator, SpannedExpression},
-    Primitive, Signature, SyntaxShape, UnspannedPathMember, UntaggedValue, Value,
-};
-
-use super::utils::parse_polars_error;
-use polars::prelude::{ChunkCompare, DataType, Series};
-
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe where"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe where").required(
-            "condition",
-            SyntaxShape::RowCondition,
-            "the condition that must match",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Filter dataframe to match the condition"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Filter dataframe based on column a",
-            example: "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe where a == 1",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new("a".to_string(), vec![UntaggedValue::int(1).into()]),
-                    Column::new("b".to_string(), vec![UntaggedValue::int(2).into()]),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let block: CapturedBlock = args.req(0)?;
-
-    let expression = block
-        .block
-        .block
-        .get(0)
-        .and_then(|group| {
-            group
-                .pipelines
-                .get(0)
-                .and_then(|v| v.list.get(0))
-                .and_then(|expr| match &expr {
-                    ClassifiedCommand::Expr(expr) => match &expr.as_ref().expr {
-                        Expression::Binary(expr) => Some(expr),
-                        _ => None,
-                    },
-                    _ => None,
-                })
-        })
-        .ok_or_else(|| {
-            ShellError::labeled_error("Expected a condition", "expected a condition", &tag.span)
-        })?;
-
-    let lhs = match &expression.left.expr {
-        Expression::FullColumnPath(p) => p.as_ref().tail.get(0),
-        _ => None,
-    }
-    .ok_or_else(|| {
-        ShellError::labeled_error(
-            "No column name",
-            "Not a column name found in left hand side of comparison",
-            &expression.left.span,
-        )
-    })?;
-
-    let (col_name, col_name_span) = match &lhs.unspanned {
-        UnspannedPathMember::String(name) => Ok((name, &lhs.span)),
-        _ => Err(ShellError::labeled_error(
-            "No column name",
-            "Not a string as column name",
-            &lhs.span,
-        )),
-    }?;
-
-    let rhs = evaluate_baseline_expr(&expression.right, &args.context)?;
-
-    filter_dataframe(args, col_name, col_name_span, &rhs, &expression.op)
-}
-
-macro_rules! comparison_arm {
-    ($comparison:expr,  $col:expr, $condition:expr, $span:expr) => {
-        match $condition {
-            Primitive::Int(val) => Ok($comparison($col, *val)),
-            Primitive::BigInt(val) => Ok($comparison(
-                $col,
-                val.to_i64()
-                    .expect("Internal error: protocol did not use compatible decimal"),
-            )),
-            Primitive::Decimal(val) => Ok($comparison(
-                $col,
-                val.to_f64()
-                    .expect("Internal error: protocol did not use compatible decimal"),
-            )),
-            Primitive::String(val) => {
-                let temp: &str = val.as_ref();
-                Ok($comparison($col, temp))
-            }
-            _ => Err(ShellError::labeled_error(
-                "Invalid datatype",
-                format!(
-                    "this operator cannot be used with the selected '{}' datatype",
-                    $col.dtype()
-                ),
-                &$span,
-            )),
-        }
-    };
-}
-
-// With the information extracted from the block we can filter the dataframe using
-// polars operations
-fn filter_dataframe(
-    mut args: CommandArgs,
-    col_name: &str,
-    col_name_span: &Span,
-    rhs: &Value,
-    operator: &SpannedExpression,
-) -> Result<OutputStream, ShellError> {
-    let right_condition = match &rhs.value {
-        UntaggedValue::Primitive(primitive) => Ok(primitive),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect argument",
-            "Expected primitive values",
-            &rhs.tag.span,
-        )),
-    }?;
-
-    let span = args.call_info.name_tag.span;
-    let (df, _) = NuDataFrame::try_from_stream(&mut args.input, &span)?;
-
-    let col = df
-        .as_ref()
-        .column(col_name)
-        .map_err(|e| parse_polars_error::<&str>(&e, col_name_span, None))?;
-
-    let op = match &operator.expr {
-        Expression::Literal(Literal::Operator(op)) => Ok(op),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect argument",
-            "Expected operator",
-            &operator.span,
-        )),
-    }?;
-
-    let mask = match op {
-        Operator::Equal => comparison_arm!(Series::eq, col, right_condition, operator.span),
-        Operator::NotEqual => comparison_arm!(Series::neq, col, right_condition, operator.span),
-        Operator::LessThan => comparison_arm!(Series::lt, col, right_condition, operator.span),
-        Operator::LessThanOrEqual => {
-            comparison_arm!(Series::lt_eq, col, right_condition, operator.span)
-        }
-        Operator::GreaterThan => comparison_arm!(Series::gt, col, right_condition, operator.span),
-        Operator::GreaterThanOrEqual => {
-            comparison_arm!(Series::gt_eq, col, right_condition, operator.span)
-        }
-        Operator::Contains => match col.dtype() {
-            DataType::Utf8 => match right_condition {
-                Primitive::String(pat) => {
-                    let casted = col.utf8().map_err(|e| {
-                        parse_polars_error::<&str>(&e, &args.call_info.name_tag.span, None)
-                    })?;
-
-                    casted.contains(pat).map_err(|e| {
-                        parse_polars_error::<&str>(&e, &args.call_info.name_tag.span, None)
-                    })
-                }
-                _ => Err(ShellError::labeled_error_with_secondary(
-                    "Incorrect argument",
-                    "Can't perform contains with this value",
-                    &rhs.tag.span,
-                    "Contains only works with strings",
-                    &rhs.tag.span,
-                )),
-            },
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Incorrect datatype",
-                format!("The selected column is of type '{}'", col.dtype()),
-                col_name_span,
-                "Perhaps you want to select a column of 'str' type",
-                col_name_span,
-            )),
-        },
-        _ => Err(ShellError::labeled_error(
-            "Incorrect operator",
-            "Not implemented operator for dataframes filter",
-            &operator.span,
-        )),
-    }?;
-
-    let res = df
-        .as_ref()
-        .filter(&mask)
-        .map_err(|e| parse_polars_error::<&str>(&e, &args.call_info.name_tag.span, None))?;
-
-    Ok(OutputStream::one(NuDataFrame::dataframe_to_value(
-        res,
-        args.call_info.name_tag,
-    )))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/dataframe/with_column.rs b/old_nushell/crates/nu-command/src/commands/dataframe/with_column.rs
deleted file mode 100644
index da2225add..000000000
--- a/old_nushell/crates/nu-command/src/commands/dataframe/with_column.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    dataframe::{Column, NuDataFrame},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-use super::utils::parse_polars_error;
-pub struct DataFrame;
-
-impl WholeStreamCommand for DataFrame {
-    fn name(&self) -> &str {
-        "dataframe with-column"
-    }
-
-    fn usage(&self) -> &str {
-        "[DataFrame] Adds a series to the dataframe"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("dataframe with-column")
-            .required("series", SyntaxShape::Any, "series to be added")
-            .required_named("name", SyntaxShape::String, "column name", Some('n'))
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Adds a series to the dataframe",
-            example:
-                "[[a b]; [1 2] [3 4]] | dataframe to-df | dataframe with-column ([5 6] | dataframe to-df) --name c",
-            result: Some(vec![NuDataFrame::try_from_columns(
-                vec![
-                    Column::new(
-                        "a".to_string(),
-                        vec![
-                            UntaggedValue::int(1).into(),
-                            UntaggedValue::int(3).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "b".to_string(),
-                        vec![
-                            UntaggedValue::int(2).into(),
-                            UntaggedValue::int(4).into(),
-                        ],
-                    ),
-                    Column::new(
-                        "c".to_string(),
-                        vec![
-                            UntaggedValue::int(5).into(),
-                            UntaggedValue::int(6).into(),
-                        ],
-                    ),
-                ],
-                &Span::default(),
-            )
-            .expect("simple df for test should not fail")
-            .into_value(Tag::default())]),
-        }]
-    }
-}
-
-fn command(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let value: Value = args.req(0)?;
-    let name: Tagged<String> = args.req_named("name")?;
-
-    let df = match value.value {
-        UntaggedValue::DataFrame(df) => Ok(df),
-        _ => Err(ShellError::labeled_error(
-            "Incorrect type",
-            "can only add a series to a dataframe",
-            value.tag.span,
-        )),
-    }?;
-
-    let mut series = df.as_series(&value.tag.span)?;
-
-    let series = series.rename(&name.item).clone();
-
-    let (mut df, _) = NuDataFrame::try_from_stream(&mut args.input, &tag.span)?;
-
-    df.as_mut()
-        .with_column(series)
-        .map_err(|e| parse_polars_error::<&str>(&e, &tag.span, None))?;
-
-    Ok(OutputStream::one(df.into_value(tag)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DataFrame;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test_dataframe as test_examples;
-
-        test_examples(DataFrame {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/autoenv.rs b/old_nushell/crates/nu-command/src/commands/env/autoenv.rs
deleted file mode 100644
index d8a8b492a..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/autoenv.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-pub struct Autoenv;
-
-impl WholeStreamCommand for Autoenv {
-    fn name(&self) -> &str {
-        "autoenv"
-    }
-    fn usage(&self) -> &str {
-        "Manage directory specific environment variables and scripts."
-    }
-
-    fn extra_usage(&self) -> &str {
-        // "Mark a .nu-env file in a directory as trusted. Needs to be re-run after each change to the file or its filepath."
-        r#"Create a file called .nu-env in any directory and run 'autoenv trust' to let nushell load it when entering the directory.
-The .nu-env file has the same format as your $HOME/nu/config.toml file. By loading a .nu-env file the following applies:
-    - environment variables (section \"[env]\") are loaded from the .nu-env file. Those env variables only exist in this directory (and children directories)
-    - the \"startup\" commands are run when entering the directory
-    - the \"on_exit\" commands are run when leaving the directory
-"#
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("autoenv")
-    }
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(ActionStream::one(ReturnSuccess::value(
-            UntaggedValue::string(get_full_help(&Autoenv, args.scope())).into_value(Tag::unknown()),
-        )))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Example .nu-env file",
-            example: r#"cat .nu-env
-        startup = ["echo ...entering the directory", "echo 1 2 3"]
-        on_exit = ["echo ...leaving the directory"]
-
-        [env]
-        mykey = "myvalue"
-            "#,
-            result: None,
-        }]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/autoenv_trust.rs b/old_nushell/crates/nu-command/src/commands/env/autoenv_trust.rs
deleted file mode 100644
index d3f62ca05..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/autoenv_trust.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::prelude::*;
-use nu_data::config::read_trusted;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::SyntaxShape;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
-use sha2::{Digest, Sha256};
-use std::{fs, path::PathBuf};
-pub struct AutoenvTrust;
-
-impl WholeStreamCommand for AutoenvTrust {
-    fn name(&self) -> &str {
-        "autoenv trust"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("autoenv trust")
-            .optional("dir", SyntaxShape::String, "Directory to allow")
-            .switch("quiet", "Don't output success message", Some('q'))
-    }
-
-    fn usage(&self) -> &str {
-        "Trust a .nu-env file in the current or given directory"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-
-        let file_to_trust = match args.opt(0)? {
-            Some(Value {
-                value: UntaggedValue::Primitive(Primitive::String(ref path)),
-                tag: _,
-            }) => {
-                let mut dir = nu_path::canonicalize(path)?;
-                dir.push(".nu-env");
-                dir
-            }
-            _ => {
-                let mut dir = nu_path::canonicalize(std::env::current_dir()?)?;
-                dir.push(".nu-env");
-                dir
-            }
-        };
-        let quiet = args.has_flag("quiet");
-
-        let content = std::fs::read(&file_to_trust)?;
-
-        let filename = file_to_trust.to_string_lossy().to_string();
-        let mut allowed = read_trusted()?;
-        allowed
-            .files
-            .insert(filename, Sha256::digest(&content).as_slice().to_vec());
-
-        let config_path = config::default_path_for(&Some(PathBuf::from("nu-env.toml")))?;
-        let tomlstr = toml::to_string(&allowed).map_err(|_| {
-            ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")
-        })?;
-        fs::write(config_path, tomlstr).expect("Couldn't write to toml file");
-
-        if quiet {
-            Ok(ActionStream::empty())
-        } else {
-            Ok(ActionStream::one(ReturnSuccess::value(
-                UntaggedValue::string(".nu-env trusted!").into_value(tag),
-            )))
-        }
-    }
-    fn is_binary(&self) -> bool {
-        false
-    }
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Allow .nu-env file in current directory",
-                example: "autoenv trust",
-                result: None,
-            },
-            Example {
-                description: "Allow .nu-env file in directory foo",
-                example: "autoenv trust foo",
-                result: None,
-            },
-        ]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/autoenv_untrust.rs b/old_nushell/crates/nu-command/src/commands/env/autoenv_untrust.rs
deleted file mode 100644
index 61e144805..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/autoenv_untrust.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::prelude::*;
-use nu_data::config::Trusted;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::SyntaxShape;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
-use std::io::Read;
-use std::{fs, path::PathBuf};
-pub struct AutoenvUntrust;
-
-impl WholeStreamCommand for AutoenvUntrust {
-    fn name(&self) -> &str {
-        "autoenv untrust"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("autoenv untrust")
-            .optional("dir", SyntaxShape::String, "Directory to disallow")
-            .switch("quiet", "Don't output success message", Some('q'))
-    }
-
-    fn usage(&self) -> &str {
-        "Untrust a .nu-env file in the current or given directory"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let file_to_untrust = match args.opt(0)? {
-            Some(Value {
-                value: UntaggedValue::Primitive(Primitive::String(ref path)),
-                tag: _,
-            }) => {
-                let mut dir = nu_path::canonicalize(path)?;
-                dir.push(".nu-env");
-                dir
-            }
-            _ => {
-                let mut dir = std::env::current_dir()?;
-                dir.push(".nu-env");
-                dir
-            }
-        };
-        let quiet = args.has_flag("quiet");
-
-        let config_path = config::default_path_for(&Some(PathBuf::from("nu-env.toml")))?;
-
-        let mut file = match std::fs::OpenOptions::new()
-            .read(true)
-            .create(true)
-            .write(true)
-            .open(config_path.clone())
-        {
-            Ok(p) => p,
-            Err(_) => {
-                return Err(ShellError::untagged_runtime_error(
-                    "Couldn't open nu-env.toml",
-                ));
-            }
-        };
-
-        let mut doc = String::new();
-        file.read_to_string(&mut doc)?;
-
-        let mut allowed: Trusted = toml::from_str(&doc).unwrap_or_else(|_| Trusted::new());
-
-        let file_to_untrust = file_to_untrust.to_string_lossy().to_string();
-
-        if allowed.files.remove(&file_to_untrust).is_none() {
-            return
-                Err(ShellError::untagged_runtime_error(
-                    "No .nu-env file to untrust in the given directory. Is it missing, or already untrusted?",
-                ));
-        }
-
-        let tomlstr = toml::to_string(&allowed).map_err(|_| {
-            ShellError::untagged_runtime_error("Couldn't serialize allowed dirs to nu-env.toml")
-        })?;
-        fs::write(config_path, tomlstr).expect("Couldn't write to toml file");
-
-        if quiet {
-            Ok(ActionStream::empty())
-        } else {
-            Ok(ActionStream::one(ReturnSuccess::value(
-                UntaggedValue::string(".nu-env untrusted!").into_value(tag),
-            )))
-        }
-    }
-    fn is_binary(&self) -> bool {
-        false
-    }
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Disallow .nu-env file in current directory",
-                example: "autoenv untrust",
-                result: None,
-            },
-            Example {
-                description: "Disallow .nu-env file in directory foo",
-                example: "autoenv untrust foo",
-                result: None,
-            },
-        ]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/let_env.rs b/old_nushell/crates/nu-command/src/commands/env/let_env.rs
deleted file mode 100644
index 30885a92e..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/let_env.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use std::convert::TryInto;
-
-use crate::prelude::*;
-use nu_engine::{evaluate_baseline_expr, EnvVar, WholeStreamCommand};
-
-use nu_errors::ShellError;
-use nu_protocol::{hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape};
-use nu_source::Tagged;
-
-pub struct LetEnv;
-
-#[derive(Deserialize)]
-pub struct LetEnvArgs {
-    pub name: Tagged<String>,
-    pub equals: Tagged<String>,
-    pub rhs: CapturedBlock,
-}
-
-impl WholeStreamCommand for LetEnv {
-    fn name(&self) -> &str {
-        "let-env"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("let-env")
-            .required(
-                "name",
-                SyntaxShape::String,
-                "the name of the environment variable",
-            )
-            .required("equals", SyntaxShape::String, "the equals sign")
-            .required(
-                "expr",
-                SyntaxShape::MathExpression,
-                "the value for the environment variable",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Create an environment variable and give it a value."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        set_env(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![]
-    }
-}
-
-pub fn set_env(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let name: Tagged<String> = args.req(0)?;
-    let rhs: CapturedBlock = args.req(2)?;
-
-    let (expr, captured) = {
-        if rhs.block.block.len() != 1 {
-            return Err(ShellError::labeled_error(
-                "Expected a value",
-                "expected a value",
-                tag,
-            ));
-        }
-        match rhs.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => (expr.clone(), rhs.captured.clone()),
-                _ => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a value",
-                        "expected a value",
-                        tag,
-                    ));
-                }
-            },
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Expected a value",
-                    "expected a value",
-                    tag,
-                ));
-            }
-        }
-    };
-
-    ctx.scope.enter_scope();
-    ctx.scope.add_vars(&captured.entries);
-
-    let value = evaluate_baseline_expr(&expr, ctx);
-
-    ctx.scope.exit_scope();
-
-    let value: EnvVar = value?.try_into()?;
-    let name = name.item;
-
-    // Note: this is a special case for setting the context from a command
-    // In this case, if we don't set it now, we'll lose the scope that this
-    // variable should be set into.
-    ctx.scope.add_env_var(name, value);
-
-    Ok(ActionStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/load_env.rs b/old_nushell/crates/nu-command/src/commands/env/load_env.rs
deleted file mode 100644
index e7a4eb1e1..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/load_env.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use std::convert::TryInto;
-
-use crate::prelude::*;
-use nu_engine::{EnvVar, WholeStreamCommand};
-
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct LoadEnv;
-
-impl WholeStreamCommand for LoadEnv {
-    fn name(&self) -> &str {
-        "load-env"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("load-env").optional(
-            "environ",
-            SyntaxShape::Any,
-            "Optional environment table to load in. If not provided, will use the table provided on the input stream",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Set environment variables using a table stream"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        load_env(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Load variables from an input stream",
-                example: r#"echo [[name, value]; ["NAME", "JT"] ["AGE", "UNKNOWN"]] | load-env; echo $nu.env.NAME"#,
-                result: Some(vec![Value::from("JT")]),
-            },
-            Example {
-                description: "Load variables from an argument",
-                example: r#"load-env [[name, value]; ["NAME", "JT"] ["AGE", "UNKNOWN"]]; echo $nu.env.NAME"#,
-                result: Some(vec![Value::from("JT")]),
-            },
-            Example {
-                description: "Load variables from an argument and an input stream",
-                example: r#"echo [[name, value]; ["NAME", "JT"]] | load-env [[name, value]; ["VALUE", "FOO"]]; echo $nu.env.NAME $nu.env.VALUE"#,
-                result: Some(vec![Value::from("JT"), Value::from("UNKNOWN")]),
-            },
-        ]
-    }
-}
-
-fn load_env_from_table(
-    values: impl IntoIterator<Item = Value>,
-    ctx: &EvaluationContext,
-) -> Result<(), ShellError> {
-    for value in values {
-        let mut var_name = None;
-        let mut var_value = None;
-
-        let tag = value.tag();
-
-        for (key, value) in value.row_entries() {
-            if key == "name" {
-                var_name = Some(value);
-            } else if key == "value" {
-                var_value = Some(value);
-            }
-        }
-
-        match (var_name, var_value) {
-            (Some(name), Some(value)) => {
-                let env_var: EnvVar = value.try_into()?;
-                ctx.scope.add_env_var(name.as_string()?, env_var);
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    r#"Expected each row in the table to have a "name" and "value" field."#,
-                    r#"expected a "name" and "value" field"#,
-                    tag,
-                ))
-            }
-        }
-    }
-
-    Ok(())
-}
-
-pub fn load_env(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let ctx = &args.context;
-
-    if let Some(values) = args.opt::<Vec<Value>>(0)? {
-        load_env_from_table(values, ctx)?;
-    }
-
-    load_env_from_table(args.input, ctx)?;
-
-    Ok(ActionStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/mod.rs b/old_nushell/crates/nu-command/src/commands/env/mod.rs
deleted file mode 100644
index 26b343ac5..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-mod autoenv;
-mod autoenv_trust;
-mod autoenv_untrust;
-mod let_env;
-mod load_env;
-mod unlet_env;
-mod with_env;
-
-pub use autoenv::Autoenv;
-pub use autoenv_trust::AutoenvTrust;
-pub use autoenv_untrust::AutoenvUntrust;
-pub use let_env::LetEnv;
-pub use load_env::LoadEnv;
-pub use unlet_env::UnletEnv;
-pub use with_env::WithEnv;
diff --git a/old_nushell/crates/nu-command/src/commands/env/unlet_env.rs b/old_nushell/crates/nu-command/src/commands/env/unlet_env.rs
deleted file mode 100644
index d639f8803..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/unlet_env.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-
-pub struct UnletEnv;
-
-#[derive(Deserialize)]
-pub struct UnletEnvArgs {
-    pub name: Tagged<String>,
-}
-
-impl WholeStreamCommand for UnletEnv {
-    fn name(&self) -> &str {
-        "unlet-env"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("unlet-env").required(
-            "name",
-            SyntaxShape::String,
-            "the name of the environment variable",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Delete an environment variable."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        unlet_env(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Remove the environment variable named FOO.",
-            example: "unlet-env FOO",
-            result: None,
-        }]
-    }
-}
-
-pub fn unlet_env(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let ctx = &args.context;
-
-    let name: Tagged<String> = args.req(0)?;
-
-    if ctx.scope.remove_env_var(&name.item) == None {
-        return Err(ShellError::labeled_error(
-            "Not an environment variable. Run `echo $nu.env` to view the available variables.",
-            "not an environment variable",
-            name.span(),
-        ));
-    }
-
-    Ok(ActionStream::empty())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/env/with_env.rs b/old_nushell/crates/nu-command/src/commands/env/with_env.rs
deleted file mode 100644
index 4dc95326d..000000000
--- a/old_nushell/crates/nu-command/src/commands/env/with_env.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-use std::convert::TryInto;
-
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::EnvVar;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, Signature, SpannedTypeName, SyntaxShape, UntaggedValue, Value,
-};
-
-pub struct WithEnv;
-
-impl WholeStreamCommand for WithEnv {
-    fn name(&self) -> &str {
-        "with-env"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("with-env")
-            .required(
-                "variable",
-                SyntaxShape::Any,
-                "the environment variable to temporarily set",
-            )
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "the block to run once the variable is set",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a block with an environment variable set."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        with_env(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Set the MYENV environment variable",
-                example: r#"with-env [MYENV "my env value"] { echo $nu.env.MYENV }"#,
-                result: Some(vec![Value::from("my env value")]),
-            },
-            Example {
-                description: "Set by primitive value list",
-                example: r#"with-env [X Y W Z] { echo $nu.env.X $nu.env.W }"#,
-                result: Some(vec![Value::from("Y"), Value::from("Z")]),
-            },
-            Example {
-                description: "Set by single row table",
-                example: r#"with-env [[X W]; [Y Z]] { echo $nu.env.X $nu.env.W }"#,
-                result: Some(vec![Value::from("Y"), Value::from("Z")]),
-            },
-            Example {
-                description: "Set by row(e.g. `open x.json` or `from json`)",
-                example: r#"echo '{"X":"Y","W":"Z"}'|from json|with-env $it { echo $nu.env.X $nu.env.W }"#,
-                result: None,
-            },
-        ]
-    }
-}
-
-fn with_env(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let external_redirection = args.call_info.args.external_redirection;
-    let context = &args.context;
-    let variable: Value = args.req(0)?;
-    let block: CapturedBlock = args.req(1)?;
-
-    let mut env: IndexMap<String, EnvVar> = IndexMap::new();
-
-    match &variable.value {
-        UntaggedValue::Table(table) => {
-            if table.len() == 1 {
-                // single row([[X W]; [Y Z]])
-                for (k, v) in table[0].row_entries() {
-                    env.insert(k.clone(), v.try_into()?);
-                }
-            } else {
-                // primitive values([X Y W Z])
-                for row in table.chunks(2) {
-                    if row.len() == 2 && row[0].is_primitive() && row[1].is_primitive() {
-                        env.insert(row[0].convert_to_string(), (&row[1]).try_into()?);
-                    }
-                }
-            }
-        }
-        // when get object by `open x.json` or `from json`
-        UntaggedValue::Row(row) => {
-            for (k, v) in &row.entries {
-                env.insert(k.clone(), v.try_into()?);
-            }
-        }
-        _ => {
-            return Err(ShellError::type_error(
-                "string list or single row",
-                variable.spanned_type_name(),
-            ));
-        }
-    };
-
-    context.scope.enter_scope();
-    context.scope.add_env(env);
-    context.scope.add_vars(&block.captured.entries);
-
-    let result = run_block(&block.block, context, args.input, external_redirection);
-    context.scope.exit_scope();
-
-    result.map(|x| x.into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::WithEnv;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(WithEnv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/cd.rs b/old_nushell/crates/nu-command/src/commands/filesystem/cd.rs
deleted file mode 100644
index f6c29130e..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/cd.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-
-use nu_engine::shell::CdArgs;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Cd;
-
-impl WholeStreamCommand for Cd {
-    fn name(&self) -> &str {
-        "cd"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("cd").optional(
-            "directory",
-            SyntaxShape::FilePath,
-            "the directory to change to",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Change to a new path."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let name = args.call_info.name_tag.clone();
-        let shell_manager = args.shell_manager();
-        let args = CdArgs { path: args.opt(0)? };
-
-        shell_manager.cd(args, name)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Change to a new directory called 'dirname'",
-                example: "cd dirname",
-                result: None,
-            },
-            Example {
-                description: "Change to your home directory",
-                example: "cd",
-                result: None,
-            },
-            Example {
-                description: "Change to your home directory (alternate version)",
-                example: "cd ~",
-                result: None,
-            },
-            Example {
-                description: "Change to the previous directory",
-                example: "cd -",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Cd;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Cd {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/cp.rs b/old_nushell/crates/nu-command/src/commands/filesystem/cp.rs
deleted file mode 100644
index 6794424e2..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/cp.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{shell::CopyArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Cpy;
-
-impl WholeStreamCommand for Cpy {
-    fn name(&self) -> &str {
-        "cp"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("cp")
-            .required("src", SyntaxShape::GlobPattern, "the place to copy from")
-            .required("dst", SyntaxShape::FilePath, "the place to copy to")
-            .switch(
-                "recursive",
-                "copy recursively through subdirectories",
-                Some('r'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Copy files."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let shell_manager = args.shell_manager();
-        let name = args.call_info.name_tag.clone();
-
-        let args = CopyArgs {
-            src: args.req(0)?,
-            dst: args.req(1)?,
-            recursive: args.has_flag("recursive"),
-        };
-        shell_manager.cp(args, name)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Copy myfile to dir_b",
-                example: "cp myfile dir_b",
-                result: None,
-            },
-            Example {
-                description: "Recursively copy dir_a to dir_b",
-                example: "cp -r dir_a dir_b",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Cpy;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Cpy {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/ls.rs b/old_nushell/crates/nu-command/src/commands/filesystem/ls.rs
deleted file mode 100644
index 23ac1e659..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/ls.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{shell::LsArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Ls;
-
-impl WholeStreamCommand for Ls {
-    fn name(&self) -> &str {
-        "ls"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ls")
-            .optional(
-                "path",
-                SyntaxShape::GlobPattern,
-                "a path to get the directory contents from",
-            )
-            .switch("all", "Show hidden files", Some('a'))
-            .switch(
-                "long",
-                "List all available columns for each entry",
-                Some('l'),
-            )
-            .switch(
-                "short-names",
-                "Only print the file names and not the path",
-                Some('s'),
-            )
-            .switch(
-                "du",
-                "Display the apparent directory size in place of the directory metadata size",
-                Some('d'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "View the contents of the current or given path."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let name = args.call_info.name_tag.clone();
-        let ctrl_c = args.ctrl_c();
-        let shell_manager = args.shell_manager();
-
-        let args = LsArgs {
-            path: args.opt(0)?,
-            all: args.has_flag("all"),
-            long: args.has_flag("long"),
-            short_names: args.has_flag("short-names"),
-            du: args.has_flag("du"),
-        };
-
-        shell_manager.ls(args, name, ctrl_c)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "List all files in the current directory",
-                example: "ls",
-                result: None,
-            },
-            Example {
-                description: "List all files in a subdirectory",
-                example: "ls subdir",
-                result: None,
-            },
-            Example {
-                description: "List all rust files",
-                example: "ls *.rs",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Ls;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Ls {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/mkdir.rs b/old_nushell/crates/nu-command/src/commands/filesystem/mkdir.rs
deleted file mode 100644
index 42950454e..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/mkdir.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{shell::MkdirArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-pub struct Mkdir;
-
-impl WholeStreamCommand for Mkdir {
-    fn name(&self) -> &str {
-        "mkdir"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("mkdir")
-            .rest(
-                "rest",
-                SyntaxShape::FilePath,
-                "the name(s) of the path(s) to create",
-            )
-            .switch("show-created-paths", "show the path(s) created.", Some('s'))
-    }
-
-    fn usage(&self) -> &str {
-        "Make directories, creates intermediary directories as required."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        mkdir(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Make a directory named foo",
-            example: "mkdir foo",
-            result: None,
-        }]
-    }
-}
-
-fn mkdir(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let shell_manager = args.shell_manager();
-
-    let args = MkdirArgs {
-        rest: args.rest(0)?,
-        show_created_paths: args.has_flag("show-created-paths"),
-    };
-
-    shell_manager.mkdir(args, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Mkdir;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Mkdir {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/mod.rs b/old_nushell/crates/nu-command/src/commands/filesystem/mod.rs
deleted file mode 100644
index f8eb69d6f..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-mod cd;
-mod cp;
-mod ls;
-mod mkdir;
-mod mv;
-pub(crate) mod open;
-mod rm;
-mod save;
-mod touch;
-
-pub use cd::Cd;
-pub use cp::Cpy;
-pub use ls::Ls;
-pub use mkdir::Mkdir;
-pub use mv::Mv;
-pub use open::Open;
-pub use rm::Remove;
-pub use save::Save;
-pub use touch::Touch;
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/mv.rs b/old_nushell/crates/nu-command/src/commands/filesystem/mv.rs
deleted file mode 100644
index b38178d13..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/mv.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{shell::MvArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-pub struct Mv;
-
-impl WholeStreamCommand for Mv {
-    fn name(&self) -> &str {
-        "mv"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("mv")
-            .required(
-                "source",
-                SyntaxShape::GlobPattern,
-                "the location to move files/directories from",
-            )
-            .required(
-                "destination",
-                SyntaxShape::FilePath,
-                "the location to move files/directories to",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Move files or directories."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        mv(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Rename a file",
-                example: "mv before.txt after.txt",
-                result: None,
-            },
-            Example {
-                description: "Move a file into a directory",
-                example: "mv test.txt my/subdirectory",
-                result: None,
-            },
-            Example {
-                description: "Move many files into a directory",
-                example: "mv *.txt my/subdirectory",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn mv(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let shell_manager = args.shell_manager();
-
-    let args = MvArgs {
-        src: args.req(0)?,
-        dst: args.req(1)?,
-    };
-
-    shell_manager.mv(args, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Mv;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Mv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/open.rs b/old_nushell/crates/nu-command/src/commands/filesystem/open.rs
deleted file mode 100644
index d8ddbcfb2..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/open.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-use crate::commands::viewers::BAT_LANGUAGES;
-use crate::prelude::*;
-use encoding_rs::{Encoding, UTF_8};
-
-use log::debug;
-use nu_engine::StringOrBinary;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_path::canonicalize;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::{AnchorLocation, Span, Tagged};
-use std::path::{Path, PathBuf};
-
-pub struct Open;
-
-impl WholeStreamCommand for Open {
-    fn name(&self) -> &str {
-        "open"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "path",
-                SyntaxShape::FilePath,
-                "the file path to load values from",
-            )
-            .switch(
-                "raw",
-                "load content as a string instead of a table",
-                Some('r'),
-            )
-            .named(
-                "encoding",
-                SyntaxShape::String,
-                "encoding to use to open file",
-                Some('e'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Load a file into a cell, convert to table if possible (avoid by appending '--raw')."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Multiple encodings are supported for reading text files by using
-the '--encoding <encoding>' parameter. Here is an example of a few:
-big5, euc-jp, euc-kr, gbk, iso-8859-1, utf-16, cp1252, latin5
-
-For a more complete list of encodings please refer to the encoding_rs
-documentation link at https://docs.rs/encoding_rs/0.8.28/encoding_rs/#statics"#
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        open(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Opens \"users.csv\" and creates a table from the data",
-                example: "open users.csv",
-                result: None,
-            },
-            Example {
-                description: "Opens file with iso-8859-1 encoding",
-                example: "open file.csv --encoding iso-8859-1 | from csv",
-                result: None,
-            },
-            Example {
-                description: "Lists the contents of a directory (identical to `ls ../projectB`)",
-                example: "open ../projectB",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn get_encoding(opt: Option<Tagged<String>>) -> Result<&'static Encoding, ShellError> {
-    match opt {
-        None => Ok(UTF_8),
-        Some(label) => match Encoding::for_label((&label.item).as_bytes()) {
-            None => Err(ShellError::labeled_error(
-                format!(
-                    r#"{} is not a valid encoding, refer to https://docs.rs/encoding_rs/0.8.23/encoding_rs/#statics for a valid list of encodings"#,
-                    label.item
-                ),
-                "invalid encoding",
-                label.span(),
-            )),
-            Some(encoding) => Ok(encoding),
-        },
-    }
-}
-
-fn open(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let scope = args.scope().clone();
-    let shell_manager = args.shell_manager();
-    let cwd = PathBuf::from(shell_manager.path());
-    let name = args.call_info.name_tag.clone();
-    let ctrl_c = args.ctrl_c();
-
-    let path: Tagged<PathBuf> = args.req(0)?;
-    let raw = args.has_flag("raw");
-    let encoding: Option<Tagged<String>> = args.get_flag("encoding")?;
-
-    if path.is_dir() {
-        let args = nu_engine::shell::LsArgs {
-            path: Some(path),
-            all: false,
-            long: false,
-            short_names: false,
-            du: false,
-        };
-        return shell_manager.ls(args, name, ctrl_c);
-    }
-
-    // TODO: Remove once Streams are supported everywhere!
-    // As a short term workaround for getting AutoConvert and Bat functionality (Those don't currently support Streams)
-
-    // Check if the extension has a "from *" command OR "bat" supports syntax highlighting
-    // AND the user doesn't want the raw output
-    // In these cases, we will collect the Stream
-    let ext = if raw {
-        None
-    } else {
-        path.extension()
-            .map(|name| name.to_string_lossy().to_string())
-    };
-
-    if let Some(ext) = ext {
-        // Check if we have a conversion command
-        if let Some(_command) = scope.get_command(&format!("from {}", ext)) {
-            let (_, tagged_contents) = crate::commands::open::fetch(
-                &cwd,
-                &PathBuf::from(&path.item),
-                path.tag.span,
-                encoding,
-            )?;
-            return Ok(ActionStream::one(ReturnSuccess::action(
-                CommandAction::AutoConvert(tagged_contents, ext),
-            )));
-        }
-        // Check if bat does syntax highlighting
-        if BAT_LANGUAGES.contains(&ext.as_ref()) {
-            let (_, tagged_contents) = crate::commands::open::fetch(
-                &cwd,
-                &PathBuf::from(&path.item),
-                path.tag.span,
-                encoding,
-            )?;
-            return Ok(ActionStream::one(ReturnSuccess::value(tagged_contents)));
-        }
-    }
-
-    // Normal Streaming operation
-    let with_encoding = if encoding.is_none() {
-        None
-    } else {
-        Some(get_encoding(encoding)?)
-    };
-
-    let sob_stream = shell_manager.open(&path.item, path.tag.span, with_encoding)?;
-
-    let final_stream = sob_stream.map(move |x| {
-        // The tag that will used when returning a Value
-        let file_tag = Tag {
-            span: path.tag.span,
-            anchor: Some(AnchorLocation::File(path.to_string_lossy().to_string())),
-        };
-
-        match x {
-            Ok(StringOrBinary::String(s)) => {
-                ReturnSuccess::value(UntaggedValue::string(s).into_value(file_tag))
-            }
-            Ok(StringOrBinary::Binary(b)) => {
-                ReturnSuccess::value(UntaggedValue::binary(b).into_value(file_tag))
-            }
-            Err(se) => Err(se),
-        }
-    });
-
-    Ok(ActionStream::new(final_stream))
-}
-
-// Note that we do not output a Stream in "fetch" since it is only used by "enter" command
-// Which we expect to use a concrete Value a not a Stream
-pub fn fetch(
-    cwd: &Path,
-    location: &Path,
-    span: Span,
-    encoding_choice: Option<Tagged<String>>,
-) -> Result<(Option<String>, Value), ShellError> {
-    // TODO: I don't understand the point of this? Maybe for better error reporting
-    let mut cwd = PathBuf::from(cwd);
-    cwd.push(location);
-    let nice_location = canonicalize(&cwd).map_err(|e| match e.kind() {
-        std::io::ErrorKind::NotFound => ShellError::labeled_error(
-            format!("Cannot find file {:?}", cwd),
-            "cannot find file",
-            span,
-        ),
-        std::io::ErrorKind::PermissionDenied => {
-            ShellError::labeled_error("Permission denied", "permission denied", span)
-        }
-        _ => ShellError::labeled_error(
-            format!("Cannot open file {:?} because {:?}", &cwd, e),
-            "Cannot open",
-            span,
-        ),
-    })?;
-
-    // The extension may be used in AutoConvert later on
-    let ext = location
-        .extension()
-        .map(|name| name.to_string_lossy().to_string());
-
-    // The tag that will used when returning a Value
-    let file_tag = Tag {
-        span,
-        anchor: Some(AnchorLocation::File(
-            nice_location.to_string_lossy().to_string(),
-        )),
-    };
-
-    let res = std::fs::read(location)
-        .map_err(|_| ShellError::labeled_error("Can't open filename given", "can't open", span))?;
-
-    // If no encoding is provided we try to guess the encoding to read the file with
-    let encoding = if encoding_choice.is_none() {
-        UTF_8
-    } else {
-        get_encoding(encoding_choice.clone())?
-    };
-
-    // If the user specified an encoding, then do not do BOM sniffing
-    let decoded_res = if encoding_choice.is_some() {
-        let (cow_res, _replacements) = encoding.decode_with_bom_removal(&res);
-        cow_res
-    } else {
-        // Otherwise, use the default UTF-8 encoder with BOM sniffing
-        let (cow_res, actual_encoding, replacements) = encoding.decode(&res);
-        // If we had to use replacement characters then fallback to binary
-        if replacements {
-            return Ok((ext, UntaggedValue::binary(res).into_value(file_tag)));
-        }
-        debug!("Decoded using {:?}", actual_encoding);
-        cow_res
-    };
-    let v = UntaggedValue::string(decoded_res.to_string()).into_value(file_tag);
-    Ok((ext, v))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Open;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Open {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/rm.rs b/old_nushell/crates/nu-command/src/commands/filesystem/rm.rs
deleted file mode 100644
index b45c839d4..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/rm.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use crate::prelude::*;
-use nu_engine::shell::RemoveArgs;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct Remove;
-
-impl WholeStreamCommand for Remove {
-    fn name(&self) -> &str {
-        "rm"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("rm")
-            .switch(
-                "trash",
-                "use the platform's recycle bin instead of permanently deleting",
-                Some('t'),
-            )
-            .switch(
-                "permanent",
-                "don't use recycle bin, delete permanently",
-                Some('p'),
-            )
-            .switch("recursive", "delete subdirectories recursively", Some('r'))
-            .switch("force", "suppress error when no file", Some('f'))
-            .rest(
-                "rest",
-                SyntaxShape::GlobPattern,
-                "the file path(s) to remove",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Remove file(s)."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        rm(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Delete or move a file to the system trash (depending on 'rm_always_trash' config option)",
-                example: "rm file.txt",
-                result: None,
-            },
-            Example {
-                description: "Move a file to the system trash",
-                example: "rm --trash file.txt",
-                result: None,
-            },
-            Example {
-                description: "Delete a file permanently",
-                example: "rm --permanent file.txt",
-                result: None,
-            },
-            Example {
-                description: "Delete a file, and suppress errors if no file is found",
-                example: "rm --force file.txt",
-                result: None,
-            }
-        ]
-    }
-}
-
-fn rm(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let shell_manager = args.shell_manager();
-
-    let mut rm_args = RemoveArgs {
-        rest: args.rest(0)?,
-        recursive: args.has_flag("recursive"),
-        trash: args.has_flag("trash"),
-        permanent: args.has_flag("permanent"),
-        force: args.has_flag("force"),
-    };
-
-    if rm_args.trash && rm_args.permanent {
-        return Ok(ActionStream::one(Err(ShellError::labeled_error(
-            "only one of --permanent and --trash can be used",
-            "conflicting flags",
-            name,
-        ))));
-    }
-
-    if rm_args.rest.is_empty() {
-        let mut input_peek = args.input.peekable();
-        while let Some(v) = &input_peek.next() {
-            if let UntaggedValue::Primitive(Primitive::FilePath(path)) = &v.value {
-                rm_args.rest.push(Tagged {
-                    item: path.to_path_buf(),
-                    tag: args.call_info.name_tag.clone(),
-                })
-            };
-        }
-    }
-
-    shell_manager.rm(rm_args, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Remove;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Remove {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/save.rs b/old_nushell/crates/nu-command/src/commands/filesystem/save.rs
deleted file mode 100644
index 5f342683d..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/save.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{UnevaluatedCallInfo, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::ExternalRedirection, Primitive, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-use std::path::{Path, PathBuf};
-
-pub struct Save;
-
-macro_rules! process_unknown {
-    ($scope:tt, $input:ident, $name_tag:ident) => {{
-        if $input.len() > 0 {
-            match $input[0] {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::Binary(_)),
-                    ..
-                } => process_binary!($scope, $input, $name_tag),
-                _ => process_string!($scope, $input, $name_tag),
-            }
-        } else {
-            process_string!($scope, $input, $name_tag)
-        }
-    }};
-}
-
-macro_rules! process_string {
-    ($scope:tt, $input:ident, $name_tag:ident) => {{
-        let mut result_string = String::new();
-        for res in $input {
-            match res {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    ..
-                } => {
-                    result_string.push_str(&s);
-                }
-                _ => {
-                    break $scope Err(ShellError::labeled_error(
-                        "Save requires string data",
-                        "consider converting data to string (see `help commands`)",
-                        $name_tag,
-                    ));
-                }
-            }
-        }
-        Ok(result_string.into_bytes())
-    }};
-}
-
-macro_rules! process_binary {
-    ($scope:tt, $input:ident, $name_tag:ident) => {{
-        let mut result_binary: Vec<u8> = Vec::new();
-        for res in $input {
-            match res {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                    ..
-                } => {
-                    for u in b.into_iter() {
-                        result_binary.push(u);
-                    }
-                }
-                _ => {
-                    break $scope Err(ShellError::labeled_error(
-                        "Save could not successfully save",
-                        "unexpected data during binary save",
-                        $name_tag,
-                    ));
-                }
-            }
-        }
-        Ok(result_binary)
-    }};
-}
-
-macro_rules! process_string_return_success {
-    ($scope:tt, $result_vec:ident, $name_tag:ident) => {{
-        let mut result_string = String::new();
-        for res in $result_vec {
-            match res {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    ..
-                } => {
-                    result_string.push_str(&s);
-                }
-                _ => {
-                    break $scope Err(ShellError::labeled_error(
-                        "Save could not successfully save",
-                        "unexpected data during text save",
-                        $name_tag,
-                    ));
-                }
-            }
-        }
-        Ok(result_string.into_bytes())
-    }};
-}
-
-macro_rules! process_binary_return_success {
-    ($scope:tt, $result_vec:ident, $name_tag:ident) => {{
-        let mut result_binary: Vec<u8> = Vec::new();
-        for res in $result_vec {
-            match res {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                    ..
-                } => {
-                    for u in b.into_iter() {
-                        result_binary.push(u);
-                    }
-                }
-                _ => {
-                    break $scope Err(ShellError::labeled_error(
-                        "Save could not successfully save",
-                        "unexpected data during binary save",
-                        $name_tag,
-                    ));
-                }
-            }
-        }
-        Ok(result_binary)
-    }};
-}
-
-impl WholeStreamCommand for Save {
-    fn name(&self) -> &str {
-        "save"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("save")
-            .optional(
-                "path",
-                SyntaxShape::FilePath,
-                "the path to save contents to",
-            )
-            .switch(
-                "raw",
-                "treat values as-is rather than auto-converting based on file extension",
-                Some('r'),
-            )
-            .switch("append", "append values rather than overriding", Some('a'))
-    }
-
-    fn usage(&self) -> &str {
-        "Save the contents of the pipeline to a file."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        save(args)
-    }
-}
-
-fn save(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let shell_manager = args.shell_manager();
-    let mut full_path = PathBuf::from(shell_manager.path());
-    let name_tag = args.call_info.name_tag.clone();
-    let name = args.call_info.name_tag.clone();
-    let context = args.context.clone();
-    let scope = args.scope().clone();
-
-    let head = args.call_info.args.head.clone();
-
-    let path: Option<Tagged<PathBuf>> = args.opt(0)?;
-    let save_raw = args.has_flag("raw");
-    let append = args.has_flag("append");
-
-    let input: Vec<Value> = args.input.collect();
-    if path.is_none() {
-        let mut should_return_file_path_error = true;
-
-        // If there is no filename, check the metadata for the anchor filename
-        if !input.is_empty() {
-            let anchor = input[0].tag.anchor();
-
-            if let Some(AnchorLocation::File(file)) = anchor {
-                should_return_file_path_error = false;
-                full_path.push(Path::new(&file));
-            }
-        }
-
-        if should_return_file_path_error {
-            return Err(ShellError::labeled_error(
-                "Save requires a filepath",
-                "needs path",
-                name_tag,
-            ));
-        }
-    } else if let Some(file) = path {
-        full_path.push(file.item());
-    }
-
-    // TODO use label_break_value once it is stable:
-    // https://github.com/rust-lang/rust/issues/48594
-    #[allow(clippy::never_loop)]
-    let content: Result<Vec<u8>, ShellError> = 'scope: loop {
-        break if !save_raw {
-            if let Some(extension) = full_path.extension() {
-                let command_name = format!("to {}", extension.to_string_lossy());
-                if let Some(converter) = scope.get_command(&command_name) {
-                    let new_args = CommandArgs {
-                        context,
-                        call_info: UnevaluatedCallInfo {
-                            args: nu_protocol::hir::Call {
-                                head,
-                                positional: None,
-                                named: None,
-                                span: Span::unknown(),
-                                external_redirection: ExternalRedirection::Stdout,
-                            },
-                            name_tag: name_tag.clone(),
-                        },
-                        input: InputStream::from_stream(input.into_iter()),
-                    };
-                    let mut result = converter.run(new_args)?;
-                    let result_vec: Vec<Value> = result.drain_vec();
-                    if converter.is_binary() {
-                        process_binary_return_success!('scope, result_vec, name_tag)
-                    } else {
-                        process_string_return_success!('scope, result_vec, name_tag)
-                    }
-                } else {
-                    process_unknown!('scope, input, name_tag)
-                }
-            } else {
-                process_unknown!('scope, input, name_tag)
-            }
-        } else {
-            Ok(string_from(&input).into_bytes())
-        };
-    };
-
-    shell_manager.save(&full_path, &content?, name.span, append)
-}
-
-fn string_from(input: &[Value]) -> String {
-    let mut save_data = String::new();
-
-    if !input.is_empty() {
-        let mut first = true;
-        for i in input {
-            if !first {
-                save_data.push('\n');
-            } else {
-                first = false;
-            }
-            if let Ok(data) = &i.as_string() {
-                save_data.push_str(data);
-            }
-        }
-    }
-
-    save_data
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Save;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Save {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filesystem/touch.rs b/old_nushell/crates/nu-command/src/commands/filesystem/touch.rs
deleted file mode 100644
index 6b2907f48..000000000
--- a/old_nushell/crates/nu-command/src/commands/filesystem/touch.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-use std::fs::OpenOptions;
-use std::path::PathBuf;
-
-pub struct Touch;
-
-impl WholeStreamCommand for Touch {
-    fn name(&self) -> &str {
-        "touch"
-    }
-    fn signature(&self) -> Signature {
-        Signature::build("touch")
-            .required(
-                "filename",
-                SyntaxShape::FilePath,
-                "the path of the file you want to create",
-            )
-            .rest("rest", SyntaxShape::FilePath, "additional files to create")
-    }
-    fn usage(&self) -> &str {
-        "Creates one or more files."
-    }
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        touch(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Creates \"fixture.json\"",
-                example: "touch fixture.json",
-                result: None,
-            },
-            Example {
-                description: "Creates files a, b and c",
-                example: "touch a b c",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn touch(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let target: Tagged<PathBuf> = args.req(0)?;
-    let rest: Vec<Tagged<PathBuf>> = args.rest(1)?;
-
-    for item in vec![target].into_iter().chain(rest) {
-        match OpenOptions::new().write(true).create(true).open(&item) {
-            Ok(_) => continue,
-            Err(err) => {
-                return Err(ShellError::labeled_error(
-                    "File Error",
-                    err.to_string(),
-                    &item.tag,
-                ))
-            }
-        }
-    }
-
-    Ok(ActionStream::empty())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Touch;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Touch {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/all.rs b/old_nushell/crates/nu-command/src/commands/filters/all.rs
deleted file mode 100644
index 81e104196..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/all.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
-};
-
-pub struct Command;
-
-struct AllArgs {
-    predicate: CapturedBlock,
-}
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "all?"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("all?").required(
-            "condition",
-            SyntaxShape::RowCondition,
-            "the condition that must match",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Find if the table rows matches the condition."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        all(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        use nu_protocol::Value;
-
-        vec![
-            Example {
-                description: "Find if services are running",
-                example: "echo [[status]; [UP] [UP]] | all? status == UP",
-                result: Some(vec![Value::from(true)]),
-            },
-            Example {
-                description: "Check that all values are even",
-                example: "echo [2 4 6 8] | all? ($it mod 2) == 0",
-                result: Some(vec![Value::from(true)]),
-            },
-        ]
-    }
-}
-
-fn all(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-    let tag = args.call_info.name_tag.clone();
-    let all_args = AllArgs {
-        predicate: args.req(0)?,
-    };
-
-    let err = Err(ShellError::labeled_error(
-        "Expected a condition",
-        "expected a condition",
-        args.call_info.name_tag.clone(),
-    ));
-
-    //This seems a little odd. Can't we have predicates with pipelines/multiple statements?
-    let condition = {
-        if all_args.predicate.block.block.len() != 1 {
-            return err;
-        }
-        match all_args.predicate.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                _ => {
-                    return err;
-                }
-            },
-            None => {
-                return err;
-            }
-        }
-    };
-
-    let scope = args.scope().clone();
-
-    let init = Ok(InputStream::one(
-        UntaggedValue::boolean(true).into_value(&tag),
-    ));
-
-    // Variables in nu are immutable. Having the same variable across invocations
-    // of evaluate_baseline_expr does not mutate the variables and those each
-    // invocations are independent of each other!
-    scope.enter_scope();
-    scope.add_vars(&all_args.predicate.captured.entries);
-    let result = args.input.fold(init, move |acc, row| {
-        let condition = condition.clone();
-        let ctx = ctx.clone();
-        if let Some(positional) = all_args.predicate.block.params.positional.get(0) {
-            ctx.scope.add_var(positional.0.name(), row);
-        } else {
-            ctx.scope.add_var("$it", row);
-        }
-
-        let condition = evaluate_baseline_expr(&condition, &ctx);
-
-        let curr = acc?.drain_vec();
-        let curr = curr
-            .get(0)
-            .ok_or_else(|| ShellError::unexpected("No value to check with"))?;
-        let cond = curr.as_bool()?;
-
-        match condition {
-            Ok(condition) => match condition.as_bool() {
-                Ok(b) => Ok(InputStream::one(
-                    UntaggedValue::boolean(cond && b).into_value(&curr.tag),
-                )),
-                Err(e) => Err(e),
-            },
-            Err(e) => Err(e),
-        }
-    });
-    scope.exit_scope();
-
-    Ok(result?.into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/any.rs b/old_nushell/crates/nu-command/src/commands/filters/any.rs
deleted file mode 100644
index ddcad4f16..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/any.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ClassifiedCommand, Signature, SyntaxShape, UntaggedValue,
-};
-
-pub struct Command;
-
-struct AnyArgs {
-    predicate: CapturedBlock,
-}
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "any?"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("any?").required(
-            "condition",
-            SyntaxShape::RowCondition,
-            "the condition that must match",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Find if the table rows matches the condition."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        any(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        use nu_protocol::Value;
-
-        vec![
-            Example {
-                description: "Find if a service is not running",
-                example: "echo [[status]; [UP] [DOWN] [UP]] | any? status == DOWN",
-                result: Some(vec![Value::from(true)]),
-            },
-            Example {
-                description: "Check if any of the values is odd",
-                example: "echo [2 4 1 6 8] | any? ($it mod 2) == 1",
-                result: Some(vec![Value::from(true)]),
-            },
-        ]
-    }
-}
-
-fn any(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-    let tag = args.call_info.name_tag.clone();
-    let any_args = AnyArgs {
-        predicate: args.req(0)?,
-    };
-
-    let err = Err(ShellError::labeled_error(
-        "Expected a condition",
-        "expected a condition",
-        args.call_info.name_tag.clone(),
-    ));
-
-    //This seems a little odd. Can't we have predicates with pipelines/multiple statements?
-    let condition = {
-        if any_args.predicate.block.block.len() != 1 {
-            return err;
-        }
-        match any_args.predicate.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                _ => {
-                    return err;
-                }
-            },
-            None => {
-                return err;
-            }
-        }
-    };
-
-    let scope = args.scope().clone();
-
-    let init = Ok(InputStream::one(
-        UntaggedValue::boolean(false).into_value(&tag),
-    ));
-
-    // Variables in nu are immutable. Having the same variable across invocations
-    // of evaluate_baseline_expr does not mutate the variables and thus each
-    // invocations are independent of each other!
-    scope.enter_scope();
-    scope.add_vars(&any_args.predicate.captured.entries);
-
-    let result = args.input.fold(init, move |acc, row| {
-        let condition = condition.clone();
-        let ctx = ctx.clone();
-        if let Some((arg, _)) = any_args.predicate.block.params.positional.first() {
-            ctx.scope.add_var(arg.name(), row);
-        }
-
-        let condition = evaluate_baseline_expr(&condition, &ctx);
-
-        let curr = acc?.drain_vec();
-        let curr = curr
-            .get(0)
-            .ok_or_else(|| ShellError::unexpected("No value to check with"))?;
-        let cond = curr.as_bool()?;
-
-        match condition {
-            Ok(condition) => match condition.as_bool() {
-                Ok(b) => Ok(InputStream::one(
-                    UntaggedValue::boolean(cond || b).into_value(&curr.tag),
-                )),
-                Err(e) => Err(e),
-            },
-            Err(e) => Err(e),
-        }
-    });
-    scope.exit_scope();
-
-    Ok(result?.into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/append.rs b/old_nushell/crates/nu-command/src/commands/filters/append.rs
deleted file mode 100644
index f43a4f565..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/append.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "append"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("append").required(
-            "row value",
-            SyntaxShape::Any,
-            "the value of the row to append to the table",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Append a row to the table."
-    }
-
-    fn run(&self, mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let mut value: Value = args.req(0)?;
-
-        let mut prepend = vec![];
-
-        if let Some(first) = args.input.next() {
-            value.tag = first.tag();
-            prepend.push(first);
-        }
-
-        // Checks if we are trying to append a row literal
-        if let Value {
-            value: UntaggedValue::Table(values),
-            tag,
-        } = &value
-        {
-            if values.len() == 1 && values[0].is_row() {
-                value = values[0].value.clone().into_value(tag);
-            }
-        }
-
-        Ok(prepend
-            .into_iter()
-            .chain(args.input.into_iter().chain([value]))
-            .into_output_stream())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Add values to the end of the table",
-                example: "echo [1 2 3] | append 4",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-            Example {
-                description: "Add row value to the end of the table",
-                example: "echo [[country]; [Ecuador] ['New Zealand']] | append [[country]; [USA]]",
-                result: Some(vec![
-                    row! { "country".into() => Value::from("Ecuador")},
-                    row! { "country".into() => Value::from("New Zealand")},
-                    row! { "country".into() => Value::from("USA")},
-                ]),
-            },
-        ]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/collect.rs b/old_nushell/crates/nu-command/src/commands/filters/collect.rs
deleted file mode 100644
index 10b4a3e15..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/collect.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{hir::CapturedBlock, Signature, SyntaxShape, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "collect"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("collect").required(
-            "block",
-            SyntaxShape::Block,
-            "the block to run once the stream is collected",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Collect the stream and pass it to a block."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        collect(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Use the second value in the stream",
-            example: "echo 1 2 3 | collect { |x| echo $x.1 }",
-            result: Some(vec![UntaggedValue::int(2).into()]),
-        }]
-    }
-}
-
-fn collect(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let external_redirection = args.call_info.args.external_redirection;
-    let context = &args.context;
-    let tag = args.call_info.name_tag.clone();
-    let block: CapturedBlock = args.req(0)?;
-    let mut input = args.input;
-    let param = if !block.block.params.positional.is_empty() {
-        block.block.params.positional[0].0.name()
-    } else {
-        "$it"
-    };
-
-    context.scope.enter_scope();
-
-    context.scope.add_vars(&block.captured.entries);
-    let mut input = input.drain_vec();
-    match input.len() {
-        x if x > 1 => {
-            context
-                .scope
-                .add_var(param, UntaggedValue::Table(input).into_value(tag));
-        }
-        1 => {
-            let item = input.swap_remove(0);
-            context.scope.add_var(param, item);
-        }
-        _ => {}
-    }
-
-    let result = run_block(
-        &block.block,
-        context,
-        InputStream::empty(),
-        external_redirection,
-    );
-    context.scope.exit_scope();
-
-    Ok(result?.into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/compact.rs b/old_nushell/crates/nu-command/src/commands/filters/compact.rs
deleted file mode 100644
index 814f569c7..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/compact.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::prelude::*;
-
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Compact;
-
-pub struct CompactArgs {
-    columns: Vec<Tagged<String>>,
-}
-
-impl WholeStreamCommand for Compact {
-    fn name(&self) -> &str {
-        "compact"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("compact").rest(
-            "rest",
-            SyntaxShape::Any,
-            "the columns to compact from the table",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a table with non-empty rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        compact(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Filter out all directory entries having no 'target'",
-            example: "ls -la | compact target",
-            result: None,
-        }]
-    }
-}
-
-pub fn compact(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let (args, input) = (
-        CompactArgs {
-            columns: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .filter(move |item| {
-            if args.columns.is_empty() {
-                !item.is_empty()
-            } else if let Value {
-                value: UntaggedValue::Row(ref r),
-                ..
-            } = item
-            {
-                args.columns
-                    .iter()
-                    .all(|field| r.get_data(field).borrow().is_some())
-            } else {
-                false
-            }
-        })
-        .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Compact;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Compact {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/default.rs b/old_nushell/crates/nu-command/src/commands/filters/default.rs
deleted file mode 100644
index 5778f8e5b..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/default.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use nu_value_ext::ValueExt;
-
-pub struct Default;
-
-impl WholeStreamCommand for Default {
-    fn name(&self) -> &str {
-        "default"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("default")
-            .required("column name", SyntaxShape::String, "the name of the column")
-            .required(
-                "column value",
-                SyntaxShape::Any,
-                "the value of the column to default",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Sets a default row's column if missing."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        default(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Give a default 'target' to all file entries",
-            example: "ls -la | default target 'nothing'",
-            result: None,
-        }]
-    }
-}
-
-fn default(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let column: Tagged<String> = args.req(0)?;
-    let value: Value = args.req(1)?;
-
-    let input = args.input;
-
-    Ok(input
-        .map(move |item| {
-            let should_add = matches!(
-                item,
-                Value {
-                    value: UntaggedValue::Row(ref r),
-                    ..
-                } if r.get_data(&column.item).borrow().is_none()
-            );
-
-            if should_add {
-                match item.insert_data_at_path(&column.item, value.clone()) {
-                    Some(new_value) => ReturnSuccess::value(new_value),
-                    None => ReturnSuccess::value(item),
-                }
-            } else {
-                ReturnSuccess::value(item)
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Default;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Default {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/drop/column.rs b/old_nushell/crates/nu-command/src/commands/filters/drop/column.rs
deleted file mode 100644
index 717f7acca..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/drop/column.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::select_fields;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "drop column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("drop column").optional(
-            "columns",
-            SyntaxShape::Number,
-            "starting from the end, the number of columns to remove",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Remove the last number of columns. If you want to remove columns by name, try 'reject'."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        drop(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        use nu_protocol::Value;
-
-        vec![Example {
-            description: "Remove the last column of a table",
-            example: "echo [[lib, extension]; [nu-lib, rs] [nu-core, rb]] | drop column",
-            result: Some(vec![
-                row! { "lib".into() => Value::from("nu-lib") },
-                row! { "lib".into() => Value::from("nu-core") },
-            ]),
-        }]
-    }
-}
-
-fn drop(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let columns: Option<Tagged<u64>> = args.opt(0)?;
-
-    let to_drop = if let Some(quantity) = columns {
-        *quantity as usize
-    } else {
-        1
-    };
-
-    Ok(args
-        .input
-        .map(move |item| {
-            let headers = item.data_descriptors();
-
-            let descs = match headers.len() {
-                0 => &headers[..],
-                n if to_drop > n => &[],
-                n => &headers[..n - to_drop],
-            };
-
-            Ok(select_fields(&item, descs, item.tag()))
-        })
-        .into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/drop/command.rs b/old_nushell/crates/nu-command/src/commands/filters/drop/command.rs
deleted file mode 100644
index e5d80626c..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/drop/command.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "drop"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("drop").optional(
-            "rows",
-            SyntaxShape::Number,
-            "starting from the back, the number of rows to remove",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Remove the last number of rows or columns."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        drop(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Remove the last item of a list/table",
-                example: "echo [1 2 3] | drop",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                ]),
-            },
-            Example {
-                description: "Remove the last 2 items of a list/table",
-                example: "echo [1 2 3] | drop 2",
-                result: Some(vec![UntaggedValue::int(1).into()]),
-            },
-        ]
-    }
-}
-
-fn drop(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let rows: Option<Tagged<u64>> = args.opt(0)?;
-    let v: Vec<_> = args.input.into_vec();
-
-    let rows_to_drop = if let Some(quantity) = rows {
-        *quantity as usize
-    } else {
-        1
-    };
-
-    Ok(if rows_to_drop == 0 {
-        v.into_iter().map(Ok).into_input_stream()
-    } else {
-        let k = if v.len() < rows_to_drop {
-            0
-        } else {
-            v.len() - rows_to_drop
-        };
-
-        let iter = v.into_iter().map(Ok).take(k);
-
-        iter.into_input_stream()
-    })
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/drop/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/drop/mod.rs
deleted file mode 100644
index 407d1c100..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/drop/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod column;
-mod command;
-mod nth;
-
-pub use column::SubCommand as DropColumn;
-pub use command::Command as Drop;
-pub use nth::SubCommand as DropNth;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/drop/nth.rs b/old_nushell/crates/nu-command/src/commands/filters/drop/nth.rs
deleted file mode 100644
index 9e5b461e8..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/drop/nth.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use crate::prelude::*;
-use itertools::Either;
-use nu_engine::{FromValue, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Range, Signature, SpannedTypeName, SyntaxShape, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "drop nth"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("drop nth")
-            .required(
-                "row number or row range",
-                // FIXME: we can make this accept either Int or Range when we can compose SyntaxShapes
-                SyntaxShape::Any,
-                "the number of the row to drop or a range to drop consecutive rows",
-            )
-            .rest(
-                "rest",
-                SyntaxShape::Any,
-                "Optionally drop more rows (Ignored if first argument is a range)",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Drops the selected rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        drop(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Drop the second row",
-                example: "echo [first second third] | drop nth 1",
-                result: Some(vec![Value::from("first"), Value::from("third")]),
-            },
-            Example {
-                description: "Drop the first and third rows",
-                example: "echo [first second third] | drop nth 0 2",
-                result: Some(vec![Value::from("second")]),
-            },
-            Example {
-                description: "Drop range rows from second to fourth",
-                example: "echo [first second third fourth fifth] | drop nth (1..3)",
-                result: Some(vec![Value::from("first"), Value::from("fifth")]),
-            },
-        ]
-    }
-}
-
-fn extract_int_or_range(args: &CommandArgs) -> Result<Either<u64, Range>, ShellError> {
-    let value = args.req::<Value>(0)?;
-
-    let int_opt = value.as_u64().map(Either::Left).ok();
-    let range_opt = FromValue::from_value(&value).map(Either::Right).ok();
-
-    int_opt
-        .or(range_opt)
-        .ok_or_else(|| ShellError::type_error("int or range", value.spanned_type_name()))
-}
-
-fn drop(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let number_or_range = extract_int_or_range(&args)?;
-    let rows = match number_or_range {
-        Either::Left(row_number) => {
-            let and_rows: Vec<Tagged<u64>> = args.rest(1)?;
-
-            let mut rows: Vec<_> = and_rows.into_iter().map(|x| x.item as usize).collect();
-            rows.push(row_number as usize);
-            rows.sort_unstable();
-            rows
-        }
-        Either::Right(row_range) => {
-            let from = row_range.min_u64()? as usize;
-            let to = row_range.max_u64()? as usize;
-
-            (from..=to).collect()
-        }
-    };
-
-    let input = args.input;
-
-    Ok(DropNthIterator {
-        input,
-        rows,
-        current: 0,
-    }
-    .into_output_stream())
-}
-
-struct DropNthIterator {
-    input: InputStream,
-    rows: Vec<usize>,
-    current: usize,
-}
-
-impl Iterator for DropNthIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        loop {
-            if let Some(row) = self.rows.get(0) {
-                if self.current == *row {
-                    self.rows.remove(0);
-                    self.current += 1;
-                    let _ = self.input.next();
-                    continue;
-                } else {
-                    self.current += 1;
-                    return self.input.next();
-                }
-            } else {
-                return self.input.next();
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/each/command.rs b/old_nushell/crates/nu-command/src/commands/filters/each/command.rs
deleted file mode 100644
index c3782233b..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/each/command.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ExternalRedirection},
-    Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value,
-};
-
-pub struct Each;
-
-impl WholeStreamCommand for Each {
-    fn name(&self) -> &str {
-        "each"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("each")
-            .required("block", SyntaxShape::Block, "the block to run on each row")
-            .switch(
-                "numbered",
-                "returned a numbered item ($it.index and $it.item)",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Run a block on each row of the table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        each(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Echo the sum of each row",
-                example: "echo [[1 2] [3 4]] | each { echo $it | math sum }",
-                result: None,
-            },
-            Example {
-                description: "Echo the square of each integer",
-                example: "echo [1 2 3] | each { echo ($it * $it) }",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(9).into(),
-                ]),
-            },
-            Example {
-                description: "Number each item and echo a message",
-                example:
-                    "echo ['bob' 'fred'] | each --numbered { echo $\"($it.index) is ($it.item)\" }",
-                result: Some(vec![Value::from("0 is bob"), Value::from("1 is fred")]),
-            },
-            Example {
-                description: "Name the block variable that each uses",
-                example: "[1, 2, 3] | each {|x| $x + 100}",
-                result: Some(vec![
-                    UntaggedValue::int(101).into(),
-                    UntaggedValue::int(102).into(),
-                    UntaggedValue::int(103).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-pub fn process_row(
-    captured_block: Arc<CapturedBlock>,
-    context: Arc<EvaluationContext>,
-    input: Value,
-    external_redirection: ExternalRedirection,
-) -> Result<OutputStream, ShellError> {
-    let input_clone = input.clone();
-    // When we process a row, we need to know whether the block wants to have the contents of the row as
-    // a parameter to the block (so it gets assigned to a variable that can be used inside the block) or
-    // if it wants the contents as as an input stream
-
-    let input_stream = if !captured_block.block.params.positional.is_empty() {
-        InputStream::empty()
-    } else {
-        vec![Ok(input_clone)].into_iter().into_input_stream()
-    };
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&captured_block.captured.entries);
-
-    if let Some((arg, _)) = captured_block.block.params.positional.first() {
-        context.scope.add_var(arg.name(), input);
-    } else {
-        context.scope.add_var("$it", input);
-    }
-
-    let result = run_block(
-        &captured_block.block,
-        &context,
-        input_stream,
-        external_redirection,
-    );
-
-    context.scope.exit_scope();
-
-    result
-}
-
-pub(crate) fn make_indexed_item(index: usize, item: Value) -> Value {
-    let mut dict = TaggedDictBuilder::new(item.tag());
-    dict.insert_untagged("index", UntaggedValue::int(index as i64));
-    dict.insert_value("item", item);
-
-    dict.into_value()
-}
-
-fn each(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let context = Arc::new(args.context.clone());
-    let external_redirection = args.call_info.args.external_redirection;
-
-    let block: CapturedBlock = args.req(0)?;
-    let numbered: bool = args.has_flag("numbered");
-
-    let block = Arc::new(block);
-
-    if numbered {
-        Ok(args
-            .input
-            .enumerate()
-            .flat_map(move |input| {
-                let block = block.clone();
-                let context = context.clone();
-                let row = make_indexed_item(input.0, input.1);
-
-                match process_row(block, context, row, external_redirection) {
-                    Ok(s) => s,
-                    Err(e) => OutputStream::one(Value::error(e)),
-                }
-            })
-            .into_output_stream())
-    } else {
-        Ok(args
-            .input
-            .flat_map(move |input| {
-                let block = block.clone();
-                let context = context.clone();
-
-                match process_row(block, context, input, external_redirection) {
-                    Ok(s) => s,
-                    Err(e) => OutputStream::one(Value::error(e)),
-                }
-            })
-            .into_output_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Each;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Each {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/each/group.rs b/old_nushell/crates/nu-command/src/commands/filters/each/group.rs
deleted file mode 100644
index 2d82b3f97..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/each/group.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use crate::commands::filters::each::process_row;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ExternalRedirection},
-    Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-pub struct EachGroup;
-
-impl WholeStreamCommand for EachGroup {
-    fn name(&self) -> &str {
-        "each group"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("each group")
-            .required("group_size", SyntaxShape::Int, "the size of each group")
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "the block to run on each group",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a block on groups of `group_size` rows of a table at a time."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Echo the sum of each pair",
-            example: "echo [1 2 3 4] | each group 2 { echo $it | math sum }",
-            result: None,
-        }]
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let context = Arc::new(args.context.clone());
-        let external_redirection = args.call_info.args.external_redirection;
-
-        let group_size: Tagged<usize> = args.req(0)?;
-        let block: CapturedBlock = args.req(1)?;
-        let block = Arc::new(block);
-
-        let each_group_iterator = EachGroupIterator {
-            block,
-            context,
-            group_size: group_size.item,
-            input: args.input,
-            external_redirection,
-        };
-
-        Ok(each_group_iterator.flatten().map(Ok).into_input_stream())
-    }
-}
-
-struct EachGroupIterator {
-    block: Arc<CapturedBlock>,
-    context: Arc<EvaluationContext>,
-    group_size: usize,
-    input: InputStream,
-    external_redirection: ExternalRedirection,
-}
-
-impl Iterator for EachGroupIterator {
-    type Item = OutputStream;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut group = vec![];
-        let mut current_count = 0;
-
-        for next in &mut self.input {
-            group.push(next);
-
-            current_count += 1;
-            if current_count >= self.group_size {
-                break;
-            }
-        }
-
-        if group.is_empty() {
-            return None;
-        }
-
-        Some(run_block_on_vec(
-            group,
-            self.block.clone(),
-            self.context.clone(),
-            self.external_redirection,
-        ))
-    }
-}
-
-pub(crate) fn run_block_on_vec(
-    input: Vec<Value>,
-    block: Arc<CapturedBlock>,
-    context: Arc<EvaluationContext>,
-    external_redirection: ExternalRedirection,
-) -> OutputStream {
-    let value = Value {
-        value: UntaggedValue::Table(input),
-        tag: Tag::unknown(),
-    };
-
-    match process_row(block, context, value, external_redirection) {
-        Ok(s) => {
-            // We need to handle this differently depending on whether process_row
-            // returned just 1 value or if it returned multiple as a stream.
-            let vec = s.collect::<Vec<_>>();
-
-            // If it returned just one value, just take that value
-            if vec.len() == 1 {
-                return OutputStream::one(
-                    vec.into_iter()
-                        .next()
-                        .expect("This should be impossible, we just checked that vec.len() == 1."),
-                );
-            }
-
-            // If it returned multiple values, we need to put them into a table and
-            // return that.
-            OutputStream::one(UntaggedValue::Table(vec).into_untagged_value())
-        }
-        Err(e) => OutputStream::one(Value::error(e)),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::EachGroup;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(EachGroup {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/each/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/each/mod.rs
deleted file mode 100644
index cd656685f..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/each/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod command;
-pub mod group;
-pub mod window;
-
-pub(crate) use command::make_indexed_item;
-pub use command::process_row;
-pub use command::Each;
-pub use group::EachGroup;
-pub use window::EachWindow;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/each/window.rs b/old_nushell/crates/nu-command/src/commands/filters/each/window.rs
deleted file mode 100644
index e5d855719..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/each/window.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::commands::filters::each::group::run_block_on_vec;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-//use itertools::Itertools;
-use nu_errors::ShellError;
-use nu_protocol::{hir::CapturedBlock, Primitive, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct EachWindow;
-
-impl WholeStreamCommand for EachWindow {
-    fn name(&self) -> &str {
-        "each window"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("each window")
-            .required("window_size", SyntaxShape::Int, "the size of each window")
-            .named(
-                "stride",
-                SyntaxShape::Int,
-                "the number of rows to slide over between windows",
-                Some('s'),
-            )
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "the block to run on each group",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a block on sliding windows of `window_size` rows of a table at a time."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Echo the sum of each window",
-            example: "echo [1 2 3 4] | each window 2 { echo $it | math sum }",
-            result: None,
-        }]
-    }
-
-    fn run(&self, mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let context = Arc::new(args.context.clone());
-        let external_redirection = args.call_info.args.external_redirection;
-
-        let window_size: Tagged<usize> = args.req(0)?;
-        let block: CapturedBlock = args.req(1)?;
-        let stride: Option<Tagged<usize>> = args.get_flag("stride")?;
-
-        let block = Arc::new(block);
-
-        let mut window: Vec<_> = args
-            .input
-            .by_ref()
-            .take(*window_size - 1)
-            .collect::<Vec<_>>();
-
-        // `window` must start with dummy values, which will be removed on the first iteration
-        let stride = stride.map(|x| *x).unwrap_or(1);
-        window.insert(0, UntaggedValue::Primitive(Primitive::Nothing).into());
-
-        Ok(args
-            .input
-            .enumerate()
-            .flat_map(move |(i, input)| {
-                // This would probably be more efficient if `last` was a VecDeque
-                // But we can't have that because it needs to be put into a Table
-                window.remove(0);
-                window.push(input);
-
-                let block = block.clone();
-                let context = context.clone();
-                let local_window = window.clone();
-
-                if i % stride == 0 {
-                    Some(run_block_on_vec(
-                        local_window,
-                        block,
-                        context,
-                        external_redirection,
-                    ))
-                } else {
-                    None
-                }
-            })
-            .flatten()
-            .map(Ok)
-            .into_input_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::EachWindow;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(EachWindow {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/empty.rs b/old_nushell/crates/nu-command/src/commands/filters/empty.rs
deleted file mode 100644
index c84fdbad6..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/empty.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ExternalRedirection, ColumnPath, Primitive, ReturnSuccess, Signature,
-    SyntaxShape, UntaggedValue, Value,
-};
-
-use nu_value_ext::{as_string, ValueExt};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "empty?"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("empty?")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "the names of the columns to check emptiness",
-            )
-            .named(
-                "block",
-                SyntaxShape::Block,
-                "an optional block to replace if empty",
-                Some('b'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Check for empty values."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        is_empty(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Check if a value is empty",
-                example: "echo '' | empty?",
-                result: Some(vec![UntaggedValue::boolean(true).into()]),
-            },
-            Example {
-                description: "more than one column",
-                example: "echo [[meal size]; [arepa small] [taco '']] | empty? meal size",
-                result: Some(
-                    vec![
-                        UntaggedValue::row(indexmap! {
-                                "meal".to_string() => Value::from(false),
-                                "size".to_string() => Value::from(false),
-                        })
-                        .into(),
-                        UntaggedValue::row(indexmap! {
-                                "meal".to_string() => Value::from(false),
-                                "size".to_string() => Value::from(true),
-                        })
-                        .into(),
-                    ],
-                ),
-            },Example {
-                description: "use a block if setting the empty cell contents is wanted",
-                example: "echo [[2020/04/16 2020/07/10 2020/11/16]; ['' [27] [37]]] | empty? 2020/04/16 -b { [33 37] }",
-                result: Some(
-                    vec![
-                        UntaggedValue::row(indexmap! {
-                                "2020/04/16".to_string() => UntaggedValue::table(&[UntaggedValue::int(33).into(), UntaggedValue::int(37).into()]).into(),
-                                "2020/07/10".to_string() => UntaggedValue::table(&[UntaggedValue::int(27).into()]).into(),
-                                "2020/11/16".to_string() => UntaggedValue::table(&[UntaggedValue::int(37).into()]).into(),
-                        })
-                        .into(),
-                    ],
-                ),
-            },
-        ]
-    }
-}
-
-fn is_empty(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let context = args.context.clone();
-    let block: Option<CapturedBlock> = args.get_flag("block")?;
-    let columns: Vec<ColumnPath> = args.rest(0)?;
-
-    let input = args.input;
-
-    if input.is_empty() {
-        let stream =
-            vec![UntaggedValue::Primitive(Primitive::Nothing).into_value(&tag)].into_iter();
-
-        return Ok(InputStream::from_stream(stream)
-            .map(move |input| {
-                let columns = vec![];
-
-                match process_row(&context, input, &block, columns) {
-                    Ok(s) => s,
-                    Err(e) => ActionStream::one(Err(e)),
-                }
-            })
-            .flatten()
-            .into_action_stream());
-    }
-
-    Ok(input
-        .map(move |input| {
-            let columns = columns.clone();
-
-            match process_row(&context, input, &block, columns) {
-                Ok(s) => s,
-                Err(e) => ActionStream::one(Err(e)),
-            }
-        })
-        .flatten()
-        .into_action_stream())
-}
-
-fn process_row(
-    context: &EvaluationContext,
-    input: Value,
-    default_block: &Option<CapturedBlock>,
-    column_paths: Vec<ColumnPath>,
-) -> Result<ActionStream, ShellError> {
-    let mut out = Arc::new(None);
-    let results = Arc::make_mut(&mut out);
-
-    if let Some(default_block) = &*default_block {
-        let for_block = input.clone();
-        let input_stream = vec![Ok(for_block)].into_iter().into_input_stream();
-
-        context.scope.enter_scope();
-        context.scope.add_vars(&default_block.captured.entries);
-        if let Some((arg, _)) = default_block.block.params.positional.first() {
-            context.scope.add_var(arg.name(), input.clone());
-        }
-
-        let stream = run_block(
-            &default_block.block,
-            context,
-            input_stream,
-            ExternalRedirection::Stdout,
-        );
-        context.scope.exit_scope();
-
-        let mut stream = stream?;
-        *results = Some({
-            let values = stream.drain_vec();
-
-            let errors = context.get_errors();
-
-            if let Some(error) = errors.first() {
-                return Err(error.clone());
-            }
-
-            if values.len() == 1 {
-                let value = values
-                    .get(0)
-                    .ok_or_else(|| ShellError::unexpected("No value."))?;
-
-                Value {
-                    value: value.value.clone(),
-                    tag: input.tag.clone(),
-                }
-            } else if values.is_empty() {
-                UntaggedValue::nothing().into_value(&input.tag)
-            } else {
-                UntaggedValue::table(&values).into_value(&input.tag)
-            }
-        });
-    }
-
-    match input {
-        Value {
-            value: UntaggedValue::Row(ref r),
-            ref tag,
-        } => {
-            if column_paths.is_empty() {
-                Ok(ActionStream::one(ReturnSuccess::value({
-                    let is_empty = input.is_empty();
-
-                    if default_block.is_some() {
-                        if is_empty {
-                            results
-                                .clone()
-                                .unwrap_or_else(|| UntaggedValue::boolean(true).into_value(tag))
-                        } else {
-                            input.clone()
-                        }
-                    } else {
-                        UntaggedValue::boolean(is_empty).into_value(tag)
-                    }
-                })))
-            } else {
-                let mut obj = input.clone();
-
-                for column in column_paths {
-                    let path = UntaggedValue::Primitive(Primitive::ColumnPath(column.clone()))
-                        .into_value(tag);
-                    let data = r.get_data(&as_string(&path)?).borrow().clone();
-                    let is_empty = data.is_empty();
-
-                    let default = if default_block.is_some() {
-                        if is_empty {
-                            results
-                                .clone()
-                                .unwrap_or_else(|| UntaggedValue::boolean(true).into_value(tag))
-                        } else {
-                            data.clone()
-                        }
-                    } else {
-                        UntaggedValue::boolean(is_empty).into_value(tag)
-                    };
-
-                    if let Ok(value) =
-                        obj.swap_data_by_column_path(&column, Box::new(move |_| Ok(default)))
-                    {
-                        obj = value;
-                    }
-                }
-
-                Ok(ActionStream::one(ReturnSuccess::value(obj)))
-            }
-        }
-        other => Ok(ActionStream::one(ReturnSuccess::value({
-            if other.is_empty() {
-                results
-                    .clone()
-                    .unwrap_or_else(|| UntaggedValue::boolean(true).into_value(other.tag))
-            } else {
-                UntaggedValue::boolean(false).into_value(other.tag)
-            }
-        }))),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/every.rs b/old_nushell/crates/nu-command/src/commands/filters/every.rs
deleted file mode 100644
index aeac25e23..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/every.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
-
-pub struct Every;
-
-impl WholeStreamCommand for Every {
-    fn name(&self) -> &str {
-        "every"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name())
-            .required(
-                "stride",
-                SyntaxShape::Int,
-                "how many rows to skip between (and including) each row returned",
-            )
-            .switch(
-                "skip",
-                "skip the rows that would be returned, instead of selecting them",
-                Some('s'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Show (or skip) every n-th row, starting from the first one."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        every(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get every second row",
-                example: "echo [1 2 3 4 5] | every 2",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(5).into(),
-                ]),
-            },
-            Example {
-                description: "Skip every second row",
-                example: "echo [1 2 3 4 5] | every 2 --skip",
-                result: Some(vec![
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn every(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let stride: u64 = args.req(0)?;
-    let skip: bool = args.has_flag("skip");
-    let input = args.input;
-
-    Ok(input
-        .enumerate()
-        .filter_map(move |(i, value)| {
-            let stride_desired = if stride < 1 { 1 } else { stride } as usize;
-            let should_include = skip == (i % stride_desired != 0);
-
-            if should_include {
-                Some(ReturnSuccess::value(value))
-            } else {
-                None
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Every;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Every {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/first.rs b/old_nushell/crates/nu-command/src/commands/filters/first.rs
deleted file mode 100644
index c592fda64..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/first.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct First;
-
-impl WholeStreamCommand for First {
-    fn name(&self) -> &str {
-        "first"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("first").optional(
-            "rows",
-            SyntaxShape::Int,
-            "starting from the front, the number of rows to return",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Show only the first number of rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        first(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Return the first item of a list/table",
-                example: "echo [1 2 3] | first",
-                result: Some(vec![UntaggedValue::int(1).into()]),
-            },
-            Example {
-                description: "Return the first 2 items of a list/table",
-                example: "echo [1 2 3] | first 2",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn first(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let rows: Option<Tagged<usize>> = args.opt(0)?;
-    let tag = args.call_info.name_tag;
-
-    let mut rows_desired = if let Some(quantity) = rows {
-        *quantity
-    } else {
-        1
-    };
-
-    let mut input_peek = args.input.peekable();
-    match &mut input_peek.next_if(|val| val.is_binary()) {
-        Some(v) => match &v.value {
-            // We already know it's a binary so we don't have to match
-            // on the type of primitive
-            UntaggedValue::Primitive(_) => {
-                let bytes = match v.as_binary_vec() {
-                    Ok(b) => b,
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "error converting data as_binary_vec",
-                            "error conversion",
-                            tag,
-                        ))
-                    }
-                };
-                // if the current 8192 chunk fits inside our rows_desired
-                // carve it up and return it
-                if bytes.len() >= rows_desired {
-                    // We only want to see a certain amount of the binary
-                    // so let's grab those parts
-                    let output_bytes = bytes[0..rows_desired].to_vec();
-                    Ok(OutputStream::one(UntaggedValue::binary(output_bytes)))
-                } else {
-                    // if we want more rows that the current chunk size (8192)
-                    // we must gradually get bigger chunks while testing
-                    // if it's within the requested rows_desired size
-                    let mut bigger: Vec<u8> = vec![];
-                    bigger.extend(bytes);
-                    while bigger.len() < rows_desired {
-                        match input_peek.next() {
-                            Some(data) => match data.value.into_value(&tag).as_binary_vec() {
-                                Ok(bits) => bigger.extend(bits),
-                                _ => {
-                                    return Err(ShellError::labeled_error(
-                                        "error converting data as_binary_vec",
-                                        "error conversion",
-                                        tag,
-                                    ))
-                                }
-                            },
-                            _ => {
-                                // We're at the end of our data so let's break out of this loop
-                                // and set the rows_desired to the size of our data
-                                rows_desired = bigger.len();
-                                break;
-                            }
-                        }
-                    }
-                    let output_bytes = bigger[0..rows_desired].to_vec();
-                    Ok(OutputStream::one(UntaggedValue::binary(output_bytes)))
-                }
-            }
-            UntaggedValue::Row(_) => Ok(input_peek.take(rows_desired).into_output_stream()),
-            UntaggedValue::Table(_) => Err(ShellError::labeled_error(
-                "unsure how to handle UntaggedValue::Table",
-                "found table",
-                tag,
-            )),
-            UntaggedValue::Error(_) => Err(ShellError::labeled_error(
-                "unsure how to handle UntaggedValue::Error",
-                "found error",
-                tag,
-            )),
-            UntaggedValue::Block(_) => Err(ShellError::labeled_error(
-                "unsure how to handled UntaggedValue::Block",
-                "found block",
-                tag,
-            )),
-            #[cfg(all(not(target_arch = "wasm32"), feature = "dataframe"))]
-            UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-                Err(ShellError::labeled_error(
-                    "unsure how to handled dataframe struct",
-                    "found dataframe",
-                    tag,
-                ))
-            }
-        },
-        None => Ok(input_peek.take(rows_desired).into_output_stream()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::First;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(First {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/flatten.rs b/old_nushell/crates/nu-command/src/commands/filters/flatten.rs
deleted file mode 100644
index fef4b5153..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/flatten.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    Dictionary, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "flatten"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("flatten").rest(
-            "rest",
-            SyntaxShape::String,
-            "optionally flatten data by column",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Flatten the table."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        flatten(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "flatten a table",
-                example: "echo [[N, u, s, h, e, l, l]] | flatten | first",
-                result: Some(vec![Value::from("N")]),
-            },
-            Example {
-                description: "flatten a column having a nested table",
-                example: "echo [[origin, people]; [Ecuador, (echo [[name, meal]; ['Andres', 'arepa']])]] | flatten | get meal",
-                result: Some(vec![Value::from("arepa")]),
-            },
-            Example {
-                description: "restrict the flattening by passing column names",
-                example: "echo [[origin, crate, versions]; [World, (echo [[name]; ['nu-cli']]), ['0.21', '0.22']]] | flatten versions | last | get versions",
-                result: Some(vec![Value::from("0.22")]),
-            }
-        ]
-    }
-}
-
-fn flatten(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let columns: Vec<Tagged<String>> = args.rest(0)?;
-    let input = args.input;
-
-    Ok(input
-        .flat_map(move |item| flat_value(&columns, &item, &tag))
-        .into_action_stream())
-}
-
-enum TableInside<'a> {
-    Entries(&'a str, &'a Tag, Vec<&'a Value>),
-}
-
-fn flat_value(
-    columns: &[Tagged<String>],
-    item: &Value,
-    name_tag: impl Into<Tag>,
-) -> Vec<Result<ReturnSuccess, ShellError>> {
-    let tag = item.tag.clone();
-    let name_tag = name_tag.into();
-
-    let res = {
-        if item.is_row() {
-            let mut out = TaggedDictBuilder::new(tag);
-            let mut a_table = None;
-            let mut tables_explicitly_flattened = 0;
-
-            for (column, value) in item.row_entries() {
-                let column_requested = columns.iter().find(|c| c.item == *column);
-
-                if let Value {
-                    value: UntaggedValue::Row(Dictionary { entries: mapa }),
-                    ..
-                } = value
-                {
-                    if column_requested.is_none() && !columns.is_empty() {
-                        if out.contains_key(column) {
-                            out.insert_value(format!("{}_{}", column, column), value.clone());
-                        } else {
-                            out.insert_value(column, value.clone());
-                        }
-                        continue;
-                    }
-
-                    for (k, v) in mapa {
-                        if out.contains_key(k) {
-                            out.insert_value(format!("{}_{}", column, k), v.clone());
-                        } else {
-                            out.insert_value(k, v.clone());
-                        }
-                    }
-                } else if value.is_table() {
-                    if tables_explicitly_flattened >= 1 && column_requested.is_some() {
-                        let attempted = if let Some(name) = column_requested {
-                            name.span()
-                        } else {
-                            name_tag.span
-                        };
-
-                        let already_flattened =
-                            if let Some(TableInside::Entries(_, column_tag, _)) = a_table {
-                                column_tag.span
-                            } else {
-                                name_tag.span
-                            };
-
-                        return vec![ReturnSuccess::value(
-                            UntaggedValue::Error(ShellError::labeled_error_with_secondary(
-                                "can only flatten one inner table at the same time",
-                                "tried flattening more than one column with inner tables",
-                                attempted,
-                                "...but is flattened already",
-                                already_flattened,
-                            ))
-                            .into_value(name_tag),
-                        )];
-                    }
-
-                    if !columns.is_empty() {
-                        if let Some(requested) = column_requested {
-                            a_table = Some(TableInside::Entries(
-                                &requested.item,
-                                &requested.tag,
-                                value.table_entries().collect(),
-                            ));
-
-                            tables_explicitly_flattened += 1;
-                        } else {
-                            out.insert_value(column, value.clone());
-                        }
-                    } else if a_table.is_none() {
-                        a_table = Some(TableInside::Entries(
-                            column,
-                            &value.tag,
-                            value.table_entries().collect(),
-                        ))
-                    } else {
-                        out.insert_value(column, value.clone());
-                    }
-                } else {
-                    out.insert_value(column, value.clone());
-                }
-            }
-
-            let mut expanded = vec![];
-
-            if let Some(TableInside::Entries(column, _, entries)) = a_table {
-                for entry in entries {
-                    let mut base = out.clone();
-                    base.insert_value(column, entry.clone());
-                    expanded.push(base.into_value());
-                }
-            } else {
-                expanded.push(out.into_value());
-            }
-
-            expanded
-        } else if item.is_table() {
-            item.table_entries().cloned().collect()
-        } else {
-            vec![item.clone()]
-        }
-    };
-
-    res.into_iter().map(ReturnSuccess::value).collect()
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/get.rs b/old_nushell/crates/nu-command/src/commands/filters/get.rs
deleted file mode 100644
index 3926bcbb6..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/get.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use crate::prelude::*;
-use indexmap::set::IndexSet;
-use log::trace;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    did_you_mean, ColumnPath, Dictionary, PathMember, Primitive, ReturnSuccess, Signature,
-    SyntaxShape, UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_source::HasFallibleSpan;
-use nu_value_ext::get_data_by_column_path;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "get"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("get").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally return additional data by path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Open given cells as text."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        get(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Extract the name of files as a list",
-                example: "ls | get name",
-                result: None,
-            },
-            Example {
-                description: "Extract the cpu list from the sys information",
-                example: "sys | get cpu",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn get(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-    let mut input = args.input;
-
-    if column_paths.is_empty() {
-        let vec = input.drain_vec();
-
-        let descs = nu_protocol::merge_descriptors(&vec);
-
-        Ok(descs
-            .into_iter()
-            .map(ReturnSuccess::value)
-            .into_action_stream())
-    } else {
-        trace!("get {:?}", column_paths);
-        let output_stream = input
-            .flat_map(move |item| {
-                column_paths
-                    .iter()
-                    .flat_map(move |path| get_output(&item, path))
-                    .collect::<Vec<_>>()
-            })
-            .into_action_stream();
-        Ok(output_stream)
-    }
-}
-
-fn get_output(item: &Value, path: &ColumnPath) -> Vec<Result<ReturnSuccess, ShellError>> {
-    match get_column_path(path, item) {
-        Ok(Value {
-            value: UntaggedValue::Primitive(Primitive::Nothing),
-            ..
-        }) => vec![],
-        Ok(Value {
-            value: UntaggedValue::Table(rows),
-            ..
-        }) => rows.into_iter().map(ReturnSuccess::value).collect(),
-        Ok(other) => vec![ReturnSuccess::value(other)],
-        Err(reason) => vec![ReturnSuccess::value(
-            UntaggedValue::Error(reason).into_untagged_value(),
-        )],
-    }
-}
-
-pub fn get_column_path(path: &ColumnPath, obj: &Value) -> Result<Value, ShellError> {
-    get_data_by_column_path(obj, path, move |obj_source, column_path_tried, error| {
-        let path_members_span = path.maybe_span().unwrap_or_else(Span::unknown);
-
-        match &obj_source.value {
-            UntaggedValue::Table(rows) => {
-                return get_column_path_from_table_error(
-                    rows,
-                    column_path_tried,
-                    &path_members_span,
-                );
-            }
-            UntaggedValue::Row(columns) => {
-                if let Some(error) = get_column_from_row_error(
-                    columns,
-                    column_path_tried,
-                    &path_members_span,
-                    obj_source,
-                ) {
-                    return error;
-                }
-            }
-            _ => {}
-        }
-
-        if let Some(suggestions) = did_you_mean(obj_source, column_path_tried.as_string()) {
-            ShellError::labeled_error(
-                "Unknown column",
-                format!("did you mean '{}'?", suggestions[0]),
-                column_path_tried.span.since(path_members_span),
-            )
-        } else {
-            error
-        }
-    })
-}
-
-pub fn get_column_path_from_table_error(
-    rows: &[Value],
-    column_path_tried: &PathMember,
-    path_members_span: &Span,
-) -> ShellError {
-    match column_path_tried {
-        PathMember {
-            unspanned: UnspannedPathMember::String(column),
-            ..
-        } => {
-            let primary_label = format!("There isn't a column named '{}'", &column);
-
-            let suggestions: IndexSet<_> = rows
-                .iter()
-                .filter_map(|r| did_you_mean(r, column_path_tried.as_string()))
-                .map(|s| s[0].to_owned())
-                .collect();
-            let mut existing_columns: IndexSet<_> = IndexSet::default();
-            let mut names: Vec<String> = vec![];
-
-            for row in rows {
-                for field in row.data_descriptors() {
-                    if !existing_columns.contains(&field[..]) {
-                        existing_columns.insert(field.clone());
-                        names.push(field);
-                    }
-                }
-            }
-
-            if names.is_empty() {
-                ShellError::labeled_error_with_secondary(
-                    "Unknown column",
-                    primary_label,
-                    column_path_tried.span,
-                    "Appears to contain rows. Try indexing instead.",
-                    column_path_tried.span.since(path_members_span),
-                )
-            } else {
-                ShellError::labeled_error_with_secondary(
-                    "Unknown column",
-                    primary_label,
-                    column_path_tried.span,
-                    format!(
-                        "Perhaps you meant '{}'? Columns available: {}",
-                        suggestions
-                            .iter()
-                            .map(|x| x.to_owned())
-                            .collect::<Vec<String>>()
-                            .join(","),
-                        names.join(", ")
-                    ),
-                    column_path_tried.span.since(path_members_span),
-                )
-            }
-        }
-        PathMember {
-            unspanned: UnspannedPathMember::Int(idx),
-            ..
-        } => {
-            let total = rows.len();
-
-            let secondary_label = if total == 1 {
-                "The table only has 1 row".to_owned()
-            } else {
-                format!("The table only has {} rows (0 to {})", total, total - 1)
-            };
-
-            ShellError::labeled_error_with_secondary(
-                "Row not found",
-                format!("There isn't a row indexed at {}", idx),
-                column_path_tried.span,
-                secondary_label,
-                column_path_tried.span.since(path_members_span),
-            )
-        }
-    }
-}
-
-pub fn get_column_from_row_error(
-    columns: &Dictionary,
-    column_path_tried: &PathMember,
-    path_members_span: &Span,
-    obj_source: &Value,
-) -> Option<ShellError> {
-    match column_path_tried {
-        PathMember {
-            unspanned: UnspannedPathMember::String(column),
-            ..
-        } => {
-            let primary_label = format!("There isn't a column named '{}'", &column);
-
-            did_you_mean(obj_source, column_path_tried.as_string()).map(|suggestions| {
-                ShellError::labeled_error_with_secondary(
-                    "Unknown column",
-                    primary_label,
-                    column_path_tried.span,
-                    format!(
-                        "Perhaps you meant '{}'? Columns available: {}",
-                        suggestions[0],
-                        &obj_source.data_descriptors().join(", ")
-                    ),
-                    column_path_tried.span.since(path_members_span),
-                )
-            })
-        }
-        PathMember {
-            unspanned: UnspannedPathMember::Int(idx),
-            ..
-        } => Some(ShellError::labeled_error_with_secondary(
-            "No rows available",
-            format!("A row at '{}' can't be indexed.", &idx),
-            column_path_tried.span,
-            format!(
-                "Appears to contain columns. Columns available: {}",
-                columns.keys().join(", ")
-            ),
-            column_path_tried.span.since(path_members_span),
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/group_by.rs b/old_nushell/crates/nu-command/src/commands/filters/group_by.rs
deleted file mode 100644
index c764d7b09..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/group_by.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-use crate::prelude::*;
-use crate::utils::suggestions::suggestions;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::hir::ExternalRedirection;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use nu_value_ext::as_string;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "group-by"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("group-by").optional(
-            "grouper",
-            SyntaxShape::Any,
-            "the grouper value to use",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Create a new table grouped."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        group_by(args)
-    }
-
-    #[allow(clippy::unwrap_used)]
-    fn examples(&self) -> Vec<Example> {
-        use nu_data::value::date_naive_from_str as date;
-
-        vec![
-            Example {
-                description: "group items by column named \"type\"",
-                example: r#"ls | group-by type"#,
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                    "File".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::row(indexmap! {
-                                "name".to_string() =>          UntaggedValue::string("Andres.txt").into(),
-                                "type".to_string() =>                UntaggedValue::string("File").into(),
-                            "chickens".to_string() =>                       UntaggedValue::int(10).into(),
-                            "modified".to_string() => date("2019-07-23".tagged_unknown()).unwrap().into(),
-                        }).into(),
-                        UntaggedValue::row(indexmap! {
-                                "name".to_string() =>          UntaggedValue::string("Darren.txt").into(),
-                                "type".to_string() =>                UntaggedValue::string("File").into(),
-                            "chickens".to_string() =>                       UntaggedValue::int(20).into(),
-                            "modified".to_string() => date("2019-09-24".tagged_unknown()).unwrap().into(),
-                        }).into(),
-                    ]).into(),
-                    "Dir".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::row(indexmap! {
-                                "name".to_string() =>            UntaggedValue::string("Jonathan").into(),
-                                "type".to_string() =>                 UntaggedValue::string("Dir").into(),
-                            "chickens".to_string() =>                        UntaggedValue::int(5).into(),
-                            "modified".to_string() => date("2019-07-23".tagged_unknown()).unwrap().into(),
-                        }).into(),
-                        UntaggedValue::row(indexmap! {
-                                "name".to_string() =>              UntaggedValue::string("Yehuda").into(),
-                                "type".to_string() =>                 UntaggedValue::string("Dir").into(),
-                            "chickens".to_string() =>                        UntaggedValue::int(4).into(),
-                            "modified".to_string() => date("2019-09-24".tagged_unknown()).unwrap().into(),
-                        }).into(),
-                    ]).into(),
-                })
-                .into()]),
-            },
-            Example {
-                description: "you can also group by raw values by leaving out the argument",
-                example: "echo [1 3 1 3 2 1 1] | group-by",
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                    "1".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-                    ]).into(),
-
-                    "3".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(3).into(),
-                        UntaggedValue::int(3).into(),
-                    ]).into(),
-
-                    "2".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(2).into(),
-                    ]).into(),
-                })
-                .into()]),
-            },
-            Example {
-                description:
-                    "use the block form to generate a grouping key when each row gets processed",
-                example: "echo [1 3 1 3 2 1 1] | group-by { ($it - 1) mod 3 }",
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                    "0".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-                        UntaggedValue::int(1).into(),
-
-                    ]).into(),
-                    "2".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(3).into(),
-                        UntaggedValue::int(3).into(),
-                    ]).into(),
-                    "1".to_string() => UntaggedValue::Table(vec![
-                        UntaggedValue::int(2).into(),
-                    ]).into(),
-                })
-                .into()]),
-            },
-        ]
-    }
-}
-
-enum Grouper {
-    ByColumn(Option<Tagged<String>>),
-    ByBlock,
-}
-
-pub fn group_by(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let context = Arc::new(args.context.clone());
-
-    let grouper = args.opt(0)?;
-    let values: Vec<Value> = args.input.collect();
-    let mut keys: Vec<Result<String, ShellError>> = vec![];
-    let mut group_strategy = Grouper::ByColumn(None);
-
-    match grouper {
-        Some(Value {
-            value: UntaggedValue::Block(block_given),
-            ..
-        }) => {
-            let block = Arc::new(*block_given);
-            let error_key = "error";
-
-            for value in &values {
-                let run = block.clone();
-                let context = context.clone();
-
-                match crate::commands::filters::each::process_row(
-                    run,
-                    context,
-                    value.clone(),
-                    ExternalRedirection::Stdout,
-                ) {
-                    Ok(mut s) => {
-                        let collection: Vec<Value> = s.drain_vec();
-
-                        if collection.len() > 1 {
-                            return Err(ShellError::labeled_error(
-                                "expected one value from the block",
-                                "requires a table with one value for grouping",
-                                &name,
-                            ));
-                        }
-
-                        let value = match collection.get(0) {
-                            Some(Value {
-                                value: UntaggedValue::Error(_),
-                                ..
-                            })
-                            | None => UntaggedValue::string(error_key).into_value(&name),
-                            Some(return_value) => return_value.clone(),
-                        };
-
-                        keys.push(as_string(&value));
-                    }
-                    Err(_) => {
-                        keys.push(Ok(error_key.into()));
-                    }
-                }
-            }
-
-            group_strategy = Grouper::ByBlock;
-        }
-        Some(other) => {
-            group_strategy = Grouper::ByColumn(Some(as_string(&other)?.tagged(&name)));
-        }
-        _ => {}
-    }
-
-    if values.is_empty() {
-        return Err(ShellError::labeled_error(
-            "expected table from pipeline",
-            "requires a table input",
-            name,
-        ));
-    }
-
-    let first = values[0].clone();
-
-    let name = if first.tag.anchor().is_some() {
-        first.tag
-    } else {
-        name
-    };
-
-    let values = UntaggedValue::table(&values).into_value(&name);
-
-    let group_value = match group_strategy {
-        Grouper::ByBlock => {
-            let map = keys;
-
-            let block = Box::new(move |idx: usize, row: &Value| match map.get(idx) {
-                Some(Ok(key)) => Ok(key.clone()),
-                Some(Err(reason)) => Err(reason.clone()),
-                None => as_string(row),
-            });
-
-            nu_data::utils::group(&values, &Some(block), name)
-        }
-        Grouper::ByColumn(column_name) => group(&column_name, &values, &name),
-    };
-
-    Ok(OutputStream::one(group_value?))
-}
-
-pub fn group(
-    column_name: &Option<Tagged<String>>,
-    values: &Value,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let name = tag.into();
-
-    let grouper = if let Some(column_name) = column_name {
-        Grouper::ByColumn(Some(column_name.clone()))
-    } else {
-        Grouper::ByColumn(None)
-    };
-
-    match grouper {
-        Grouper::ByColumn(Some(column_name)) => {
-            let block = Box::new(move |_, row: &Value| {
-                match row.get_data_by_key(column_name.borrow_spanned()) {
-                    Some(group_key) => Ok(as_string(&group_key)?),
-                    None => Err(suggestions(column_name.borrow_tagged(), row)),
-                }
-            });
-
-            nu_data::utils::group(values, &Some(block), &name)
-        }
-        Grouper::ByColumn(None) => {
-            let block = Box::new(move |_, row: &Value| as_string(row));
-
-            nu_data::utils::group(values, &Some(block), &name)
-        }
-        Grouper::ByBlock => Err(ShellError::unimplemented(
-            "Block not implemented: This should never happen.",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::group;
-    use nu_data::utils::helpers::committers;
-    use nu_errors::ShellError;
-    use nu_source::*;
-    use nu_test_support::value::{date, int, row, string, table};
-
-    #[test]
-    fn groups_table_by_date_column() -> Result<(), ShellError> {
-        let for_key = Some(String::from("date").tagged_unknown());
-        let sample = table(&committers());
-
-        assert_eq!(
-            group(&for_key, &sample, Tag::unknown())?,
-            row(indexmap! {
-                "2019-07-23".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-07-23"), "chickens".into() => int(10) }),
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(5) }),
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(2) })
-                ]),
-                "2019-10-10".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-10-10"), "chickens".into() =>  int(6) }),
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-10-10"), "chickens".into() => int(15) }),
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-10-10"), "chickens".into() => int(30) })
-                ]),
-                "2019-09-24".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-09-24"), "chickens".into() => int(20) }),
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-09-24"), "chickens".into() =>  int(4) }),
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-09-24"), "chickens".into() => int(10) })
-                ]),
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn groups_table_by_country_column() -> Result<(), ShellError> {
-        let for_key = Some(String::from("country").tagged_unknown());
-        let sample = table(&committers());
-
-        assert_eq!(
-            group(&for_key, &sample, Tag::unknown())?,
-            row(indexmap! {
-                "EC".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-07-23"), "chickens".into() => int(10) }),
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-09-24"), "chickens".into() => int(20) }),
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-10-10"), "chickens".into() => int(30) })
-                ]),
-                "NZ".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(5) }),
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-10-10"), "chickens".into() => int(15) }),
-                    row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-09-24"), "chickens".into() => int(10) })
-                ]),
-                "US".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-10-10"), "chickens".into() =>  int(6) }),
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-09-24"), "chickens".into() =>  int(4) }),
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(2) }),
-                ]),
-            })
-        );
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/group_by_date.rs b/old_nushell/crates/nu-command/src/commands/filters/group_by_date.rs
deleted file mode 100644
index 3787f3f1d..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/group_by_date.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use crate::prelude::*;
-use crate::utils::suggestions::suggestions;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct GroupByDate;
-
-impl WholeStreamCommand for GroupByDate {
-    fn name(&self) -> &str {
-        "group-by date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("group-by date")
-            .optional(
-                "column_name",
-                SyntaxShape::String,
-                "the name of the column to group by",
-            )
-            .named(
-                "format",
-                SyntaxShape::String,
-                "Specify date and time formatting",
-                Some('f'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "creates a table grouped by date."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        group_by_date(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Group files by type",
-            example: "ls | group-by date --format '%d/%m/%Y'",
-            result: None,
-        }]
-    }
-}
-
-enum Grouper {
-    ByDate(Option<Tagged<String>>),
-}
-
-enum GroupByColumn {
-    Name(Option<Tagged<String>>),
-}
-
-pub fn group_by_date(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let column_name: Option<Tagged<String>> = args.opt(0)?;
-    let format: Option<Tagged<String>> = args.get_flag("format")?;
-
-    let values: Vec<Value> = args.input.collect();
-
-    if values.is_empty() {
-        Err(ShellError::labeled_error(
-            "Expected table from pipeline",
-            "requires a table input",
-            name,
-        ))
-    } else {
-        let values = UntaggedValue::table(&values).into_value(&name);
-
-        let grouper_column = if let Some(column_name) = column_name {
-            GroupByColumn::Name(Some(column_name))
-        } else {
-            GroupByColumn::Name(None)
-        };
-
-        let grouper_date = if let Some(date_format) = format {
-            Grouper::ByDate(Some(date_format))
-        } else {
-            Grouper::ByDate(None)
-        };
-
-        let value_result = match (grouper_date, grouper_column) {
-            (Grouper::ByDate(None), GroupByColumn::Name(None)) => {
-                let block = Box::new(move |_, row: &Value| row.format("%Y-%m-%d"));
-
-                nu_data::utils::group(&values, &Some(block), &name)
-            }
-            (Grouper::ByDate(None), GroupByColumn::Name(Some(column_name))) => {
-                let block = Box::new(move |_, row: &Value| {
-                    let group_key = row
-                        .get_data_by_key(column_name.borrow_spanned())
-                        .ok_or_else(|| suggestions(column_name.borrow_tagged(), row));
-
-                    group_key?.format("%Y-%m-%d")
-                });
-
-                nu_data::utils::group(&values, &Some(block), &name)
-            }
-            (Grouper::ByDate(Some(fmt)), GroupByColumn::Name(None)) => {
-                let block = Box::new(move |_, row: &Value| row.format(&fmt));
-
-                nu_data::utils::group(&values, &Some(block), &name)
-            }
-            (Grouper::ByDate(Some(fmt)), GroupByColumn::Name(Some(column_name))) => {
-                let block = Box::new(move |_, row: &Value| {
-                    let group_key = row
-                        .get_data_by_key(column_name.borrow_spanned())
-                        .ok_or_else(|| suggestions(column_name.borrow_tagged(), row));
-
-                    group_key?.format(&fmt)
-                });
-
-                nu_data::utils::group(&values, &Some(block), &name)
-            }
-        };
-
-        Ok(OutputStream::one(value_result?))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::GroupByDate;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(GroupByDate {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/headers.rs b/old_nushell/crates/nu-command/src/commands/filters/headers.rs
deleted file mode 100644
index 85368173f..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/headers.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use crate::prelude::*;
-
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Dictionary;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
-
-pub struct Headers;
-
-impl WholeStreamCommand for Headers {
-    fn name(&self) -> &str {
-        "headers"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("headers")
-    }
-
-    fn usage(&self) -> &str {
-        "Use the first row of the table as column names."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        headers(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Create headers from a raw string",
-                example: r#"echo "a b c|1 2 3" | split row "|" | split column " " | headers"#,
-                result: None,
-            },
-            Example {
-                description: "Don't panic on rows with different headers",
-                example: r#"echo "a b c|1 2 3|1 2 3 4" | split row "|" | split column " " | headers"#,
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn headers(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let input = args.input;
-    let rows: Vec<Value> = input.collect();
-
-    if rows.is_empty() {
-        return Err(ShellError::untagged_runtime_error(
-            "Couldn't find headers, was the input a properly formatted, non-empty table?",
-        ));
-    }
-
-    //the headers are the first row in the table
-    let headers: Vec<String> = match &rows[0].value {
-        UntaggedValue::Row(d) => {
-            Ok(d.entries
-                .iter()
-                .map(|(k, v)| {
-                    match v.as_string() {
-                        Ok(s) => s,
-                        Err(_) => {
-                            //If a cell that should contain a header name is empty, we name the column Column[index]
-                            match d.entries.get_full(k) {
-                                Some((index, _, _)) => format!("Column{}", index),
-                                None => "unknownColumn".to_string(),
-                            }
-                        }
-                    }
-                })
-                .collect())
-        }
-        _ => Err(ShellError::unexpected_eof(
-            "Could not get headers, is the table empty?",
-            rows[0].tag.span,
-        )),
-    }?;
-
-    Ok(rows
-        .into_iter()
-        .skip(1)
-        .map(move |r| {
-            //Each row is a dictionary with the headers as keys
-            match &r.value {
-                UntaggedValue::Row(d) => {
-                    let mut entries = IndexMap::new();
-                    for (i, header) in headers.iter().enumerate() {
-                        let value = match d.entries.get_index(i) {
-                            Some((_, value)) => value.clone(),
-                            None => UntaggedValue::Primitive(Primitive::Nothing).into(),
-                        };
-
-                        entries.insert(header.clone(), value);
-                    }
-                    Ok(ReturnSuccess::Value(
-                        UntaggedValue::Row(Dictionary { entries }).into_value(r.tag.clone()),
-                    ))
-                }
-                _ => Err(ShellError::unexpected_eof(
-                    "Couldn't iterate through rows, was the input a properly formatted table?",
-                    r.tag.span,
-                )),
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Headers;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Headers {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/insert.rs b/old_nushell/crates/nu-command/src/commands/filters/insert.rs
deleted file mode 100644
index d3399bb18..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/insert.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::hir::ExternalRedirection;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_value_ext::ValueExt;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "insert"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("insert")
-            .required(
-                "column",
-                SyntaxShape::ColumnPath,
-                "the column name to insert",
-            )
-            .required("value", SyntaxShape::Any, "the value to give the cell(s)")
-    }
-
-    fn usage(&self) -> &str {
-        "Insert a new column with a given value."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        insert(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Insert a column with a value",
-            example: "echo [[author, commits]; ['Andrés', 1]] | insert branches 5",
-            result: Some(vec![UntaggedValue::row(indexmap! {
-                    "author".to_string() => Value::from("Andrés"),
-                    "commits".to_string() => UntaggedValue::int(1).into(),
-                    "branches".to_string() => UntaggedValue::int(5).into(),
-            })
-            .into()]),
-        },Example {
-            description: "Use in block form for more involved insertion logic",
-            example: "echo [[author, lucky_number]; ['Yehuda', 4]] | insert success { $it.lucky_number * 10 }",
-            result: Some(vec![UntaggedValue::row(indexmap! {
-                    "author".to_string() => Value::from("Yehuda"),
-                    "lucky_number".to_string() => UntaggedValue::int(4).into(),
-                    "success".to_string() => UntaggedValue::int(40).into(),
-            })
-            .into()]),
-        }]
-    }
-}
-
-fn process_row(
-    context: Arc<EvaluationContext>,
-    input: Value,
-    mut value: Arc<Value>,
-    field: Arc<ColumnPath>,
-) -> Result<ActionStream, ShellError> {
-    let value = Arc::make_mut(&mut value);
-
-    Ok(match value {
-        Value {
-            value: UntaggedValue::Block(block),
-            tag: block_tag,
-        } => {
-            let for_block = input.clone();
-            let input_stream = vec![Ok(for_block)].into_iter().into_input_stream();
-
-            context.scope.enter_scope();
-            context.scope.add_vars(&block.captured.entries);
-            if let Some((arg, _)) = block.block.params.positional.first() {
-                context.scope.add_var(arg.name(), input.clone());
-            }
-
-            let result = run_block(
-                &block.block,
-                &context,
-                input_stream,
-                ExternalRedirection::Stdout,
-            );
-
-            context.scope.exit_scope();
-
-            match result {
-                Ok(mut stream) => {
-                    let values = stream.drain_vec();
-
-                    let errors = context.get_errors();
-                    if let Some(error) = errors.first() {
-                        return Err(error.clone());
-                    }
-
-                    let result = if values.len() == 1 {
-                        let value = values
-                            .get(0)
-                            .ok_or_else(|| ShellError::unexpected("No value to insert with."))?;
-
-                        Value {
-                            value: value.value.clone(),
-                            tag: input.tag.clone(),
-                        }
-                    } else if values.is_empty() {
-                        UntaggedValue::nothing().into_value(&input.tag)
-                    } else {
-                        UntaggedValue::table(&values).into_value(&input.tag)
-                    };
-
-                    match input {
-                        obj @ Value {
-                            value: UntaggedValue::Row(_),
-                            ..
-                        } => match obj.insert_data_at_column_path(&field, result) {
-                            Ok(v) => ActionStream::one(ReturnSuccess::value(v)),
-                            Err(e) => ActionStream::one(Err(e)),
-                        },
-                        _ => ActionStream::one(Err(ShellError::labeled_error(
-                            "Unrecognized type in stream",
-                            "original value",
-                            block_tag.clone(),
-                        ))),
-                    }
-                }
-                Err(e) => ActionStream::one(Err(e)),
-            }
-        }
-        value => match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Nothing),
-                ..
-            } => match context
-                .scope
-                .get_var("$it")
-                .unwrap_or_else(|| UntaggedValue::nothing().into_untagged_value())
-                .insert_data_at_column_path(&field, value.clone())
-            {
-                Ok(v) => ActionStream::one(ReturnSuccess::value(v)),
-                Err(e) => ActionStream::one(Err(e)),
-            },
-            _ => match input.insert_data_at_column_path(&field, value.clone()) {
-                Ok(v) => ActionStream::one(ReturnSuccess::value(v)),
-                Err(e) => ActionStream::one(Err(e)),
-            },
-        },
-    })
-}
-
-fn insert(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let context = Arc::new(args.context.clone());
-    let column: ColumnPath = args.req(0)?;
-    let value: Value = args.req(1)?;
-    let input = args.input;
-
-    let value = Arc::new(value);
-    let column = Arc::new(column);
-
-    Ok(input
-        .flat_map(move |input| {
-            let context = context.clone();
-            let value = value.clone();
-            let column = column.clone();
-
-            match process_row(context, input, value, column) {
-                Ok(s) => s,
-                Err(e) => ActionStream::one(Err(e)),
-            }
-        })
-        .into_action_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/keep/command.rs b/old_nushell/crates/nu-command/src/commands/filters/keep/command.rs
deleted file mode 100644
index 9d0a9bc69..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/keep/command.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "keep"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("keep").optional(
-            "rows",
-            SyntaxShape::Int,
-            "Starting from the front, the number of rows to keep",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Keep the number of rows only."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        keep(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Keep the first row",
-                example: "echo [1 2 3] | keep",
-                result: Some(vec![UntaggedValue::int(1).into()]),
-            },
-            Example {
-                description: "Keep the first four rows",
-                example: "echo [1 2 3 4 5] | keep 4",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn keep(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let rows: Option<Tagged<usize>> = args.opt(0)?;
-
-    let rows_desired = if let Some(quantity) = rows {
-        *quantity
-    } else {
-        1
-    };
-
-    Ok(args.input.take(rows_desired).into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/keep/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/keep/mod.rs
deleted file mode 100644
index 56051b6de..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/keep/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod command;
-mod until;
-mod while_;
-
-pub use command::Command as Keep;
-pub use until::SubCommand as KeepUntil;
-pub use while_::SubCommand as KeepWhile;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/keep/until.rs b/old_nushell/crates/nu-command/src/commands/filters/keep/until.rs
deleted file mode 100644
index e5e9d3aa9..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/keep/until.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::{
-    hir::{CapturedBlock, ClassifiedCommand},
-    Signature, SyntaxShape,
-};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "keep until"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("keep until")
-            .required(
-                "condition",
-                SyntaxShape::RowCondition,
-                "The condition that must be met to stop keeping rows",
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Keeps rows until the condition matches."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let ctx = Arc::new(args.context.clone());
-        let tag = args.call_info.name_tag.clone();
-
-        let block: CapturedBlock = args.req(0)?;
-        let condition = {
-            if block.block.block.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-            match block.block.block[0].pipelines.get(0) {
-                Some(item) => match item.list.get(0) {
-                    Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Expected a condition",
-                            "expected a condition",
-                            tag,
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            }
-        };
-
-        Ok(args
-            .input
-            .take_while(move |item| {
-                let condition = condition.clone();
-                let ctx = ctx.clone();
-                ctx.scope.enter_scope();
-                ctx.scope.add_vars(&block.captured.entries);
-                if let Some((arg, _)) = block.block.params.positional.first() {
-                    ctx.scope.add_var(arg.name(), item.clone());
-                }
-
-                let result = evaluate_baseline_expr(&condition, &ctx);
-                ctx.scope.exit_scope();
-
-                !matches!(result, Ok(ref v) if v.is_true())
-            })
-            .into_output_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/keep/while_.rs b/old_nushell/crates/nu-command/src/commands/filters/keep/while_.rs
deleted file mode 100644
index ad4f98def..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/keep/while_.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::prelude::*;
-use log::trace;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ClassifiedCommand},
-    Signature, SyntaxShape,
-};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "keep while"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("keep while")
-            .required(
-                "condition",
-                SyntaxShape::RowCondition,
-                "The condition that must be met to keep rows",
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Keeps rows while the condition matches."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let ctx = Arc::new(args.context.clone());
-        let tag = args.call_info.name_tag.clone();
-
-        let block: CapturedBlock = args.req(0)?;
-        let condition = {
-            if block.block.block.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-            match block.block.block[0].pipelines.get(0) {
-                Some(item) => match item.list.get(0) {
-                    Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Expected a condition",
-                            "expected a condition",
-                            tag,
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            }
-        };
-
-        Ok(args
-            .input
-            .take_while(move |item| {
-                let condition = condition.clone();
-                let ctx = ctx.clone();
-
-                ctx.scope.enter_scope();
-                ctx.scope.add_vars(&block.captured.entries);
-                if let Some((arg, _)) = block.block.params.positional.first() {
-                    ctx.scope.add_var(arg.name(), item.clone());
-                }
-                trace!("ITEM = {:?}", item);
-
-                let result = evaluate_baseline_expr(&condition, &ctx);
-                ctx.scope.exit_scope();
-                trace!("RESULT = {:?}", result);
-
-                matches!(result, Ok(ref v) if v.is_true())
-            })
-            .into_output_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/last.rs b/old_nushell/crates/nu-command/src/commands/filters/last.rs
deleted file mode 100644
index b7a035b34..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/last.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-
-pub struct Last;
-
-impl WholeStreamCommand for Last {
-    fn name(&self) -> &str {
-        "last"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("last").optional(
-            "rows",
-            SyntaxShape::Number,
-            "starting from the back, the number of rows to return",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Show only the last number of rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        last(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get the last row",
-                example: "echo [1 2 3] | last",
-                result: Some(vec![UntaggedValue::int(3).into()]),
-            },
-            Example {
-                description: "Get the last three rows",
-                example: "echo [1 2 3 4 5] | last 3",
-                result: Some(vec![
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(5).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn last(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let rows: Option<usize> = args.opt(0)?;
-    let v: Vec<_> = args.input.into_vec();
-
-    let end_rows_desired = if let Some(quantity) = rows {
-        quantity
-    } else {
-        1
-    };
-
-    let beginning_rows_to_skip = if end_rows_desired < v.len() {
-        v.len() - end_rows_desired
-    } else {
-        0
-    };
-
-    let iter = v.into_iter().skip(beginning_rows_to_skip);
-
-    Ok(OutputStream::from_stream(iter))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Last;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Last {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/length.rs b/old_nushell/crates/nu-command/src/commands/filters/length.rs
deleted file mode 100644
index a2abee100..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/length.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::prelude::*;
-
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct Length;
-
-impl WholeStreamCommand for Length {
-    fn name(&self) -> &str {
-        "length"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("length").switch(
-            "column",
-            "Calculate number of columns in table",
-            Some('c'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Show the total number of rows or items."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let column = args.has_flag("column");
-        let input = args.input;
-
-        Ok(CountIterator {
-            column,
-            input,
-            done: false,
-            tag,
-        }
-        .into_output_stream())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Count the number of entries in a list",
-                example: "echo [1 2 3 4 5] | length",
-                result: Some(vec![UntaggedValue::int(5).into()]),
-            },
-            Example {
-                description: "Count the number of columns in the calendar table",
-                example: "cal | length -c",
-                result: None,
-            },
-        ]
-    }
-}
-
-struct CountIterator {
-    column: bool,
-    input: InputStream,
-    done: bool,
-    tag: Tag,
-}
-
-impl Iterator for CountIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.done {
-            return None;
-        }
-
-        self.done = true;
-
-        let length = if self.column {
-            if let Some(first) = self.input.next() {
-                match &first.value {
-                    UntaggedValue::Row(dictionary) => dictionary.length(),
-                    _ => {
-                        return Some(Value::error(ShellError::labeled_error(
-                            "Cannot obtain column length",
-                            "cannot obtain column length",
-                            self.tag.clone(),
-                        )));
-                    }
-                }
-            } else {
-                0
-            }
-        } else {
-            let input = &mut self.input;
-            input.count()
-        };
-
-        Some(UntaggedValue::int(length as i64).into_value(self.tag.clone()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Length;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Length {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/merge.rs b/old_nushell/crates/nu-command/src/commands/filters/merge.rs
deleted file mode 100644
index 7bc087fc2..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/merge.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use crate::prelude::*;
-use nu_data::value::merge_values;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ExternalRedirection, ReturnSuccess, Signature, SyntaxShape,
-    UntaggedValue, Value,
-};
-pub struct Merge;
-
-impl WholeStreamCommand for Merge {
-    fn name(&self) -> &str {
-        "merge"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("merge").required(
-            "block",
-            SyntaxShape::Block,
-            "the block to run and merge into the table",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Merge a table."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        merge(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Merge a 1-based index column with some ls output",
-            example: "ls | select name | keep 3 | merge { echo [1 2 3] | wrap index }",
-            result: None,
-        }]
-    }
-}
-
-fn merge(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let context = &args.context;
-    let name_tag = args.call_info.name_tag.clone();
-
-    let block: CapturedBlock = args.req(0)?;
-    let input = args.input;
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&block.captured.entries);
-    let result = run_block(
-        &block.block,
-        context,
-        InputStream::empty(),
-        ExternalRedirection::Stdout,
-    );
-    context.scope.exit_scope();
-
-    let table: Option<Vec<Value>> = match result {
-        Ok(mut stream) => Some(stream.drain_vec()),
-        Err(err) => {
-            return Err(err);
-        }
-    };
-
-    let table = table.unwrap_or_else(|| {
-        vec![Value {
-            value: UntaggedValue::row(IndexMap::default()),
-            tag: name_tag,
-        }]
-    });
-
-    Ok(input
-        .enumerate()
-        .map(move |(idx, value)| {
-            let other = table.get(idx);
-
-            match other {
-                Some(replacement) => match merge_values(&value.value, &replacement.value) {
-                    Ok(merged_value) => ReturnSuccess::value(merged_value.into_value(&value.tag)),
-                    Err(_) => {
-                        let message = format!("The row at {:?} types mismatch", idx);
-                        Err(ShellError::labeled_error(
-                            "Could not merge",
-                            &message,
-                            &value.tag,
-                        ))
-                    }
-                },
-                None => ReturnSuccess::value(value),
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Merge;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Merge {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/mod.rs
deleted file mode 100644
index e44c5f7c7..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/mod.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-mod all;
-mod any;
-mod append;
-mod collect;
-mod compact;
-mod default;
-mod drop;
-mod each;
-mod empty;
-mod every;
-mod first;
-mod flatten;
-pub(crate) mod get;
-mod group_by;
-mod group_by_date;
-mod headers;
-mod insert;
-mod keep;
-mod last;
-mod length;
-mod merge;
-mod move_;
-mod nth;
-mod pivot;
-mod prepend;
-mod range;
-mod reduce;
-mod reject;
-mod rename;
-mod reverse;
-mod roll;
-mod rotate;
-mod select;
-mod shuffle;
-mod skip;
-pub(crate) mod sort_by;
-mod uniq;
-mod update;
-mod update_cells;
-mod where_;
-mod wrap;
-mod zip_;
-
-pub use all::Command as All;
-pub use any::Command as Any;
-pub use append::Command as Append;
-pub use collect::Command as Collect;
-pub use compact::Compact;
-pub use default::Default;
-pub use drop::*;
-pub use each::*;
-pub use empty::Command as Empty;
-pub use every::Every;
-pub use first::First;
-pub use flatten::Command as Flatten;
-pub use get::Command as Get;
-pub use group_by::Command as GroupBy;
-pub use group_by_date::GroupByDate;
-pub use headers::Headers;
-pub use insert::Command as Insert;
-pub use keep::*;
-pub use last::Last;
-pub use length::Length;
-pub use merge::Merge;
-pub use move_::Command as MoveColumn;
-pub use nth::Nth;
-pub use pivot::Pivot;
-pub use prepend::Prepend;
-pub use range::Range;
-pub use reduce::Reduce;
-pub use reject::Reject;
-pub use rename::Rename;
-pub use reverse::Reverse;
-pub use roll::{Roll, RollColumn, RollUp};
-pub use rotate::{Rotate, RotateCounterClockwise};
-pub use select::Command as Select;
-pub use shuffle::Shuffle;
-pub use skip::{Skip, SkipUntil, SkipWhile};
-pub use sort_by::SortBy;
-pub use uniq::Uniq;
-pub use update::Command as Update;
-pub use update_cells::SubCommand as UpdateCells;
-pub use where_::Command as Where;
-pub use wrap::Wrap;
-pub use zip_::Command as Zip;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/move_.rs b/old_nushell/crates/nu-command/src/commands/filters/move_.rs
deleted file mode 100644
index a7daf5423..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/move_.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::select_fields;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, Value};
-use nu_source::HasFallibleSpan;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "move"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("move")
-            .rest("rest", SyntaxShape::ColumnPath, "the columns to move")
-            .named(
-                "after",
-                SyntaxShape::ColumnPath,
-                "the column that will precede the columns moved",
-                None,
-            )
-            .named(
-                "before",
-                SyntaxShape::ColumnPath,
-                "the column that will be next the columns moved",
-                None,
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Move columns."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        use nu_test_support::value::*;
-
-        vec![
-            Example {
-                description: "Move the column \"type\" before the column \"name\"",
-                example: r#"ls | move type --before name | first"#,
-                result: Some(vec![row! {
-                    "type".into() =>         string("File"),
-                    "name".into() =>   string("Andres.txt"),
-                    "chickens".into() =>            int(10),
-                    "modified".into() => date("2019-07-23")
-                }]),
-            },
-            Example {
-                description: "or move the column \"chickens\" after \"name\"",
-                example: r#"ls | move chickens --after name | first"#,
-                result: Some(vec![row! {
-                    "name".into() =>   string("Andres.txt"),
-                    "chickens".into() =>            int(10),
-                    "type".into() =>         string("File"),
-                    "modified".into() => date("2019-07-23")
-                }]),
-            },
-            Example {
-                description: "you can selectively move many columns in either direction",
-                example: r#"ls | move name chickens --after type | first"#,
-                result: Some(vec![row! {
-                    "type".into() =>         string("File"),
-                    "name".into() =>   string("Andres.txt"),
-                    "chickens".into() =>            int(10),
-                    "modified".into() => date("2019-07-23")
-                }]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let mut columns: Vec<ColumnPath> = args.rest(0)?;
-    let before: Option<ColumnPath> = args.get_flag("before")?;
-    let after: Option<ColumnPath> = args.get_flag("after")?;
-
-    if columns.is_empty() {
-        return Err(ShellError::labeled_error(
-            "expected columns",
-            "expected columns",
-            name,
-        ));
-    }
-
-    if columns.iter().any(|c| c.members().len() > 1) {
-        return Err(ShellError::labeled_error(
-            "expected columns",
-            "expected columns",
-            name,
-        ));
-    }
-
-    if vec![&after, &before]
-        .iter()
-        .map(|o| if o.is_some() { 1 } else { 0 })
-        .sum::<usize>()
-        > 1
-    {
-        return Err(ShellError::labeled_error(
-            "can't move column(s)",
-            "pick exactly one (before, after)",
-            name,
-        ));
-    }
-
-    if let Some(after) = after {
-        let member = columns.remove(0);
-
-        Ok(args
-            .input
-            .map(move |item| {
-                let member = vec![member.clone()];
-                let column_paths = vec![&member, &columns]
-                    .into_iter()
-                    .flatten()
-                    .collect::<Vec<&ColumnPath>>();
-
-                let after_span = after.maybe_span().unwrap_or_else(Span::unknown);
-
-                if after.members().len() == 1 {
-                    let keys = column_paths
-                        .iter()
-                        .filter_map(|c| c.last())
-                        .map(|c| c.as_string())
-                        .collect::<Vec<_>>();
-
-                    if let Some(column) = after.last() {
-                        if !keys.contains(&column.as_string()) {
-                            move_after(&item, &keys, &after)
-                        } else {
-                            let msg =
-                                format!("can't move column {} after itself", column.as_string());
-                            Err(ShellError::labeled_error(
-                                "can't move column",
-                                msg,
-                                after_span,
-                            ))
-                        }
-                    } else {
-                        Err(ShellError::labeled_error(
-                            "expected column",
-                            "expected column",
-                            after_span,
-                        ))
-                    }
-                } else {
-                    Err(ShellError::labeled_error(
-                        "expected column",
-                        "expected column",
-                        after_span,
-                    ))
-                }
-            })
-            .into_input_stream())
-    } else if let Some(before) = before {
-        let member = columns.remove(0);
-
-        Ok(args
-            .input
-            .map(move |item| {
-                let member = vec![member.clone()];
-                let column_paths = vec![&member, &columns]
-                    .into_iter()
-                    .flatten()
-                    .collect::<Vec<&ColumnPath>>();
-
-                let before_span = before.maybe_span().unwrap_or_else(Span::unknown);
-
-                if before.members().len() == 1 {
-                    let keys = column_paths
-                        .iter()
-                        .filter_map(|c| c.last())
-                        .map(|c| c.as_string())
-                        .collect::<Vec<_>>();
-
-                    if let Some(column) = before.last() {
-                        if !keys.contains(&column.as_string()) {
-                            move_before(&item, &keys, &before)
-                        } else {
-                            let msg =
-                                format!("can't move column {} before itself", column.as_string());
-                            Err(ShellError::labeled_error(
-                                "can't move column",
-                                msg,
-                                before_span,
-                            ))
-                        }
-                    } else {
-                        Err(ShellError::labeled_error(
-                            "expected column",
-                            "expected column",
-                            before_span,
-                        ))
-                    }
-                } else {
-                    Err(ShellError::labeled_error(
-                        "expected column",
-                        "expected column",
-                        before_span,
-                    ))
-                }
-            })
-            .into_input_stream())
-    } else {
-        Err(ShellError::labeled_error(
-            "no columns given",
-            "no columns given",
-            name,
-        ))
-    }
-}
-
-fn move_after(table: &Value, columns: &[String], from: &ColumnPath) -> Result<Value, ShellError> {
-    let from_fields = from.maybe_span().unwrap_or_else(Span::unknown);
-    let from = if let Some((last, _)) = from.split_last() {
-        last.as_string()
-    } else {
-        return Err(ShellError::labeled_error(
-            "unknown column",
-            "unknown column",
-            from_fields,
-        ));
-    };
-
-    let columns_moved = table.data_descriptors().into_iter().map(|name| {
-        if columns.contains(&name) {
-            None
-        } else {
-            Some(name)
-        }
-    });
-
-    let mut reordered_columns = vec![];
-    let mut insert = false;
-    let mut inserted = false;
-
-    for name in columns_moved {
-        if let Some(name) = name {
-            reordered_columns.push(Some(name.clone()));
-
-            if !inserted && name == from {
-                insert = true;
-            }
-        } else {
-            reordered_columns.push(None);
-        }
-
-        if insert {
-            for column in columns {
-                reordered_columns.push(Some(column.clone()));
-            }
-            inserted = true;
-        }
-    }
-
-    Ok(select_fields(
-        table,
-        &reordered_columns.into_iter().flatten().collect::<Vec<_>>(),
-        &table.tag,
-    ))
-}
-
-fn move_before(table: &Value, columns: &[String], from: &ColumnPath) -> Result<Value, ShellError> {
-    let from_fields = from.maybe_span().unwrap_or_else(Span::unknown);
-    let from = if let Some((last, _)) = from.split_last() {
-        last.as_string()
-    } else {
-        return Err(ShellError::labeled_error(
-            "unknown column",
-            "unknown column",
-            from_fields,
-        ));
-    };
-
-    let columns_moved = table.data_descriptors().into_iter().map(|name| {
-        if columns.contains(&name) {
-            None
-        } else {
-            Some(name)
-        }
-    });
-
-    let mut reordered_columns = vec![];
-    let mut inserted = false;
-
-    for name in columns_moved {
-        if let Some(name) = name {
-            if !inserted && name == from {
-                for column in columns {
-                    reordered_columns.push(Some(column.clone()));
-                }
-
-                inserted = true;
-            }
-
-            reordered_columns.push(Some(name.clone()));
-        } else {
-            reordered_columns.push(None);
-        }
-    }
-
-    Ok(select_fields(
-        table,
-        &reordered_columns.into_iter().flatten().collect::<Vec<_>>(),
-        &table.tag,
-    ))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/nth.rs b/old_nushell/crates/nu-command/src/commands/filters/nth.rs
deleted file mode 100644
index 510477dac..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/nth.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-use nu_source::Tagged;
-
-pub struct Nth;
-
-impl WholeStreamCommand for Nth {
-    fn name(&self) -> &str {
-        "nth"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("nth")
-            .required(
-                "row number",
-                SyntaxShape::Int,
-                "the number of the row to return",
-            )
-            .rest("rest", SyntaxShape::Any, "Optionally return more rows")
-            .switch("skip", "Skip the rows instead of selecting them", Some('s'))
-    }
-
-    fn usage(&self) -> &str {
-        "Return or skip only the selected rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        nth(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get the second row",
-                example: "echo [first second third] | nth 1",
-                result: Some(vec![Value::from("second")]),
-            },
-            Example {
-                description: "Get the first and third rows",
-                example: "echo [first second third] | nth 0 2",
-                result: Some(vec![Value::from("first"), Value::from("third")]),
-            },
-            Example {
-                description: "Skip the first and third rows",
-                example: "echo [first second third] | nth --skip 0 2",
-                result: Some(vec![Value::from("second")]),
-            },
-        ]
-    }
-}
-
-fn nth(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let row_number: Tagged<u64> = args.req(0)?;
-    let and_rows: Vec<Tagged<u64>> = args.rest(1)?;
-    let skip = args.has_flag("skip");
-    let input = args.input;
-
-    let mut rows: Vec<_> = and_rows.into_iter().map(|x| x.item as usize).collect();
-    rows.push(row_number.item as usize);
-    rows.sort_unstable();
-
-    Ok(NthIterator {
-        input,
-        rows,
-        skip,
-        current: 0,
-    }
-    .into_output_stream())
-}
-
-struct NthIterator {
-    input: InputStream,
-    rows: Vec<usize>,
-    skip: bool,
-    current: usize,
-}
-
-impl Iterator for NthIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        loop {
-            if !self.skip {
-                if let Some(row) = self.rows.get(0) {
-                    if self.current == *row {
-                        self.rows.remove(0);
-                        self.current += 1;
-                        return self.input.next();
-                    } else {
-                        self.current += 1;
-                        let _ = self.input.next();
-                        continue;
-                    }
-                } else {
-                    return None;
-                }
-            } else if let Some(row) = self.rows.get(0) {
-                if self.current == *row {
-                    self.rows.remove(0);
-                    self.current += 1;
-                    let _ = self.input.next();
-                    continue;
-                } else {
-                    self.current += 1;
-                    return self.input.next();
-                }
-            } else {
-                return self.input.next();
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/pivot.rs b/old_nushell/crates/nu-command/src/commands/filters/pivot.rs
deleted file mode 100644
index 2ae659e21..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/pivot.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    merge_descriptors, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue,
-};
-use nu_source::{SpannedItem, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct Pivot;
-
-#[derive(Deserialize)]
-pub struct PivotArgs {
-    rest: Vec<Tagged<String>>,
-    #[serde(rename(deserialize = "header-row"))]
-    header_row: bool,
-    #[serde(rename(deserialize = "ignore-titles"))]
-    ignore_titles: bool,
-}
-
-impl WholeStreamCommand for Pivot {
-    fn name(&self) -> &str {
-        "pivot"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pivot")
-            .switch(
-                "header-row",
-                "treat the first row as column names",
-                Some('r'),
-            )
-            .switch(
-                "ignore-titles",
-                "don't pivot the column names into values",
-                Some('i'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the names to give columns once pivoted",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Pivots the table contents so rows become columns and columns become rows."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        pivot(args)
-    }
-}
-
-pub fn pivot(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    //let (args, input): (PivotArgs, _) = args.process()?;
-    let pivot_args = PivotArgs {
-        header_row: args.has_flag("header-row"),
-        ignore_titles: args.has_flag("ignore-titles"),
-        rest: args.rest(0)?,
-    };
-    let input = args.input.into_vec();
-    let args = pivot_args;
-
-    let descs = merge_descriptors(&input);
-
-    let mut headers: Vec<String> = vec![];
-
-    if !args.rest.is_empty() && args.header_row {
-        return Err(ShellError::labeled_error(
-            "Can not provide header names and use header row",
-            "using header row",
-            name,
-        ));
-    }
-
-    if args.header_row {
-        for i in input.clone() {
-            if let Some(desc) = descs.get(0) {
-                match &i.get_data_by_key(desc[..].spanned_unknown()) {
-                    Some(x) => {
-                        if let Ok(s) = x.as_string() {
-                            headers.push(s.to_string());
-                        } else {
-                            return Err(ShellError::labeled_error(
-                                "Header row needs string headers",
-                                "used non-string headers",
-                                name,
-                            ));
-                        }
-                    }
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Header row is incomplete and can't be used",
-                            "using incomplete header row",
-                            name,
-                        ));
-                    }
-                }
-            } else {
-                return Err(ShellError::labeled_error(
-                    "Header row is incomplete and can't be used",
-                    "using incomplete header row",
-                    name,
-                ));
-            }
-        }
-    } else {
-        for i in 0..=input.len() {
-            if let Some(name) = args.rest.get(i) {
-                headers.push(name.to_string())
-            } else {
-                headers.push(format!("Column{}", i));
-            }
-        }
-    }
-
-    let descs: Vec<_> = if args.header_row {
-        descs.into_iter().skip(1).collect()
-    } else {
-        descs
-    };
-
-    Ok((descs.into_iter().map(move |desc| {
-        let mut column_num: usize = 0;
-        let mut dict = TaggedDictBuilder::new(&name);
-
-        if !args.ignore_titles && !args.header_row {
-            dict.insert_untagged(
-                headers[column_num].clone(),
-                UntaggedValue::string(desc.clone()),
-            );
-            column_num += 1
-        }
-
-        for i in input.clone() {
-            match &i.get_data_by_key(desc[..].spanned_unknown()) {
-                Some(x) => {
-                    dict.insert_value(headers[column_num].clone(), x.clone());
-                }
-                _ => {
-                    dict.insert_untagged(headers[column_num].clone(), UntaggedValue::nothing());
-                }
-            }
-            column_num += 1;
-        }
-
-        ReturnSuccess::value(dict.into_value())
-    }))
-    .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Pivot;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Pivot {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/prepend.rs b/old_nushell/crates/nu-command/src/commands/filters/prepend.rs
deleted file mode 100644
index 8dd98a68d..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/prepend.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct Prepend;
-
-impl WholeStreamCommand for Prepend {
-    fn name(&self) -> &str {
-        "prepend"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("prepend").required(
-            "row value",
-            SyntaxShape::Any,
-            "the value of the row to prepend to the table",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Prepend the given row to the front of the table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        prepend(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Add something to the beginning of a list or table",
-            example: "echo [2 3 4] | prepend 1",
-            result: Some(vec![
-                UntaggedValue::int(1).into(),
-                UntaggedValue::int(2).into(),
-                UntaggedValue::int(3).into(),
-                UntaggedValue::int(4).into(),
-            ]),
-        }]
-    }
-}
-
-fn prepend(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let row: Value = args.req(0)?;
-    let input = args.input;
-
-    let bos = vec![row].into_iter();
-
-    Ok(bos.chain(input).into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Prepend;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Prepend {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/range.rs b/old_nushell/crates/nu-command/src/commands/filters/range.rs
deleted file mode 100644
index 93feadb7c..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/range.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-struct RangeArgs {
-    range: nu_protocol::Range,
-}
-
-pub struct Range;
-
-impl WholeStreamCommand for Range {
-    fn name(&self) -> &str {
-        "range"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("range").required(
-            "rows",
-            SyntaxShape::Range,
-            "range of rows to return: Eg) 4..7 (=> from 4 to 7)",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Return only the selected rows."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Return rows 1 through 3",
-                example: "echo [1 2 3 4 5] | range 1..3",
-                result: Some(vec![
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-            Example {
-                description: "Return the third row from the end, through to the end",
-                example: "echo [1 2 3 4 5] | range (-3..)",
-                result: Some(vec![
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(5).into(),
-                ]),
-            },
-        ]
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        range(args)
-    }
-}
-
-fn range(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let cmd_args = RangeArgs {
-        range: args.req(0)?,
-    };
-
-    let from_raw = cmd_args.range.min_i64()?;
-    let to_raw = cmd_args.range.max_i64()?;
-    // only collect the input if we have any negative indices
-    if from_raw < 0 || to_raw < 0 {
-        let input = args.input.into_vec();
-        let input_size = input.len() as i64;
-
-        let from = if from_raw < 0 {
-            (input_size + from_raw) as usize
-        } else {
-            from_raw as usize
-        };
-
-        let to = if to_raw < 0 {
-            (input_size + to_raw) as usize
-        } else if to_raw > input.len() as i64 {
-            input.len()
-        } else {
-            to_raw as usize
-        };
-
-        if from > to {
-            Ok(OutputStream::one(Value::nothing()))
-        } else {
-            Ok(OutputStream::from(input[from..to].to_vec()))
-        }
-    } else {
-        let from = from_raw as usize;
-        let to = to_raw as usize;
-        if from > to {
-            Ok(OutputStream::one(Value::nothing()))
-        } else {
-            Ok(args
-                .input
-                .skip(from)
-                .take(to - from + 1)
-                .into_output_stream())
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Range;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Range {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/reduce.rs b/old_nushell/crates/nu-command/src/commands/filters/reduce.rs
deleted file mode 100644
index bacb0601b..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/reduce.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-use super::each;
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_engine::{CommandArgs, Example};
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ExternalRedirection, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_stream::ActionStream;
-
-pub struct Reduce;
-
-#[derive(Deserialize)]
-pub struct ReduceArgs {
-    block: CapturedBlock,
-    fold: Option<Value>,
-    numbered: bool,
-}
-
-impl WholeStreamCommand for Reduce {
-    fn name(&self) -> &str {
-        "reduce"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("reduce")
-            .named(
-                "fold",
-                SyntaxShape::Any,
-                "reduce with initial value",
-                Some('f'),
-            )
-            .required("block", SyntaxShape::Block, "reducing function")
-            .switch(
-                "numbered",
-                "returned a numbered item ($it.index and $it.item)",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Aggregate a list table to a single value using an accumulator block."
-    }
-
-    fn extra_usage(&self) -> &str {
-        "Block must be (A, A) -> A unless --fold is selected, in which case it may be A, B -> A."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        reduce(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Simple summation (equivalent to math sum)",
-                example: "echo 1 2 3 4 | reduce { $acc + $it }",
-                result: Some(vec![UntaggedValue::int(10).into()]),
-            },
-            Example {
-                description: "Summation from starting value using fold",
-                example: "echo 1 2 3 4 | reduce -f (-1) { $acc + $it }",
-                result: Some(vec![UntaggedValue::int(9).into()]),
-            },
-            Example {
-                description: "Folding with rows",
-                example: "<table> | reduce -f 1.6 { $acc * (echo $it.a | str to-int) + (echo $it.b | str to-int) }",
-                result: None,
-            },
-            Example {
-                description: "Numbered reduce to find index of longest word",
-                example: "echo one longest three bar | reduce -n { if ($it.item | str length) > ($acc.item | str length) {echo $it} {echo $acc}} | get index",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn process_row(
-    block: Arc<CapturedBlock>,
-    context: &EvaluationContext,
-    row: Value,
-) -> Result<InputStream, ShellError> {
-    let row_clone = row.clone();
-    let input_stream = vec![Ok(row_clone)].into_iter().into_input_stream();
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&block.captured.entries);
-
-    if let Some((arg, _)) = block.block.params.positional.first() {
-        context.scope.add_var(arg.name(), row);
-    } else {
-        context.scope.add_var("$it", row);
-    }
-
-    let result = run_block(
-        &block.block,
-        context,
-        input_stream,
-        ExternalRedirection::Stdout,
-    );
-    context.scope.exit_scope();
-
-    result
-}
-
-fn reduce(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let span = args.call_info.name_tag.span;
-    let context = Arc::new(args.context.clone());
-    let reduce_args = ReduceArgs {
-        block: args.req(0)?,
-        fold: args.get_flag("fold")?,
-        numbered: args.has_flag("numbered"),
-    };
-    let mut input = args.input;
-
-    let block = Arc::new(reduce_args.block);
-    let (ioffset, start) = if !input.is_empty() {
-        match reduce_args.fold {
-            None => {
-                let first = input.next().expect("non-empty stream");
-
-                (1, first)
-            }
-            Some(acc) => (0, acc),
-        }
-    } else {
-        return Err(ShellError::labeled_error(
-            "Expected input",
-            "needs input",
-            span,
-        ));
-    };
-
-    if reduce_args.numbered {
-        // process_row returns Result<InputStream, ShellError>, so we must fold with one
-        let initial = Ok(InputStream::one(each::make_indexed_item(
-            ioffset - 1,
-            start,
-        )));
-
-        Ok(input
-            .enumerate()
-            .fold(initial, move |acc, input| {
-                let context = context.clone();
-                let block = Arc::clone(&block);
-                let row = each::make_indexed_item(input.0 + ioffset, input.1);
-
-                let values = acc?.drain_vec();
-
-                let f = if values.len() == 1 {
-                    let value = values
-                        .get(0)
-                        .ok_or_else(|| ShellError::unexpected("No value to update with"))?;
-                    value.clone()
-                } else if values.is_empty() {
-                    UntaggedValue::nothing().into_untagged_value()
-                } else {
-                    UntaggedValue::table(&values).into_untagged_value()
-                };
-
-                context.scope.enter_scope();
-                context.scope.add_var("$acc", f);
-                let result = process_row(block, &context, row);
-                context.scope.exit_scope();
-
-                // we make sure that result is an indexed item
-                result.and_then(|mut acc| {
-                    let values = acc.drain_vec();
-                    let value = values
-                        .get(0)
-                        .ok_or_else(|| ShellError::unexpected("No value to update with"))?;
-                    Ok(InputStream::one(match value.value {
-                        UntaggedValue::Primitive(_) => each::make_indexed_item(0, value.clone()),
-                        _ => value.clone(),
-                    }))
-                })
-            })?
-            .into_action_stream())
-    } else {
-        let initial = Ok(InputStream::one(start));
-        Ok(input
-            .fold(initial, move |acc, row| {
-                let block = Arc::clone(&block);
-                let context = context.clone();
-
-                let values = acc?.drain_vec();
-
-                let f = if values.len() == 1 {
-                    let value = values
-                        .get(0)
-                        .ok_or_else(|| ShellError::unexpected("No value to update with"))?;
-                    value.clone()
-                } else if values.is_empty() {
-                    UntaggedValue::nothing().into_untagged_value()
-                } else {
-                    UntaggedValue::table(&values).into_untagged_value()
-                };
-
-                context.scope.enter_scope();
-                context.scope.add_var("$acc", f);
-                let result = process_row(block, &context, row);
-                context.scope.exit_scope();
-                result
-            })?
-            .into_action_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Reduce;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Reduce {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/reject.rs b/old_nushell/crates/nu-command/src/commands/filters/reject.rs
deleted file mode 100644
index 0e91aba1d..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/reject.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::reject_fields;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape};
-use nu_source::Tagged;
-
-pub struct Reject;
-
-impl WholeStreamCommand for Reject {
-    fn name(&self) -> &str {
-        "reject"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("reject").rest(
-            "rest",
-            SyntaxShape::String,
-            "the names of columns to remove",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Remove the given columns from the table. If you want to remove rows, try 'drop'."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        reject(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Lists the files in a directory without showing the modified column",
-            example: "ls | reject modified",
-            result: None,
-        }]
-    }
-}
-
-fn reject(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let fields: Vec<Tagged<String>> = args.rest(0)?;
-
-    if fields.is_empty() {
-        return Err(ShellError::labeled_error(
-            "Reject requires fields",
-            "needs parameter",
-            name,
-        ));
-    }
-
-    let fields: Vec<_> = fields.iter().map(|f| f.item.clone()).collect();
-
-    Ok(args
-        .input
-        .map(move |item| ReturnSuccess::value(reject_fields(&item, &fields, &item.tag)))
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Reject;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Reject {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/rename.rs b/old_nushell/crates/nu-command/src/commands/filters/rename.rs
deleted file mode 100644
index d6ffbdb32..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/rename.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::prelude::*;
-use indexmap::indexmap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Rename;
-
-impl WholeStreamCommand for Rename {
-    fn name(&self) -> &str {
-        "rename"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("rename")
-            .required(
-                "column_name",
-                SyntaxShape::String,
-                "the new name for the first column",
-            )
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "the new name for additional columns",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a new table with columns renamed."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        rename(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Rename a column",
-                example: "echo [[a, b]; [1, 2]] | rename my_column",
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "my_column".to_string() => UntaggedValue::int(1).into(),
-                        "b".to_string() => UntaggedValue::int(2).into(),
-                })
-                .into()]),
-            },
-            Example {
-                description: "Rename many columns",
-                example: "echo [[a, b, c]; [1, 2, 3]] | rename eggs ham bacon",
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "eggs".to_string() => UntaggedValue::int(1).into(),
-                        "ham".to_string() => UntaggedValue::int(2).into(),
-                        "bacon".to_string() => UntaggedValue::int(3).into(),
-                })
-                .into()]),
-            },
-        ]
-    }
-}
-
-pub fn rename(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let column_name: Tagged<String> = args.req(0)?;
-    let rest: Vec<Tagged<String>> = args.rest(1)?;
-    let input = args.input;
-
-    let mut new_column_names = vec![vec![column_name]];
-    new_column_names.push(rest);
-
-    let new_column_names = new_column_names.into_iter().flatten().collect::<Vec<_>>();
-
-    Ok(input
-        .map(move |item| {
-            if let Value {
-                value: UntaggedValue::Row(row),
-                tag,
-            } = item
-            {
-                let mut renamed_row = IndexMap::new();
-
-                for (idx, (key, value)) in row.entries.iter().enumerate() {
-                    let key = if idx < new_column_names.len() {
-                        &new_column_names[idx].item
-                    } else {
-                        key
-                    };
-
-                    renamed_row.insert(key.clone(), value.clone());
-                }
-
-                let out = UntaggedValue::Row(renamed_row.into()).into_value(tag);
-
-                ReturnSuccess::value(out)
-            } else {
-                ReturnSuccess::value(
-                    UntaggedValue::Error(ShellError::labeled_error(
-                        "no column names available",
-                        "can't rename",
-                        &name,
-                    ))
-                    .into_untagged_value(),
-                )
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Rename;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Rename {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/reverse.rs b/old_nushell/crates/nu-command/src/commands/filters/reverse.rs
deleted file mode 100644
index dbd7ee939..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/reverse.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-
-pub struct Reverse;
-
-impl WholeStreamCommand for Reverse {
-    fn name(&self) -> &str {
-        "reverse"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("reverse")
-    }
-
-    fn usage(&self) -> &str {
-        "Reverses the table."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        reverse(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Sort list of numbers in descending file size",
-            example: "echo [3 1 2 19 0] | reverse",
-            result: Some(vec![
-                UntaggedValue::int(0).into(),
-                UntaggedValue::int(19).into(),
-                UntaggedValue::int(2).into(),
-                UntaggedValue::int(1).into(),
-                UntaggedValue::int(3).into(),
-            ]),
-        }]
-    }
-}
-
-#[allow(clippy::needless_collect)]
-fn reverse(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    // Clippy warning should be ignored
-    // This collect is needed to apply rev
-    let input = args.input.collect::<Vec<_>>();
-    Ok((input.into_iter().rev().map(ReturnSuccess::value)).into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Reverse;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Reverse {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/roll/column.rs b/old_nushell/crates/nu-command/src/commands/filters/roll/column.rs
deleted file mode 100644
index 6650babd0..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/roll/column.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::select_fields;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tagged;
-
-use super::support::{rotate, Direction};
-
-pub struct SubCommand;
-
-pub struct Arguments {
-    by: Option<Tagged<u64>>,
-    opposite: bool,
-    cells_only: bool,
-}
-
-impl Arguments {
-    fn direction(&self) -> Direction {
-        if self.opposite {
-            return Direction::Left;
-        }
-
-        Direction::Right
-    }
-
-    fn move_headers(&self) -> bool {
-        !self.cells_only
-    }
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "roll column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("roll column")
-            .optional("by", SyntaxShape::Int, "the number of times to roll")
-            .switch("opposite", "roll in the opposite direction", Some('o'))
-            .switch("cells-only", "only roll the cells", Some('c'))
-    }
-
-    fn usage(&self) -> &str {
-        "Rolls the table columns"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        roll(args)
-    }
-}
-
-pub fn roll(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let options = Arguments {
-        by: args.opt(0)?,
-        opposite: args.has_flag("opposite"),
-        cells_only: args.has_flag("cells-only"),
-    };
-
-    Ok(args
-        .input
-        .flat_map(move |value| {
-            let tag = value.tag();
-
-            roll_by(value, &options)
-                .unwrap_or_else(|| vec![UntaggedValue::nothing().into_value(tag)])
-        })
-        .into_output_stream())
-}
-
-fn roll_by(value: Value, options: &Arguments) -> Option<Vec<Value>> {
-    let tag = value.tag();
-    let direction = options.direction();
-
-    if value.is_row() {
-        let columns = value.data_descriptors();
-        if options.move_headers() {
-            if let Some(fields) = rotate(columns, &options.by, direction) {
-                return Some(vec![select_fields(&value, &fields, &tag)]);
-            }
-        } else {
-            let values_rotated = rotate(
-                value
-                    .row_entries()
-                    .map(|(_, value)| value.clone())
-                    .collect::<Vec<_>>(),
-                &options.by,
-                direction,
-            );
-
-            if let Some(ref values) = values_rotated {
-                let mut out = TaggedDictBuilder::new(&tag);
-
-                for (k, v) in columns.iter().zip(values) {
-                    out.insert_value(k, v.clone());
-                }
-
-                return Some(vec![out.into_value()]);
-            }
-        }
-        None
-    } else if value.is_table() {
-        rotate(
-            value.table_entries().cloned().collect(),
-            &options.by,
-            direction,
-        )
-    } else {
-        Some(vec![value])
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/roll/command.rs b/old_nushell/crates/nu-command/src/commands/filters/roll/command.rs
deleted file mode 100644
index 7cda6350b..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/roll/command.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-use super::support::{rotate, Direction};
-
-pub struct Command;
-
-pub struct Arguments {
-    by: Option<Tagged<u64>>,
-}
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "roll"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("roll").optional("by", SyntaxShape::Int, "the number of times to roll")
-    }
-
-    fn usage(&self) -> &str {
-        "Rolls the table rows."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        roll(args)
-    }
-}
-
-pub fn roll(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let options = Arguments { by: args.opt(0)? };
-
-    let values = args.input.drain_vec();
-
-    Ok(roll_down(values, &options)
-        .unwrap_or_else(|| vec![UntaggedValue::nothing().into_value(&name)])
-        .into_iter()
-        .into_output_stream())
-}
-
-fn roll_down(values: Vec<Value>, Arguments { by: ref n }: &Arguments) -> Option<Vec<Value>> {
-    rotate(values, n, Direction::Down)
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/roll/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/roll/mod.rs
deleted file mode 100644
index a74a70df8..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/roll/mod.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-mod column;
-mod command;
-mod up;
-
-pub use column::SubCommand as RollColumn;
-pub use command::Command as Roll;
-pub use up::SubCommand as RollUp;
-
-mod support {
-
-    pub enum Direction {
-        Left,
-        Right,
-        Down,
-        Up,
-    }
-
-    pub fn rotate<T: Clone>(
-        mut collection: Vec<T>,
-        n: &Option<nu_source::Tagged<u64>>,
-        direction: Direction,
-    ) -> Option<Vec<T>> {
-        if collection.is_empty() {
-            return None;
-        }
-
-        let values = collection.as_mut_slice();
-
-        let rotations = if let Some(n) = n {
-            n.item as usize % values.len()
-        } else {
-            1
-        };
-
-        match direction {
-            Direction::Up | Direction::Right => values.rotate_left(rotations),
-            Direction::Down | Direction::Left => values.rotate_right(rotations),
-        }
-
-        Some(values.to_vec())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/roll/up.rs b/old_nushell/crates/nu-command/src/commands/filters/roll/up.rs
deleted file mode 100644
index 47d26c05b..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/roll/up.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-use super::support::{rotate, Direction};
-
-pub struct SubCommand;
-
-#[derive(Deserialize)]
-pub struct Arguments {
-    by: Option<Tagged<u64>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "roll up"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("roll up").optional("by", SyntaxShape::Int, "the number of times to roll")
-    }
-
-    fn usage(&self) -> &str {
-        "Rolls the table rows"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        roll(args)
-    }
-}
-
-pub fn roll(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let options = Arguments { by: args.opt(0)? };
-
-    let values = args.input.drain_vec();
-
-    Ok(roll_up(values, &options)
-        .unwrap_or_else(|| vec![UntaggedValue::nothing().into_value(&name)])
-        .into_iter()
-        .into_output_stream())
-}
-
-fn roll_up(values: Vec<Value>, Arguments { by: ref n }: &Arguments) -> Option<Vec<Value>> {
-    rotate(values, n, Direction::Up)
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/rotate/command.rs b/old_nushell/crates/nu-command/src/commands/filters/rotate/command.rs
deleted file mode 100644
index 2d2516c36..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/rotate/command.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    merge_descriptors, ColumnPath, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder,
-    UntaggedValue,
-};
-use nu_source::{SpannedItem, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "rotate"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("rotate").rest(
-            "rest",
-            SyntaxShape::String,
-            "the names to give columns once rotated",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Rotates the table by 90 degrees clockwise."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        rotate(args)
-    }
-}
-
-pub fn rotate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let rest: Vec<Tagged<String>> = args.rest(0)?;
-    let input = args.input.into_vec();
-
-    let total_rows = input.len();
-    let descs = merge_descriptors(&input);
-    let total_descriptors = descs.len();
-
-    let descs = descs.into_iter().rev().collect::<Vec<_>>();
-
-    if total_rows == 0 {
-        return Ok(ActionStream::empty());
-    }
-
-    let mut headers: Vec<String> = vec![];
-
-    for i in 0..=total_rows {
-        headers.push(format!("Column{}", i));
-    }
-
-    let first = input[0].clone();
-
-    let name = if first.tag.anchor().is_some() {
-        first.tag
-    } else {
-        name
-    };
-
-    let values =
-        UntaggedValue::table(&input.into_iter().rev().collect::<Vec<_>>()).into_value(&name);
-
-    let values = nu_data::utils::group(
-        &values,
-        &Some(Box::new(move |row_number: usize, _| {
-            Ok(match headers.get(row_number) {
-                Some(name) => name.clone(),
-                None => String::new(),
-            })
-        })),
-        &name,
-    )?;
-
-    Ok(((0..total_descriptors)
-        .map(move |row_number| {
-            let mut row = TaggedDictBuilder::new(&name);
-
-            for (current_numbered_column, (column_name, _)) in values.row_entries().enumerate() {
-                let raw_column_path =
-                    format!("{}.0.{}", column_name, descs[row_number]).spanned_unknown();
-                let path = ColumnPath::build(&raw_column_path);
-
-                match &values.get_data_by_column_path(&path, Box::new(move |_, _, error| error)) {
-                    Ok(x) => {
-                        row.insert_value(
-                            rest.get(current_numbered_column)
-                                .map(|c| c.item.clone())
-                                .unwrap_or_else(|| column_name.to_string()),
-                            x.clone(),
-                        );
-                    }
-                    Err(_) => {}
-                }
-            }
-
-            row.insert_value(
-                rest.get(total_rows)
-                    .map(|c| c.item.clone())
-                    .unwrap_or_else(|| format!("Column{}", total_rows)),
-                UntaggedValue::string(&descs[row_number]).into_untagged_value(),
-            );
-
-            ReturnSuccess::value(row.into_value())
-        })
-        .rev()
-        .collect::<Vec<_>>())
-    .into_iter()
-    .into_action_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/rotate/counter_clockwise.rs b/old_nushell/crates/nu-command/src/commands/filters/rotate/counter_clockwise.rs
deleted file mode 100644
index dc95cb398..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/rotate/counter_clockwise.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    merge_descriptors, ColumnPath, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder,
-    UntaggedValue,
-};
-use nu_source::{SpannedItem, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "rotate counter-clockwise"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("rotate counter-clockwise").rest(
-            "rest",
-            SyntaxShape::String,
-            "the names to give columns once rotated",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Rotates the table by 90 degrees counter clockwise."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        rotate(args)
-    }
-}
-
-pub fn rotate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let rest: Vec<Tagged<String>> = args.rest(0)?;
-
-    let input = args.input.into_vec();
-    let descs = merge_descriptors(&input);
-    let total_rows = input.len();
-
-    if total_rows == 0 {
-        return Ok(ActionStream::empty());
-    }
-
-    let mut headers: Vec<String> = vec![];
-    for i in 0..=total_rows {
-        headers.push(format!("Column{}", i + 1));
-    }
-
-    let first = input[0].clone();
-
-    let name = if first.tag.anchor().is_some() {
-        first.tag
-    } else {
-        name
-    };
-
-    let values = UntaggedValue::table(&input).into_value(&name);
-
-    let values = nu_data::utils::group(
-        &values,
-        &Some(Box::new(move |row_number: usize, _| {
-            Ok(match headers.get(row_number) {
-                Some(name) => name.clone(),
-                None => String::new(),
-            })
-        })),
-        &name,
-    )?;
-
-    Ok(((0..descs.len())
-        .rev()
-        .map(move |row_number| {
-            let mut row = TaggedDictBuilder::new(&name);
-
-            row.insert_value(
-                rest.get(0)
-                    .map(|c| c.item.clone())
-                    .unwrap_or_else(|| String::from("Column0")),
-                UntaggedValue::string(descs.get(row_number).unwrap_or(&String::new()))
-                    .into_untagged_value(),
-            );
-
-            for (current_numbered_column, (column_name, _)) in values.row_entries().enumerate() {
-                let raw_column_path =
-                    format!("{}.0.{}", column_name, &descs[row_number]).spanned_unknown();
-                let path = ColumnPath::build(&raw_column_path);
-
-                match &values.get_data_by_column_path(&path, Box::new(move |_, _, error| error)) {
-                    Ok(x) => {
-                        row.insert_value(
-                            rest.get(current_numbered_column + 1)
-                                .map(|c| c.item.clone())
-                                .unwrap_or_else(|| column_name.to_string()),
-                            x.clone(),
-                        );
-                    }
-                    Err(_) => {}
-                }
-            }
-
-            ReturnSuccess::value(row.into_value())
-        })
-        .collect::<Vec<_>>())
-    .into_iter()
-    .into_action_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/rotate/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/rotate/mod.rs
deleted file mode 100644
index 16b4d8c06..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/rotate/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod command;
-mod counter_clockwise;
-
-pub use command::Command as Rotate;
-pub use counter_clockwise::SubCommand as RotateCounterClockwise;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/select.rs b/old_nushell/crates/nu-command/src/commands/filters/select.rs
deleted file mode 100644
index 41e1ff126..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/select.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    ColumnPath, PathMember, Primitive, Signature, SyntaxShape, TaggedDictBuilder,
-    UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_value_ext::{as_string, get_data_by_column_path};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "select"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("select")
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "the columns to select from the table",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Down-select table to only these columns."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let mut columns = args.rest(0)?;
-        columns.extend(column_paths_from_args(&args)?);
-        let input = args.input;
-        let name = args.call_info.name_tag;
-        select(name, columns, input)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Select just the name column",
-                example: "ls | select name",
-                result: None,
-            },
-            Example {
-                description: "Select the name and size columns",
-                example: "ls | select name size",
-                result: None,
-            },
-            Example {
-                description: "Select columns dynamically",
-                example: "[[a b]; [1 2]] | select -c [a]",
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                    "a".to_string() => UntaggedValue::int(1).into(),
-                })
-                .into()]),
-            },
-        ]
-    }
-}
-
-fn column_paths_from_args(args: &CommandArgs) -> Result<Vec<ColumnPath>, ShellError> {
-    let column_paths: Option<Vec<Value>> = args.get_flag("columns")?;
-    let has_columns = column_paths.is_some();
-    let column_paths = match column_paths {
-        Some(cols) => {
-            let mut c = Vec::new();
-            for col in cols {
-                let colpath = ColumnPath::build(&col.convert_to_string().spanned_unknown());
-                if !colpath.is_empty() {
-                    c.push(colpath)
-                }
-            }
-            c
-        }
-        None => Vec::new(),
-    };
-
-    if has_columns && column_paths.is_empty() {
-        let colval: Option<Value> = args.get_flag("columns")?;
-        let colspan = match colval {
-            Some(v) => v.tag.span,
-            None => Span::unknown(),
-        };
-        return Err(ShellError::labeled_error(
-            "Requires a list of columns",
-            "must be a list of columns",
-            colspan,
-        ));
-    }
-
-    Ok(column_paths)
-}
-
-fn select(
-    name: Tag,
-    columns: Vec<ColumnPath>,
-    input: InputStream,
-) -> Result<OutputStream, ShellError> {
-    if columns.is_empty() {
-        return Err(ShellError::labeled_error(
-            "Select requires columns to select",
-            "needs parameter",
-            name,
-        ));
-    }
-
-    let mut bring_back: indexmap::IndexMap<String, Vec<Value>> = indexmap::IndexMap::new();
-
-    for value in input {
-        for path in &columns {
-            let fetcher = get_data_by_column_path(
-                &value,
-                path,
-                move |obj_source, path_member_tried, error| {
-                    if let PathMember {
-                        unspanned: UnspannedPathMember::String(column),
-                        ..
-                    } = path_member_tried
-                    {
-                        return ShellError::labeled_error_with_secondary(
-                        "No data to fetch.",
-                        format!("Couldn't select column \"{}\"", column),
-                        path_member_tried.span,
-                        "How about exploring it with \"get\"? Check the input is appropriate originating from here",
-                        obj_source.tag.span);
-                    }
-
-                    error
-                },
-            );
-
-            let field = path.clone();
-            let key = as_string(
-                &UntaggedValue::Primitive(Primitive::ColumnPath(field.clone()))
-                    .into_untagged_value(),
-            )?;
-
-            match fetcher {
-                Ok(results) => match results.value {
-                    UntaggedValue::Table(records) => {
-                        for x in records {
-                            let mut out = TaggedDictBuilder::new(name.clone());
-                            out.insert_untagged(&key, x.value.clone());
-                            let group = bring_back.entry(key.clone()).or_insert(vec![]);
-                            group.push(out.into_value());
-                        }
-                    }
-                    x => {
-                        let mut out = TaggedDictBuilder::new(name.clone());
-                        out.insert_untagged(&key, x.clone());
-                        let group = bring_back.entry(key.clone()).or_insert(vec![]);
-                        group.push(out.into_value());
-                    }
-                },
-                Err(reason) => {
-                    // At the moment, we can't add switches, named flags
-                    // and the like while already using .rest since it
-                    // breaks the parser.
-                    //
-                    // We allow flexibility for now and skip the error
-                    // if a given column isn't present.
-                    let strict: Option<bool> = None;
-
-                    if strict.is_some() {
-                        return Err(reason);
-                    }
-
-                    // No value for column 'key' found, insert nothing to make sure all rows contain all keys.
-                    bring_back
-                        .entry(key.clone())
-                        .or_insert(vec![])
-                        .push(UntaggedValue::nothing().into());
-                }
-            }
-        }
-    }
-
-    let mut max = 0;
-
-    if let Some(max_column) = bring_back.values().max() {
-        max = max_column.len();
-    }
-
-    let keys = bring_back.keys().cloned().collect::<Vec<String>>();
-
-    Ok(((0..max).map(move |current| {
-        let mut out = TaggedDictBuilder::new(name.clone());
-
-        for k in &keys {
-            let new_key = k.replace(".", "_");
-            let nothing = UntaggedValue::Primitive(Primitive::Nothing).into_untagged_value();
-            let subsets = bring_back.get(k);
-
-            match subsets {
-                Some(set) => match set.get(current) {
-                    Some(row) => out.insert_untagged(new_key, row.get_data(k).borrow().clone()),
-                    None => out.insert_untagged(new_key, nothing.clone()),
-                },
-                None => out.insert_untagged(new_key, nothing.clone()),
-            }
-        }
-
-        out.into_value()
-    }))
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use nu_protocol::ColumnPath;
-    use nu_source::Span;
-    use nu_source::SpannedItem;
-    use nu_source::Tag;
-    use nu_stream::InputStream;
-    use nu_test_support::value::nothing;
-    use nu_test_support::value::row;
-    use nu_test_support::value::string;
-
-    use super::select;
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-
-    #[test]
-    fn select_using_sparse_table() {
-        // Create a sparse table with 3 rows:
-        //   col_foo | col_bar
-        //   -----------------
-        //   foo     |
-        //           | bar
-        //   foo     |
-        let input = vec![
-            row(indexmap! {"col_foo".into() => string("foo")}),
-            row(indexmap! {"col_bar".into() => string("bar")}),
-            row(indexmap! {"col_foo".into() => string("foo")}),
-        ];
-
-        let expected = vec![
-            row(
-                indexmap! {"col_none".into() => nothing(), "col_foo".into() => string("foo"), "col_bar".into() => nothing()},
-            ),
-            row(
-                indexmap! {"col_none".into() => nothing(), "col_foo".into() => nothing(), "col_bar".into() => string("bar")},
-            ),
-            row(
-                indexmap! {"col_none".into() => nothing(), "col_foo".into() => string("foo"), "col_bar".into() => nothing()},
-            ),
-        ];
-
-        let actual = select(
-            Tag::unknown(),
-            vec![
-                ColumnPath::build(&"col_none".to_string().spanned(Span::unknown())),
-                ColumnPath::build(&"col_foo".to_string().spanned(Span::unknown())),
-                ColumnPath::build(&"col_bar".to_string().spanned(Span::unknown())),
-            ],
-            input.into(),
-        );
-
-        assert_eq!(Ok(expected), actual.map(InputStream::into_vec));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/shuffle.rs b/old_nushell/crates/nu-command/src/commands/filters/shuffle.rs
deleted file mode 100644
index 970f42270..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/shuffle.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Value};
-
-use rand::seq::SliceRandom;
-use rand::thread_rng;
-
-pub struct Shuffle;
-
-impl WholeStreamCommand for Shuffle {
-    fn name(&self) -> &str {
-        "shuffle"
-    }
-
-    fn usage(&self) -> &str {
-        "Shuffle rows randomly."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(shuffle(args))
-    }
-}
-
-fn shuffle(args: CommandArgs) -> ActionStream {
-    let input = args.input;
-    let mut values: Vec<Value> = input.collect();
-
-    values.shuffle(&mut thread_rng());
-
-    values
-        .into_iter()
-        .map(ReturnSuccess::value)
-        .into_action_stream()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Shuffle;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Shuffle {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/skip/command.rs b/old_nushell/crates/nu-command/src/commands/filters/skip/command.rs
deleted file mode 100644
index aa3be0d71..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/skip/command.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "skip"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("skip").optional("rows", SyntaxShape::Int, "How many rows to skip")
-    }
-
-    fn usage(&self) -> &str {
-        "Skip some number of rows."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        skip(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Skip the first 5 rows",
-            example: "echo [1 2 3 4 5 6 7] | skip 5",
-            result: Some(vec![
-                UntaggedValue::int(6).into(),
-                UntaggedValue::int(7).into(),
-            ]),
-        }]
-    }
-}
-
-fn skip(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let rows: Option<Tagged<usize>> = args.opt(0)?;
-    let input = args.input;
-
-    let rows_desired = if let Some(quantity) = rows {
-        *quantity
-    } else {
-        1
-    };
-
-    Ok(input.skip(rows_desired).into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/skip/mod.rs b/old_nushell/crates/nu-command/src/commands/filters/skip/mod.rs
deleted file mode 100644
index f384eabbd..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/skip/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod command;
-mod until;
-mod while_;
-
-pub use command::Command as Skip;
-pub use until::SubCommand as SkipUntil;
-pub use while_::SubCommand as SkipWhile;
diff --git a/old_nushell/crates/nu-command/src/commands/filters/skip/until.rs b/old_nushell/crates/nu-command/src/commands/filters/skip/until.rs
deleted file mode 100644
index 33a347940..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/skip/until.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::prelude::*;
-use log::trace;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ClassifiedCommand},
-    Signature, SyntaxShape,
-};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "skip until"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("skip until")
-            .required(
-                "condition",
-                SyntaxShape::RowCondition,
-                "The condition that must be met to stop skipping",
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Skips rows until the condition matches."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let ctx = Arc::new(args.context.clone());
-        let tag = args.call_info.name_tag.clone();
-
-        let block: CapturedBlock = args.req(0)?;
-        let condition = {
-            if block.block.block.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-            match block.block.block[0].pipelines.get(0) {
-                Some(item) => match item.list.get(0) {
-                    Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Expected a condition",
-                            "expected a condition",
-                            tag,
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            }
-        };
-
-        Ok(args
-            .input
-            .skip_while(move |item| {
-                let condition = condition.clone();
-                let ctx = ctx.clone();
-
-                ctx.scope.enter_scope();
-                ctx.scope.add_vars(&block.captured.entries);
-                if let Some((arg, _)) = block.block.params.positional.first() {
-                    ctx.scope.add_var(arg.name(), item.clone());
-                }
-                trace!("ITEM = {:?}", item);
-
-                let result = evaluate_baseline_expr(&condition, &ctx);
-                ctx.scope.exit_scope();
-                trace!("RESULT = {:?}", result);
-
-                !matches!(result, Ok(ref v) if v.is_true())
-            })
-            .into_action_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/skip/while_.rs b/old_nushell/crates/nu-command/src/commands/filters/skip/while_.rs
deleted file mode 100644
index ed8b35529..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/skip/while_.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use crate::prelude::*;
-use log::trace;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ClassifiedCommand},
-    Signature, SyntaxShape,
-};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "skip while"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("skip while")
-            .required(
-                "condition",
-                SyntaxShape::RowCondition,
-                "The condition that must be met to continue skipping",
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Skips rows while the condition matches."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let ctx = Arc::new(args.context.clone());
-        let tag = args.call_info.name_tag.clone();
-
-        let block: CapturedBlock = args.req(0)?;
-        let condition = {
-            if block.block.block.len() != 1 {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-            match block.block.block[0].pipelines.get(0) {
-                Some(item) => match item.list.get(0) {
-                    Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Expected a condition",
-                            "expected a condition",
-                            tag,
-                        ));
-                    }
-                },
-                None => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            }
-        };
-
-        Ok(args
-            .input
-            .skip_while(move |item| {
-                let item = item.clone();
-                let condition = condition.clone();
-                let ctx = ctx.clone();
-
-                ctx.scope.enter_scope();
-                ctx.scope.add_vars(&block.captured.entries);
-                if let Some((arg, _)) = block.block.params.positional.first() {
-                    ctx.scope.add_var(arg.name(), item.clone());
-                }
-                trace!("ITEM = {:?}", item);
-
-                let result = evaluate_baseline_expr(&condition, &ctx);
-                ctx.scope.exit_scope();
-                trace!("RESULT = {:?}", result);
-
-                matches!(result, Ok(ref v) if v.is_true())
-            })
-            .into_action_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/sort_by.rs b/old_nushell/crates/nu-command/src/commands/filters/sort_by.rs
deleted file mode 100644
index 30b6869c4..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/sort_by.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::coerce_compare;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use nu_value_ext::ValueExt;
-
-pub struct SortBy;
-
-impl WholeStreamCommand for SortBy {
-    fn name(&self) -> &str {
-        "sort-by"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("sort-by")
-            .switch(
-                "insensitive",
-                "Sort string-based columns case-insensitively",
-                Some('i'),
-            )
-            .switch("reverse", "Sort in reverse order", Some('r'))
-            .rest("rest", SyntaxShape::String, "the column(s) to sort by")
-    }
-
-    fn usage(&self) -> &str {
-        "Sort by the given columns, in increasing order."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        sort_by(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sort list by increasing value",
-                example: "echo [4 2 3 1] | sort-by",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-            Example {
-                description: "Sort list by decreasing value",
-                example: "echo [2 3 4 1] | sort-by -r",
-                result: Some(vec![
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(1).into(),
-                ]),
-            },
-            Example {
-                description: "Sort output by increasing file size",
-                example: "ls | sort-by size",
-                result: None,
-            },
-            Example {
-                description: "Sort output by type, and then by file size for each type",
-                example: "ls | sort-by type size",
-                result: None,
-            },
-            Example {
-                description: "Sort strings (case-sensitive)",
-                example: "echo [airplane Truck Car] | sort-by",
-                result: Some(vec![
-                    UntaggedValue::string("Car").into(),
-                    UntaggedValue::string("Truck").into(),
-                    UntaggedValue::string("airplane").into(),
-                ]),
-            },
-            Example {
-                description: "Sort strings (reversed case-sensitive)",
-                example: "echo [airplane Truck Car] | sort-by -r",
-                result: Some(vec![
-                    UntaggedValue::string("airplane").into(),
-                    UntaggedValue::string("Truck").into(),
-                    UntaggedValue::string("Car").into(),
-                ]),
-            },
-            Example {
-                description: "Sort strings (case-insensitive)",
-                example: "echo [airplane Truck Car] | sort-by -i",
-                result: Some(vec![
-                    UntaggedValue::string("airplane").into(),
-                    UntaggedValue::string("Car").into(),
-                    UntaggedValue::string("Truck").into(),
-                ]),
-            },
-            Example {
-                description: "Sort strings (reversed case-insensitive)",
-                example: "echo [airplane Truck Car] | sort-by -i -r",
-                result: Some(vec![
-                    UntaggedValue::string("Truck").into(),
-                    UntaggedValue::string("Car").into(),
-                    UntaggedValue::string("airplane").into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn sort_by(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let rest: Vec<Tagged<String>> = args.rest(0)?;
-    let insensitive = args.has_flag("insensitive");
-    let reverse = args.has_flag("reverse");
-    let mut vec = args.input.drain_vec();
-
-    sort(&mut vec, &rest, &tag, insensitive)?;
-
-    if reverse {
-        vec.reverse()
-    }
-
-    Ok(vec.into_iter().into_output_stream())
-}
-
-pub fn sort(
-    vec: &mut [Value],
-    keys: &[Tagged<String>],
-    tag: impl Into<Tag>,
-    insensitive: bool,
-) -> Result<(), ShellError> {
-    let tag = tag.into();
-
-    if vec.is_empty() {
-        return Err(ShellError::labeled_error(
-            "no values to work with",
-            "no values to work with",
-            tag,
-        ));
-    }
-
-    for sort_arg in keys {
-        let match_test = &vec[0].get_data_by_key(sort_arg.borrow_spanned());
-        if match_test.is_none() {
-            return Err(ShellError::labeled_error(
-                "Can not find column to sort by",
-                "invalid column",
-                sort_arg.borrow_spanned().span,
-            ));
-        }
-    }
-
-    match &vec[0] {
-        Value {
-            value: UntaggedValue::Primitive(_),
-            ..
-        } => {
-            let should_sort_case_insensitively = insensitive && vec.iter().all(|x| x.is_string());
-
-            if let Some(values) = vec
-                .windows(2)
-                .map(|elem| coerce_compare(&elem[0], &elem[1]))
-                .find(|elem| elem.is_err())
-            {
-                let (type_1, type_2) = values
-                    .err()
-                    .expect("An error occurred in the checking of types");
-                return Err(ShellError::labeled_error(
-                    "Not all values can be compared",
-                    format!(
-                        "Unable to sort values, as \"{}\" cannot compare against \"{}\"",
-                        type_1, type_2
-                    ),
-                    tag,
-                ));
-            }
-
-            vec.sort_by(|a, b| {
-                if should_sort_case_insensitively {
-                    let lowercase_a_string = a.expect_string().to_ascii_lowercase();
-                    let lowercase_b_string = b.expect_string().to_ascii_lowercase();
-
-                    lowercase_a_string.cmp(&lowercase_b_string)
-                } else {
-                    coerce_compare(a, b).expect("Unimplemented BUG: What about primitives that don't have an order defined?").compare()
-                }
-            });
-        }
-        _ => {
-            let calc_key = |item: &Value| {
-                keys.iter()
-                    .map(|f| {
-                        let mut value_option = item.get_data_by_key(f.borrow_spanned());
-
-                        if insensitive {
-                            if let Some(value) = &value_option {
-                                if let Ok(string_value) = value.as_string() {
-                                    value_option = Some(
-                                        UntaggedValue::string(string_value.to_ascii_lowercase())
-                                            .into_value(value.tag.clone()),
-                                    )
-                                }
-                            }
-                        }
-
-                        value_option
-                    })
-                    .collect::<Vec<Option<Value>>>()
-            };
-            vec.sort_by_cached_key(calc_key);
-        }
-    };
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SortBy;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SortBy {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/uniq.rs b/old_nushell/crates/nu-command/src/commands/filters/uniq.rs
deleted file mode 100644
index 16cf98a76..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/uniq.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Uniq;
-
-impl WholeStreamCommand for Uniq {
-    fn name(&self) -> &str {
-        "uniq"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("uniq")
-            .switch("count", "Count the unique rows", Some('c'))
-            .switch(
-                "repeated",
-                "Count the rows that has more than one value",
-                Some('d'),
-            )
-            .switch(
-                "ignore-case",
-                "Ignore differences in case when comparing",
-                Some('i'),
-            )
-            .switch("unique", "Only return unique values", Some('u'))
-    }
-
-    fn usage(&self) -> &str {
-        "Return the unique rows."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        uniq(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Remove duplicate rows of a list/table",
-                example: "echo [2 3 3 4] | uniq",
-                result: Some(vec![
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                ]),
-            },
-            Example {
-                description: "Only print duplicate lines, one for each group",
-                example: "echo [1 2 2] | uniq -d",
-                result: Some(vec![UntaggedValue::int(2).into()]),
-            },
-            Example {
-                description: "Only print unique lines lines",
-                example: "echo [1 2 2] | uniq -u",
-                result: Some(vec![UntaggedValue::int(1).into()]),
-            },
-            Example {
-                description: "Ignore differences in case when comparing",
-                example: "echo ['hello' 'goodbye' 'Hello'] | uniq -i",
-                result: Some(vec![
-                    UntaggedValue::string("hello").into(),
-                    UntaggedValue::string("goodbye").into(),
-                ]),
-            },
-            Example {
-                description: "Remove duplicate rows and show counts of a list/table",
-                example: "echo [1 2 2] | uniq -c",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                    "value".to_string() => UntaggedValue::int(1).into(),
-                    "count".to_string() => UntaggedValue::int(1).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                    "value".to_string() => UntaggedValue::int(2).into(),
-                    "count".to_string() => UntaggedValue::int(2).into(),
-                    })
-                    .into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn to_lowercase(value: nu_protocol::Value) -> nu_protocol::Value {
-    use nu_protocol::value::StringExt;
-
-    if value.is_string() {
-        value
-            .value
-            .expect_string()
-            .to_lowercase()
-            .to_string_value(value.tag)
-    } else {
-        value
-    }
-}
-
-fn uniq(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let should_show_count = args.has_flag("count");
-    let show_repeated = args.has_flag("repeated");
-    let ignore_case = args.has_flag("ignore-case");
-    let only_uniques = args.has_flag("unique");
-    let input = args.input;
-    let uniq_values = {
-        let mut counter = IndexMap::<nu_protocol::Value, usize>::new();
-        for line in input.into_vec() {
-            let item = if ignore_case {
-                to_lowercase(line)
-            } else {
-                line
-            };
-            *counter.entry(item).or_insert(0) += 1;
-        }
-        counter
-    };
-
-    let mut values = if show_repeated {
-        uniq_values.into_iter().filter(|i| i.1 > 1).collect::<_>()
-    } else {
-        uniq_values
-    };
-
-    if only_uniques {
-        values = values.into_iter().filter(|i| i.1 == 1).collect::<_>();
-    }
-
-    let mut values_vec_deque = VecDeque::new();
-
-    if should_show_count {
-        for item in values {
-            use nu_protocol::Value;
-            let value = {
-                match item.0.value {
-                    UntaggedValue::Row(mut row) => {
-                        row.entries.insert(
-                            "count".to_string(),
-                            UntaggedValue::int(item.1 as i64).into_untagged_value(),
-                        );
-                        Value {
-                            value: UntaggedValue::Row(row),
-                            tag: item.0.tag,
-                        }
-                    }
-                    UntaggedValue::Primitive(p) => {
-                        let mut map = IndexMap::<String, Value>::new();
-                        map.insert(
-                            "value".to_string(),
-                            UntaggedValue::Primitive(p).into_untagged_value(),
-                        );
-                        map.insert(
-                            "count".to_string(),
-                            UntaggedValue::int(item.1 as i64).into_untagged_value(),
-                        );
-                        Value {
-                            value: UntaggedValue::row(map),
-                            tag: item.0.tag,
-                        }
-                    }
-                    UntaggedValue::Table(_) => {
-                        return Err(ShellError::labeled_error(
-                            "uniq -c cannot operate on tables.",
-                            "source",
-                            item.0.tag.span,
-                        ))
-                    }
-                    #[cfg(feature = "dataframe")]
-                    UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-                        return Err(ShellError::labeled_error(
-                            "uniq -c cannot operate on data structs",
-                            "source",
-                            item.0.tag.span,
-                        ))
-                    }
-                    UntaggedValue::Error(_) | UntaggedValue::Block(_) => item.0,
-                }
-            };
-            values_vec_deque.push_back(value);
-        }
-    } else {
-        for item in values {
-            values_vec_deque.push_back(item.0);
-        }
-    }
-
-    Ok(values_vec_deque.into_iter().into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Uniq;
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Uniq {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/update.rs b/old_nushell/crates/nu-command/src/commands/filters/update.rs
deleted file mode 100644
index a3bf26a90..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/update.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::hir::ExternalRedirection;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::HasFallibleSpan;
-use nu_value_ext::ValueExt;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "update"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("update")
-            .required(
-                "field",
-                SyntaxShape::ColumnPath,
-                "the name of the column to update",
-            )
-            .required(
-                "replacement value",
-                SyntaxShape::Any,
-                "the new value to give the cell(s)",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Update an existing column to have a new value."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        update(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Update a column value",
-            example: "echo [[name, stars]; ['nu', 5]] | update name 'Nushell'",
-            result: Some(vec![UntaggedValue::row(indexmap! {
-                    "name".to_string() => Value::from("Nushell"),
-                    "stars".to_string() => UntaggedValue::int(5).into(),
-            })
-            .into()]),
-        },Example {
-            description: "Use in block form for more involved updating logic",
-            example: "echo [[project, authors]; ['nu', ['Andrés', 'Jonathan', 'Yehuda']]] | update authors { get authors | str collect ',' }",
-            result: Some(vec![UntaggedValue::row(indexmap! {
-                    "project".to_string() => Value::from("nu"),
-                    "authors".to_string() => Value::from("Andrés,Jonathan,Yehuda"),
-            })
-            .into()]),
-        }]
-    }
-}
-
-fn process_row(
-    context: Arc<EvaluationContext>,
-    input: Value,
-    mut replacement: Arc<Value>,
-    field: Arc<ColumnPath>,
-    tag: Arc<Tag>,
-) -> Result<ActionStream, ShellError> {
-    let replacement = Arc::make_mut(&mut replacement);
-
-    Ok(match replacement {
-        Value {
-            value: UntaggedValue::Block(captured_block),
-            tag: block_tag,
-        } => {
-            let for_block = input.clone();
-            let input_stream = vec![Ok(for_block)].into_iter().into_input_stream();
-
-            context.scope.enter_scope();
-            if let Some((arg, _)) = captured_block.block.params.positional.first() {
-                context.scope.add_var(arg.name(), input.clone());
-            }
-
-            context.scope.add_vars(&captured_block.captured.entries);
-
-            let result = run_block(
-                &captured_block.block,
-                &context,
-                input_stream,
-                ExternalRedirection::Stdout,
-            );
-
-            context.scope.exit_scope();
-
-            match result {
-                Ok(mut stream) => {
-                    let values = stream.drain_vec();
-
-                    let errors = context.get_errors();
-                    if let Some(error) = errors.first() {
-                        return Err(error.clone());
-                    }
-
-                    let result = if values.len() == 1 {
-                        let value = values
-                            .get(0)
-                            .ok_or_else(|| ShellError::unexpected("No value to update with."))?;
-
-                        Value {
-                            value: value.value.clone(),
-                            tag: input.tag.clone(),
-                        }
-                    } else if values.is_empty() {
-                        UntaggedValue::nothing().into_value(&input.tag)
-                    } else {
-                        UntaggedValue::table(&values).into_value(&input.tag)
-                    };
-
-                    match input {
-                        obj @ Value {
-                            value: UntaggedValue::Row(_),
-                            ..
-                        } => match obj.replace_data_at_column_path(&field, result) {
-                            Some(v) => ActionStream::one(ReturnSuccess::value(v)),
-                            None => ActionStream::one(Err(ShellError::labeled_error(
-                                "update could not find place to insert column",
-                                "column name",
-                                obj.tag,
-                            ))),
-                        },
-                        _ => ActionStream::one(Err(ShellError::labeled_error(
-                            "Unrecognized type in stream",
-                            "original value",
-                            block_tag.clone(),
-                        ))),
-                    }
-                }
-                Err(e) => ActionStream::one(Err(e)),
-            }
-        }
-        replacement => match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Nothing),
-                ..
-            } => match context
-                .scope
-                .get_var("$it")
-                .unwrap_or_else(|| UntaggedValue::nothing().into_untagged_value())
-                .replace_data_at_column_path(&field, replacement.clone())
-            {
-                Some(v) => ActionStream::one(ReturnSuccess::value(v)),
-                None => ActionStream::one(Err(ShellError::labeled_error(
-                    "update could not find place to insert column",
-                    "column name",
-                    field.maybe_span().unwrap_or(tag.span),
-                ))),
-            },
-            Value { value: _, ref tag } => {
-                match input.replace_data_at_column_path(&field, replacement.clone()) {
-                    Some(v) => ActionStream::one(ReturnSuccess::value(v)),
-                    None => ActionStream::one(Err(ShellError::labeled_error(
-                        "update could not find place to insert column",
-                        "column name",
-                        field.maybe_span().unwrap_or(tag.span),
-                    ))),
-                }
-            }
-        },
-    })
-}
-
-fn update(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name_tag = Arc::new(args.call_info.name_tag.clone());
-    let context = Arc::new(args.context.clone());
-
-    let field: ColumnPath = args.req(0)?;
-    let replacement: Value = args.req(1)?;
-    let input = args.input;
-
-    let replacement = Arc::new(replacement);
-    let field = Arc::new(field);
-
-    Ok(input
-        .flat_map(move |input| {
-            let tag = name_tag.clone();
-            let context = context.clone();
-            let replacement = replacement.clone();
-            let field = field.clone();
-
-            match process_row(context, input, replacement, field, tag) {
-                Ok(s) => s,
-                Err(e) => ActionStream::one(Err(e)),
-            }
-        })
-        .into_action_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/update_cells.rs b/old_nushell/crates/nu-command/src/commands/filters/update_cells.rs
deleted file mode 100644
index c3de86975..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/update_cells.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ExternalRedirection},
-    Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value,
-};
-use std::collections::HashSet;
-use std::iter::FromIterator;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "update cells"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("update cells")
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "the block to run an update for each cell",
-            )
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "list of columns to update",
-                Some('c'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Update the table cells."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        update_cells(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Update the zero value cells to empty strings.",
-                example: r#"[
-  [2021-04-16, 2021-06-10, 2021-09-18, 2021-10-15, 2021-11-16, 2021-11-17, 2021-11-18];
-  [        37,          0,          0,          0,         37,          0,          0]
-] | update cells {|value|
-      if ($value | into int) == 0 {
-        ""
-      } {
-        $value
-      }
-}"#,
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "2021-04-16".to_string() => UntaggedValue::int(37).into(),
-                        "2021-06-10".to_string() => Value::from(""),
-                        "2021-09-18".to_string() => Value::from(""),
-                        "2021-10-15".to_string() => Value::from(""),
-                        "2021-11-16".to_string() => UntaggedValue::int(37).into(),
-                        "2021-11-17".to_string() => Value::from(""),
-                        "2021-11-18".to_string() => Value::from(""),
-                })
-                .into()]),
-            },
-            Example {
-                description: "Update the zero value cells to empty strings in 2 last columns.",
-                example: r#"[
-    [2021-04-16, 2021-06-10, 2021-09-18, 2021-10-15, 2021-11-16, 2021-11-17, 2021-11-18];
-    [        37,          0,          0,          0,         37,          0,          0]
-] | update cells -c ["2021-11-18", "2021-11-17"] {|value|
-        if ($value | into int) == 0 {
-        ""
-        } {
-        $value
-        }
-}"#,
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "2021-04-16".to_string() => UntaggedValue::int(37).into(),
-                        "2021-06-10".to_string() => UntaggedValue::int(0).into(),
-                        "2021-09-18".to_string() => UntaggedValue::int(0).into(),
-                        "2021-10-15".to_string() => UntaggedValue::int(0).into(),
-                        "2021-11-16".to_string() => UntaggedValue::int(37).into(),
-                        "2021-11-17".to_string() => Value::from(""),
-                        "2021-11-18".to_string() => Value::from(""),
-                })
-                .into()]),
-            },
-        ]
-    }
-}
-
-fn update_cells(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let context = Arc::new(args.context.clone());
-    let external_redirection = args.call_info.args.external_redirection;
-
-    let block: CapturedBlock = args.req(0)?;
-    let block = Arc::new(block);
-
-    let columns = args
-        .get_flag("columns")?
-        .map(|x: Value| HashSet::from_iter(x.table_entries().map(|val| val.convert_to_string())));
-    let columns = Arc::new(columns);
-
-    Ok(args
-        .input
-        .flat_map(move |input| {
-            let block = block.clone();
-            let context = context.clone();
-
-            if input.is_row() {
-                OutputStream::one(process_cells(
-                    block,
-                    columns.clone(),
-                    context,
-                    input,
-                    external_redirection,
-                ))
-            } else {
-                match process_input(block, context, input, external_redirection) {
-                    Ok(s) => s,
-                    Err(e) => OutputStream::one(Value::error(e)),
-                }
-            }
-        })
-        .into_output_stream())
-}
-
-pub fn process_input(
-    captured_block: Arc<CapturedBlock>,
-    context: Arc<EvaluationContext>,
-    input: Value,
-    external_redirection: ExternalRedirection,
-) -> Result<OutputStream, ShellError> {
-    let input_clone = input.clone();
-    // When we process a row, we need to know whether the block wants to have the contents of the row as
-    // a parameter to the block (so it gets assigned to a variable that can be used inside the block) or
-    // if it wants the contents as as an input stream
-
-    let input_stream = if !captured_block.block.params.positional.is_empty() {
-        InputStream::empty()
-    } else {
-        vec![Ok(input_clone)].into_iter().into_input_stream()
-    };
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&captured_block.captured.entries);
-
-    if let Some((arg, _)) = captured_block.block.params.positional.first() {
-        context.scope.add_var(arg.name(), input);
-    } else {
-        context.scope.add_var("$it", input);
-    }
-
-    let result = run_block(
-        &captured_block.block,
-        &context,
-        input_stream,
-        external_redirection,
-    );
-
-    context.scope.exit_scope();
-
-    result
-}
-
-pub fn process_cells(
-    captured_block: Arc<CapturedBlock>,
-    columns: Arc<Option<HashSet<String>>>,
-    context: Arc<EvaluationContext>,
-    input: Value,
-    external_redirection: ExternalRedirection,
-) -> Value {
-    TaggedDictBuilder::build(input.tag(), |row| {
-        input.row_entries().for_each(|(column, cell_value)| {
-            match &*columns {
-                Some(col) if !col.contains(column) => {
-                    row.insert_value(column, cell_value.clone());
-                    return;
-                }
-                _ => {}
-            };
-            let cell_processed = process_input(
-                captured_block.clone(),
-                context.clone(),
-                cell_value.clone(),
-                external_redirection,
-            )
-            .map(|it| it.into_vec())
-            .map_err(Value::error);
-
-            match cell_processed {
-                Ok(value) => {
-                    match value.get(0) {
-                        Some(one) => {
-                            row.insert_value(column, one.clone());
-                        }
-                        None => {
-                            row.insert_untagged(column, UntaggedValue::nothing());
-                        }
-                    };
-                }
-                Err(reason) => {
-                    row.insert_value(column, reason);
-                }
-            }
-        });
-    })
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/where_.rs b/old_nushell/crates/nu-command/src/commands/filters/where_.rs
deleted file mode 100644
index e081f1d80..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/where_.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::CapturedBlock,
-    hir::{ClassifiedCommand, SpannedExpression},
-    Signature, SyntaxShape, Value,
-};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "where"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("where").required(
-            "condition",
-            SyntaxShape::RowCondition,
-            "the condition that must match",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Filter table to match the condition."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        where_command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "List all files in the current directory with sizes greater than 2kb",
-                example: "ls | where size > 2kb",
-                result: None,
-            },
-            Example {
-                description: "List only the files in the current directory",
-                example: "ls | where type == File",
-                result: None,
-            },
-            Example {
-                description: "List all files with names that contain \"Car\"",
-                example: "ls | where name =~ \"Car\"",
-                result: None,
-            },
-            Example {
-                description: "List all files that were modified in the last two weeks",
-                example: "ls | where modified <= 2wk",
-                result: None,
-            },
-        ]
-    }
-}
-fn where_command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let context = Arc::new(args.context.clone());
-    let tag = args.call_info.name_tag.clone();
-
-    let block: CapturedBlock = args.req(0)?;
-
-    let condition = {
-        if block.block.block.len() != 1 {
-            return Err(ShellError::labeled_error(
-                "Expected a condition",
-                "expected a condition",
-                tag,
-            ));
-        }
-        match block.block.block[0].pipelines.get(0) {
-            Some(item) => match item.list.get(0) {
-                Some(ClassifiedCommand::Expr(expr)) => expr.clone(),
-                _ => {
-                    return Err(ShellError::labeled_error(
-                        "Expected a condition",
-                        "expected a condition",
-                        tag,
-                    ));
-                }
-            },
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Expected a condition",
-                    "expected a condition",
-                    tag,
-                ));
-            }
-        }
-    };
-
-    Ok(WhereIterator {
-        condition,
-        context,
-        input: args.input,
-        block,
-    }
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
-
-struct WhereIterator {
-    condition: Box<SpannedExpression>,
-    context: Arc<EvaluationContext>,
-    input: InputStream,
-    block: CapturedBlock,
-}
-
-impl Iterator for WhereIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        for x in &mut self.input {
-            self.context.scope.enter_scope();
-            self.context.scope.add_vars(&self.block.captured.entries);
-
-            if let Some((arg, _)) = self.block.block.params.positional.first() {
-                self.context.scope.add_var(arg.name(), x.clone());
-            }
-
-            //FIXME: should we use the scope that's brought in as well?
-            let condition = evaluate_baseline_expr(&self.condition, &self.context);
-            self.context.scope.exit_scope();
-
-            match condition {
-                Ok(condition) => match condition.as_bool() {
-                    Ok(b) => {
-                        if b {
-                            return Some(x);
-                        }
-                    }
-                    Err(e) => return Some(Value::error(e)),
-                },
-                Err(e) => return Some(Value::error(e)),
-            }
-        }
-
-        None
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/wrap.rs b/old_nushell/crates/nu-command/src/commands/filters/wrap.rs
deleted file mode 100644
index 90f42334d..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/wrap.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use crate::prelude::*;
-use indexmap::{indexmap, IndexMap};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-const DEFAULT_COLUMN_NAME: &str = "Column";
-
-pub struct Wrap;
-
-impl WholeStreamCommand for Wrap {
-    fn name(&self) -> &str {
-        "wrap"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("wrap").optional(
-            "column",
-            SyntaxShape::String,
-            "the name of the new column",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Wraps the given data in a table."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        wrap(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Wrap a list into a table with the default column name",
-                example: "echo [1 2 3] | wrap",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        DEFAULT_COLUMN_NAME.to_string() => UntaggedValue::int(1).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        DEFAULT_COLUMN_NAME.to_string() => UntaggedValue::int(2).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        DEFAULT_COLUMN_NAME.to_string() => UntaggedValue::int(3).into(),
-                    })
-                    .into(),
-                ]),
-            },
-            Example {
-                description: "Wrap a list into a table with a given column name",
-                example: "echo [1 2 3] | wrap MyColumn",
-                result: Some(vec![
-                    UntaggedValue::row(indexmap! {
-                        "MyColumn".to_string() => UntaggedValue::int(1).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "MyColumn".to_string() => UntaggedValue::int(2).into(),
-                    })
-                    .into(),
-                    UntaggedValue::row(indexmap! {
-                        "MyColumn".to_string() => UntaggedValue::int(3).into(),
-                    })
-                    .into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn wrap(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let column: Option<Tagged<String>> = args.opt(0)?;
-
-    let mut result_table = vec![];
-    let mut are_all_rows = true;
-
-    for value in args.input {
-        match value {
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                result_table.push(value);
-            }
-            _ => {
-                are_all_rows = false;
-
-                let mut index_map = IndexMap::new();
-                index_map.insert(
-                    match &column {
-                        Some(key) => key.item.clone(),
-                        None => DEFAULT_COLUMN_NAME.to_string(),
-                    },
-                    value,
-                );
-
-                result_table.push(UntaggedValue::row(index_map).into_value(Tag::unknown()));
-            }
-        }
-    }
-
-    if are_all_rows {
-        let mut index_map = IndexMap::new();
-        index_map.insert(
-            match &column {
-                Some(key) => key.item.clone(),
-                None => DEFAULT_COLUMN_NAME.to_string(),
-            },
-            UntaggedValue::table(&result_table).into_value(Tag::unknown()),
-        );
-
-        let row = UntaggedValue::row(index_map).into_untagged_value();
-
-        Ok(ActionStream::one(ReturnSuccess::value(row)))
-    } else {
-        Ok((result_table.into_iter().map(ReturnSuccess::value)).into_action_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Wrap;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Wrap {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/filters/zip_.rs b/old_nushell/crates/nu-command/src/commands/filters/zip_.rs
deleted file mode 100644
index 8ce5af6dc..000000000
--- a/old_nushell/crates/nu-command/src/commands/filters/zip_.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::prelude::*;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::did_you_mean;
-use nu_protocol::TaggedDictBuilder;
-use nu_protocol::{
-    hir::CapturedBlock, hir::ExternalRedirection, ColumnPath, PathMember, Signature, SyntaxShape,
-    UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_value_ext::get_data_by_column_path;
-
-use nu_source::HasFallibleSpan;
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "zip"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("zip").required(
-            "block",
-            SyntaxShape::Block,
-            "the block to run and zip into the table",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Zip two tables."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Zip two lists",
-            example: "[0 2 4 6 8] | zip { [1 3 5 7 9] } | each { $it }",
-            result: None,
-        },
-        Example {
-            description: "Zip two tables",
-            example: "[[symbol]; ['('] ['['] ['{']] | zip { [[symbol]; [')'] [']'] ['}']] } | each { get symbol | $'($in.0)nushell($in.1)' }",
-            result: Some(vec![
-                Value::from("(nushell)"),
-                Value::from("[nushell]"),
-                Value::from("{nushell}")
-            ])
-        }]
-    }
-}
-
-fn command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let context = &args.context;
-    let name_tag = args.call_info.name_tag.clone();
-
-    let block: CapturedBlock = args.req(0)?;
-    let block_span = &block.block.span.clone();
-    let input = args.input;
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&block.captured.entries);
-    let result = run_block(
-        &block.block,
-        context,
-        InputStream::empty(),
-        ExternalRedirection::Stdout,
-    );
-    context.scope.exit_scope();
-
-    Ok(OutputStream::from_stream(zip(
-        input,
-        result,
-        name_tag,
-        *block_span,
-    )?))
-}
-
-fn zip<'a>(
-    l: impl Iterator<Item = Value> + 'a + Sync + Send,
-    r: Result<InputStream, ShellError>,
-    command_tag: Tag,
-    secondary_command_span: Span,
-) -> Result<Box<dyn Iterator<Item = Value> + 'a + Sync + Send>, ShellError> {
-    Ok(Box::new(l.zip(r?).map(move |(s1, s2)| match (s1, s2) {
-        (
-            left_row @ Value {
-                value: UntaggedValue::Row(_),
-                ..
-            },
-            mut right_row @ Value {
-                value: UntaggedValue::Row(_),
-                ..
-            },
-        ) => {
-            let mut zipped_row = TaggedDictBuilder::new(left_row.tag());
-
-            right_row.tag = Tag::new(right_row.tag.anchor(), secondary_command_span);
-
-            for column in left_row.data_descriptors() {
-                let path = ColumnPath::build(&(column.to_string()).spanned(right_row.tag.span));
-                zipped_row.insert_value(column, zip_row(&path, &left_row, &right_row));
-            }
-
-            zipped_row.into_value()
-        }
-        (s1, s2) => {
-            let mut name_tag = command_tag.clone();
-            name_tag.anchor = s1.tag.anchor();
-            UntaggedValue::table(&vec![s1, s2]).into_value(&name_tag)
-        }
-    })))
-}
-
-fn zip_row(path: &ColumnPath, left: &Value, right: &Value) -> UntaggedValue {
-    UntaggedValue::table(&vec![
-        get_column(path, left)
-            .unwrap_or_else(|err| UntaggedValue::Error(err).into_untagged_value()),
-        get_column(path, right)
-            .unwrap_or_else(|err| UntaggedValue::Error(err).into_untagged_value()),
-    ])
-}
-
-pub fn get_column(path: &ColumnPath, value: &Value) -> Result<Value, ShellError> {
-    get_data_by_column_path(value, path, move |obj_source, column_path_tried, error| {
-        let path_members_span = path.maybe_span().unwrap_or_else(Span::unknown);
-
-        if obj_source.is_row() {
-            if let Some(error) = error_message(column_path_tried, &path_members_span, obj_source) {
-                return error;
-            }
-        }
-
-        error
-    })
-}
-
-fn error_message(
-    column_tried: &PathMember,
-    path_members_span: &Span,
-    obj_source: &Value,
-) -> Option<ShellError> {
-    match column_tried {
-        PathMember {
-            unspanned: UnspannedPathMember::String(column),
-            ..
-        } => {
-            let primary_label = format!("There isn't a column named '{}' from this table", &column);
-
-            did_you_mean(obj_source, column_tried.as_string()).map(|suggestions| {
-                ShellError::labeled_error_with_secondary(
-                    "Unknown column",
-                    primary_label,
-                    obj_source.tag.span,
-                    format!(
-                        "Perhaps you meant '{}'? Columns available: {}",
-                        suggestions[0],
-                        &obj_source.data_descriptors().join(", ")
-                    ),
-                    column_tried.span.since(path_members_span),
-                )
-            })
-        }
-        _ => None,
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/command.rs b/old_nushell/crates/nu-command/src/commands/formats/from/command.rs
deleted file mode 100644
index 5d6d68af9..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/command.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct From;
-
-impl WholeStreamCommand for From {
-    fn name(&self) -> &str {
-        "from"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse content (string or binary) as a table (input format based on subcommand, like csv, ini, json, toml)."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&From, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::From;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(From {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/csv.rs b/old_nushell/crates/nu-command/src/commands/formats/from/csv.rs
deleted file mode 100644
index 2c27bf8b1..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/csv.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use super::delimited::from_delimited_data;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct FromCsv;
-
-impl WholeStreamCommand for FromCsv {
-    fn name(&self) -> &str {
-        "from csv"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from csv")
-            .named(
-                "separator",
-                SyntaxShape::String,
-                "a character to separate columns, defaults to ','",
-                Some('s'),
-            )
-            .switch(
-                "noheaders",
-                "don't treat the first row as column names",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .csv and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_csv(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert comma-separated data to a table",
-                example: "open data.txt | from csv",
-                result: None,
-            },
-            Example {
-                description: "Convert comma-separated data to a table, ignoring headers",
-                example: "open data.txt | from csv --noheaders",
-                result: None,
-            },
-            Example {
-                description: "Convert comma-separated data to a table, ignoring headers",
-                example: "open data.txt | from csv -n",
-                result: None,
-            },
-            Example {
-                description: "Convert semicolon-separated data to a table",
-                example: "open data.txt | from csv --separator ';'",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn from_csv(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let noheaders = args.has_flag("noheaders");
-    let separator: Option<Value> = args.get_flag("separator")?;
-    let input = args.input;
-
-    let sep = match separator {
-        Some(Value {
-            value: UntaggedValue::Primitive(Primitive::String(s)),
-            tag,
-            ..
-        }) => {
-            if s == r"\t" {
-                '\t'
-            } else {
-                let vec_s: Vec<char> = s.chars().collect();
-                if vec_s.len() != 1 {
-                    return Err(ShellError::labeled_error(
-                        "Expected a single separator char from --separator",
-                        "requires a single character string input",
-                        tag,
-                    ));
-                };
-                vec_s[0]
-            }
-        }
-        _ => ',',
-    };
-
-    from_delimited_data(noheaders, sep, "CSV", input, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromCsv;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromCsv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/delimited.rs b/old_nushell/crates/nu-command/src/commands/formats/from/delimited.rs
deleted file mode 100644
index 28b5df27e..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/delimited.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use csv::{ErrorKind, ReaderBuilder};
-use nu_errors::ShellError;
-use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value};
-
-fn from_delimited_string_to_value(
-    s: String,
-    noheaders: bool,
-    separator: char,
-    tag: impl Into<Tag>,
-) -> Result<Value, csv::Error> {
-    let mut reader = ReaderBuilder::new()
-        .has_headers(!noheaders)
-        .delimiter(separator as u8)
-        .from_reader(s.as_bytes());
-    let tag = tag.into();
-    let span = tag.span;
-
-    let headers = if noheaders {
-        (1..=reader.headers()?.len())
-            .map(|i| format!("Column{}", i))
-            .collect::<Vec<String>>()
-    } else {
-        reader.headers()?.iter().map(String::from).collect()
-    };
-
-    let mut rows = vec![];
-    for row in reader.records() {
-        let mut tagged_row = TaggedDictBuilder::new(&tag);
-        for (value, header) in row?.iter().zip(&headers) {
-            if let Ok(i) = value.parse::<i64>() {
-                tagged_row.insert_value(header, UntaggedValue::int(i).into_value(&tag))
-            } else if let Ok(f) = value.parse::<f64>() {
-                tagged_row.insert_value(
-                    header,
-                    UntaggedValue::decimal_from_float(f, span).into_value(&tag),
-                )
-            } else {
-                tagged_row.insert_value(header, UntaggedValue::string(value).into_value(&tag))
-            }
-        }
-        rows.push(tagged_row.into_value());
-    }
-
-    Ok(UntaggedValue::Table(rows).into_value(&tag))
-}
-
-pub fn from_delimited_data(
-    noheaders: bool,
-    sep: char,
-    format_name: &'static str,
-    input: InputStream,
-    name: Tag,
-) -> Result<OutputStream, ShellError> {
-    let name_tag = name;
-    let concat_string = input.collect_string(name_tag.clone())?;
-    let sample_lines = concat_string.item.lines().take(3).collect_vec().join("\n");
-
-    match from_delimited_string_to_value(concat_string.item, noheaders, sep, name_tag.clone()) {
-        Ok(x) => match x {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => Ok(list.into_iter().into_output_stream()),
-            x => Ok(OutputStream::one(x)),
-        },
-        Err(err) => {
-            let line_one = match pretty_csv_error(err) {
-                Some(pretty) => format!(
-                    "Could not parse as {} split by '{}' ({})",
-                    format_name, sep, pretty
-                ),
-                None => format!("Could not parse as {} split by '{}'", format_name, sep),
-            };
-            let line_two = format!(
-                "input cannot be parsed as {} split by '{}'. Input's first lines:\n{}",
-                format_name, sep, sample_lines
-            );
-
-            Err(ShellError::labeled_error_with_secondary(
-                line_one,
-                line_two,
-                name_tag,
-                "value originates from here",
-                concat_string.tag,
-            ))
-        }
-    }
-}
-
-fn pretty_csv_error(err: csv::Error) -> Option<String> {
-    match err.kind() {
-        ErrorKind::UnequalLengths {
-            pos,
-            expected_len,
-            len,
-        } => {
-            if let Some(pos) = pos {
-                Some(format!(
-                    "Line {}: expected {} fields, found {}",
-                    pos.line(),
-                    expected_len,
-                    len
-                ))
-            } else {
-                Some(format!("Expected {} fields, found {}", expected_len, len))
-            }
-        }
-        ErrorKind::Seek => Some("Internal error while parsing csv".to_string()),
-        _ => None,
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/eml.rs b/old_nushell/crates/nu-command/src/commands/formats/from/eml.rs
deleted file mode 100644
index 68bbee84c..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/eml.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use crate::prelude::*;
-use ::eml_parser::eml::*;
-use ::eml_parser::EmlParser;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct FromEml;
-
-const DEFAULT_BODY_PREVIEW: usize = 50;
-
-impl WholeStreamCommand for FromEml {
-    fn name(&self) -> &str {
-        "from eml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from eml").named(
-            "preview-body",
-            SyntaxShape::Int,
-            "How many bytes of the body to preview",
-            Some('b'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .eml and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_eml(args)
-    }
-}
-
-fn emailaddress_to_value(tag: &Tag, email_address: &EmailAddress) -> TaggedDictBuilder {
-    let mut dict = TaggedDictBuilder::with_capacity(tag, 2);
-    let (n, a) = match email_address {
-        EmailAddress::AddressOnly { address } => {
-            (UntaggedValue::nothing(), UntaggedValue::string(address))
-        }
-        EmailAddress::NameAndEmailAddress { name, address } => {
-            (UntaggedValue::string(name), UntaggedValue::string(address))
-        }
-    };
-
-    dict.insert_untagged("Name", n);
-    dict.insert_untagged("Address", a);
-
-    dict
-}
-
-fn headerfieldvalue_to_value(tag: &Tag, value: &HeaderFieldValue) -> UntaggedValue {
-    use HeaderFieldValue::*;
-
-    match value {
-        SingleEmailAddress(address) => emailaddress_to_value(tag, address).into_untagged_value(),
-        MultipleEmailAddresses(addresses) => UntaggedValue::Table(
-            addresses
-                .iter()
-                .map(|a| emailaddress_to_value(tag, a).into_value())
-                .collect(),
-        ),
-        Unstructured(s) => UntaggedValue::string(s),
-        Empty => UntaggedValue::nothing(),
-    }
-}
-
-fn from_eml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let preview_body: Option<Tagged<usize>> = args.get_flag("preview-body")?;
-
-    let value = args.input.collect_string(tag.clone())?;
-
-    let body_preview = preview_body.map(|b| b.item).unwrap_or(DEFAULT_BODY_PREVIEW);
-
-    let eml = EmlParser::from_string(value.item)
-        .with_body_preview(body_preview)
-        .parse()
-        .map_err(|_| {
-            ShellError::labeled_error(
-                "Could not parse .eml file",
-                "could not parse .eml file",
-                &tag,
-            )
-        })?;
-
-    let mut dict = TaggedDictBuilder::new(&tag);
-
-    if let Some(subj) = eml.subject {
-        dict.insert_untagged("Subject", UntaggedValue::string(subj));
-    }
-
-    if let Some(from) = eml.from {
-        dict.insert_untagged("From", headerfieldvalue_to_value(&tag, &from));
-    }
-
-    if let Some(to) = eml.to {
-        dict.insert_untagged("To", headerfieldvalue_to_value(&tag, &to));
-    }
-
-    for HeaderField { name, value } in &eml.headers {
-        dict.insert_untagged(name, headerfieldvalue_to_value(&tag, value));
-    }
-
-    if let Some(body) = eml.body {
-        dict.insert_untagged("Body", UntaggedValue::string(body));
-    }
-
-    Ok(OutputStream::one(dict.into_value()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromEml;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromEml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/ics.rs b/old_nushell/crates/nu-command/src/commands/formats/from/ics.rs
deleted file mode 100644
index 2770cb14e..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/ics.rs
+++ /dev/null
@@ -1,250 +0,0 @@
-extern crate ical;
-use crate::prelude::*;
-use ical::parser::ical::component::*;
-use ical::property::Property;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, TaggedDictBuilder, UntaggedValue, Value};
-use std::io::BufReader;
-
-pub struct FromIcs;
-
-impl WholeStreamCommand for FromIcs {
-    fn name(&self) -> &str {
-        "from ics"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from ics")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .ics and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_ics(args)
-    }
-}
-
-fn from_ics(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let input_string = input.collect_string(tag.clone())?.item;
-    let input_bytes = input_string.as_bytes();
-    let buf_reader = BufReader::new(input_bytes);
-    let parser = ical::IcalParser::new(buf_reader);
-
-    // TODO: it should be possible to make this a stream, but the some of the lifetime requirements make this tricky.
-    // Pre-computing for now
-    let mut output = vec![];
-
-    for calendar in parser {
-        match calendar {
-            Ok(c) => output.push(calendar_to_value(c, tag.clone())),
-            Err(_) => output.push(Value::error(ShellError::labeled_error(
-                "Could not parse as .ics",
-                "input cannot be parsed as .ics",
-                tag.clone(),
-            ))),
-        }
-    }
-
-    Ok(output.into_iter().into_output_stream())
-}
-
-fn calendar_to_value(calendar: IcalCalendar, tag: Tag) -> Value {
-    let mut row = TaggedDictBuilder::new(tag.clone());
-
-    row.insert_untagged(
-        "properties",
-        properties_to_value(calendar.properties, tag.clone()),
-    );
-    row.insert_untagged("events", events_to_value(calendar.events, tag.clone()));
-    row.insert_untagged("alarms", alarms_to_value(calendar.alarms, tag.clone()));
-    row.insert_untagged("to-Dos", todos_to_value(calendar.todos, tag.clone()));
-    row.insert_untagged(
-        "journals",
-        journals_to_value(calendar.journals, tag.clone()),
-    );
-    row.insert_untagged(
-        "free-busys",
-        free_busys_to_value(calendar.free_busys, tag.clone()),
-    );
-    row.insert_untagged("timezones", timezones_to_value(calendar.timezones, tag));
-
-    row.into_value()
-}
-
-fn events_to_value(events: Vec<IcalEvent>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &events
-            .into_iter()
-            .map(|event| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(event.properties, tag.clone()),
-                );
-                row.insert_untagged("alarms", alarms_to_value(event.alarms, tag.clone()));
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn alarms_to_value(alarms: Vec<IcalAlarm>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &alarms
-            .into_iter()
-            .map(|alarm| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(alarm.properties, tag.clone()),
-                );
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn todos_to_value(todos: Vec<IcalTodo>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &todos
-            .into_iter()
-            .map(|todo| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(todo.properties, tag.clone()),
-                );
-                row.insert_untagged("alarms", alarms_to_value(todo.alarms, tag.clone()));
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn journals_to_value(journals: Vec<IcalJournal>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &journals
-            .into_iter()
-            .map(|journal| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(journal.properties, tag.clone()),
-                );
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn free_busys_to_value(free_busys: Vec<IcalFreeBusy>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &free_busys
-            .into_iter()
-            .map(|free_busy| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(free_busy.properties, tag.clone()),
-                );
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn timezones_to_value(timezones: Vec<IcalTimeZone>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &timezones
-            .into_iter()
-            .map(|timezone| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(timezone.properties, tag.clone()),
-                );
-                row.insert_untagged(
-                    "transitions",
-                    timezone_transitions_to_value(timezone.transitions, tag.clone()),
-                );
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn timezone_transitions_to_value(
-    transitions: Vec<IcalTimeZoneTransition>,
-    tag: Tag,
-) -> UntaggedValue {
-    UntaggedValue::table(
-        &transitions
-            .into_iter()
-            .map(|transition| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-                row.insert_untagged(
-                    "properties",
-                    properties_to_value(transition.properties, tag.clone()),
-                );
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn properties_to_value(properties: Vec<Property>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &properties
-            .into_iter()
-            .map(|prop| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-
-                let name = UntaggedValue::string(prop.name);
-                let value = match prop.value {
-                    Some(val) => UntaggedValue::string(val),
-                    None => UntaggedValue::Primitive(Primitive::Nothing),
-                };
-                let params = match prop.params {
-                    Some(param_list) => params_to_value(param_list, tag.clone()).into(),
-                    None => UntaggedValue::Primitive(Primitive::Nothing),
-                };
-
-                row.insert_untagged("name", name);
-                row.insert_untagged("value", value);
-                row.insert_untagged("params", params);
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn params_to_value(params: Vec<(String, Vec<String>)>, tag: Tag) -> Value {
-    let mut row = TaggedDictBuilder::new(tag);
-
-    for (param_name, param_values) in params {
-        let values: Vec<Value> = param_values.into_iter().map(|val| val.into()).collect();
-        let values = UntaggedValue::table(&values);
-        row.insert_untagged(param_name, values);
-    }
-
-    row.into_value()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromIcs;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromIcs {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/ini.rs b/old_nushell/crates/nu-command/src/commands/formats/from/ini.rs
deleted file mode 100644
index 950f8f064..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/ini.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-use std::collections::HashMap;
-
-#[derive(Debug, thiserror::Error)]
-pub enum DeserializationError {
-    #[error("Failed to parse input as INI")]
-    Ini(#[from] serde_ini::de::Error),
-
-    #[error("Failed to convert to a nushell value")]
-    Nu(#[from] nu_serde::Error),
-}
-
-pub struct FromIni;
-
-impl WholeStreamCommand for FromIni {
-    fn name(&self) -> &str {
-        "from ini"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from ini")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .ini and create table"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_ini(args)
-    }
-}
-
-pub fn from_ini_string_to_value(
-    s: String,
-    tag: impl Into<Tag>,
-) -> Result<Value, DeserializationError> {
-    let v: HashMap<String, HashMap<String, String>> = serde_ini::from_str(&s)?;
-
-    Ok(nu_serde::to_value(v, tag)?)
-}
-
-fn from_ini(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-    let concat_string = input.collect_string(tag.clone())?;
-
-    match from_ini_string_to_value(concat_string.item, tag.clone()) {
-        Ok(x) => match x {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => Ok(list.into_iter().into_output_stream()),
-            x => Ok(OutputStream::one(x)),
-        },
-        Err(DeserializationError::Ini(e)) => Err(ShellError::labeled_error_with_secondary(
-            format!("Could not parse as INI: {}", e),
-            "input cannot be parsed as INI",
-            &tag,
-            "value originates from here",
-            concat_string.tag,
-        )),
-        Err(DeserializationError::Nu(e)) => Err(ShellError::labeled_error_with_secondary(
-            format!("Could not convert to nushell value: {}", e),
-            "input cannot be converted to nushell",
-            &tag,
-            "value originates from here",
-            concat_string.tag,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromIni;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromIni {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/json.rs b/old_nushell/crates/nu-command/src/commands/formats/from/json.rs
deleted file mode 100644
index 7d0c3f65d..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/json.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-#[derive(Debug, thiserror::Error)]
-pub enum DeserializationError {
-    #[error("Failed to parse input as JSON")]
-    Json(#[from] nu_json::Error),
-
-    #[error("Failed to convert JSON to a nushell value")]
-    Nu(#[from] Box<nu_serde::Error>),
-}
-
-pub struct FromJson;
-
-impl WholeStreamCommand for FromJson {
-    fn name(&self) -> &str {
-        "from json"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from json").switch(
-            "objects",
-            "treat each line as a separate value",
-            Some('o'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .json and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_json(args)
-    }
-}
-
-pub fn from_json_string_to_value(
-    s: String,
-    tag: impl Into<Tag>,
-) -> Result<Value, DeserializationError> {
-    let v: nu_json::Value = nu_json::from_str(&s)?;
-
-    Ok(nu_serde::to_value(v, tag).map_err(Box::new)?)
-}
-
-fn from_json(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-
-    let objects = args.has_flag("objects");
-
-    let concat_string = args.input.collect_string(name_tag.clone())?;
-
-    if objects {
-        #[allow(clippy::needless_collect)]
-        let lines: Vec<_> = concat_string.item.lines().map(|x| x.to_string()).collect();
-        Ok(lines
-            .into_iter()
-            .filter_map(move |json_str| {
-                if json_str.is_empty() {
-                    return None;
-                }
-
-                match from_json_string_to_value(json_str, &name_tag) {
-                    Ok(x) => Some(x),
-                    Err(DeserializationError::Nu(e)) => {
-                        let mut message = "Could not convert JSON to nushell value (".to_string();
-                        message.push_str(&e.to_string());
-                        message.push(')');
-                        Some(Value::error(ShellError::labeled_error_with_secondary(
-                            message,
-                            "input cannot be converted to nushell values",
-                            name_tag.clone(),
-                            "value originates from here",
-                            concat_string.tag.clone(),
-                        )))
-                    }
-                    Err(DeserializationError::Json(e)) => {
-                        let mut message = "Could not parse as JSON (".to_string();
-                        message.push_str(&e.to_string());
-                        message.push(')');
-
-                        Some(Value::error(ShellError::labeled_error_with_secondary(
-                            message,
-                            "input cannot be parsed as JSON",
-                            name_tag.clone(),
-                            "value originates from here",
-                            concat_string.tag.clone(),
-                        )))
-                    }
-                }
-            })
-            .into_output_stream())
-    } else {
-        match from_json_string_to_value(concat_string.item, name_tag.clone()) {
-            Ok(x) => match x {
-                Value {
-                    value: UntaggedValue::Table(list),
-                    ..
-                } => Ok(list.into_iter().into_output_stream()),
-
-                x => Ok(OutputStream::one(x)),
-            },
-            Err(DeserializationError::Json(e)) => {
-                let mut message = "Could not parse as JSON (".to_string();
-                message.push_str(&e.to_string());
-                message.push(')');
-
-                Ok(OutputStream::one(Value::error(
-                    ShellError::labeled_error_with_secondary(
-                        message,
-                        "input cannot be parsed as JSON",
-                        name_tag,
-                        "value originates from here",
-                        concat_string.tag,
-                    ),
-                )))
-            }
-            Err(DeserializationError::Nu(e)) => {
-                let mut message = "Could not convert JSON to nushell value (".to_string();
-                message.push_str(&e.to_string());
-                message.push(')');
-                Ok(OutputStream::one(Value::error(
-                    ShellError::labeled_error_with_secondary(
-                        message,
-                        "input cannot be converted to nushell values",
-                        name_tag,
-                        "value originates from here",
-                        concat_string.tag,
-                    ),
-                )))
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromJson;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromJson {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/mod.rs b/old_nushell/crates/nu-command/src/commands/formats/from/mod.rs
deleted file mode 100644
index fe91fdb63..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/mod.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-mod command;
-pub(crate) mod csv;
-mod delimited;
-mod eml;
-mod ics;
-mod ini;
-mod json;
-mod ods;
-mod ssv;
-pub(crate) mod toml;
-mod tsv;
-pub(crate) mod url;
-mod vcf;
-mod xlsx;
-mod xml;
-mod yaml;
-
-pub use self::csv::FromCsv;
-pub use self::toml::FromToml;
-pub use self::url::FromUrl;
-pub use command::From;
-pub use eml::FromEml;
-pub use ics::FromIcs;
-pub use ini::FromIni;
-pub use json::FromJson;
-pub use ods::FromOds;
-pub use ssv::FromSsv;
-pub use tsv::FromTsv;
-pub use vcf::FromVcf;
-pub use xlsx::FromXlsx;
-pub use xml::FromXml;
-pub use yaml::{FromYaml, FromYml};
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/ods.rs b/old_nushell/crates/nu-command/src/commands/formats/from/ods.rs
deleted file mode 100644
index 5187d5f08..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/ods.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use crate::prelude::*;
-use calamine::*;
-use nu_data::TaggedListBuilder;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use std::io::Cursor;
-
-pub struct FromOds;
-
-impl WholeStreamCommand for FromOds {
-    fn name(&self) -> &str {
-        "from ods"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from ods").named(
-            "sheets",
-            SyntaxShape::Table,
-            "Only convert specified sheets",
-            Some('s'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse OpenDocument Spreadsheet(.ods) data and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_ods(args)
-    }
-}
-
-// Adapted from crates/nu-command/src/commands/dataframe/utils.rs
-fn convert_columns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
-    let res = columns
-        .iter()
-        .map(|value| match &value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => Ok(s.clone()),
-            _ => Err(ShellError::labeled_error(
-                "Incorrect column format",
-                "Only string as column name",
-                &value.tag,
-            )),
-        })
-        .collect::<Result<Vec<String>, _>>()?;
-
-    Ok(res)
-}
-
-fn from_ods(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let span = tag.span;
-
-    let mut sel_sheets = vec![];
-
-    if let Some(columns) = args.get_flag::<Vec<Value>>("sheets")? {
-        sel_sheets = convert_columns(columns.as_slice())?;
-    }
-
-    let bytes = args.input.collect_binary(tag.clone())?;
-    let buf: Cursor<Vec<u8>> = Cursor::new(bytes.item);
-    let mut ods = Ods::<_>::new(buf).map_err(|_| {
-        ShellError::labeled_error("Could not load ods file", "could not load ods file", &tag)
-    })?;
-
-    let mut dict = TaggedDictBuilder::new(&tag);
-
-    let mut sheet_names = ods.sheet_names().to_owned();
-    if !sel_sheets.is_empty() {
-        sheet_names.retain(|e| sel_sheets.contains(e));
-    }
-
-    for sheet_name in &sheet_names {
-        let mut sheet_output = TaggedListBuilder::new(&tag);
-
-        if let Some(Ok(current_sheet)) = ods.worksheet_range(sheet_name) {
-            for row in current_sheet.rows() {
-                let mut row_output = TaggedDictBuilder::new(&tag);
-                for (i, cell) in row.iter().enumerate() {
-                    let value = match cell {
-                        DataType::Empty => UntaggedValue::nothing(),
-                        DataType::String(s) => UntaggedValue::string(s),
-                        DataType::Float(f) => UntaggedValue::decimal_from_float(*f, span),
-                        DataType::Int(i) => UntaggedValue::int(*i),
-                        DataType::Bool(b) => UntaggedValue::boolean(*b),
-                        _ => UntaggedValue::nothing(),
-                    };
-
-                    row_output.insert_untagged(&format!("Column{}", i), value);
-                }
-
-                sheet_output.push_untagged(row_output.into_untagged_value());
-            }
-
-            dict.insert_untagged(sheet_name, sheet_output.into_untagged_value());
-        } else {
-            return Err(ShellError::labeled_error(
-                "Could not load sheet",
-                "could not load sheet",
-                &tag,
-            ));
-        }
-    }
-
-    Ok(OutputStream::one(dict.into_value()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromOds;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromOds {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/ssv.rs b/old_nushell/crates/nu-command/src/commands/formats/from/ssv.rs
deleted file mode 100644
index 2ede8a8e4..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/ssv.rs
+++ /dev/null
@@ -1,480 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct FromSsv;
-
-const STRING_REPRESENTATION: &str = "from ssv";
-const DEFAULT_MINIMUM_SPACES: usize = 2;
-
-impl WholeStreamCommand for FromSsv {
-    fn name(&self) -> &str {
-        STRING_REPRESENTATION
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(STRING_REPRESENTATION)
-            .switch(
-                "noheaders",
-                "don't treat the first row as column names",
-                Some('n'),
-            )
-            .switch("aligned-columns", "assume columns are aligned", Some('a'))
-            .named(
-                "minimum-spaces",
-                SyntaxShape::Int,
-                "the minimum spaces to separate columns",
-                Some('m'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as space-separated values and create a table. The default minimum number of spaces counted as a separator is 2."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_ssv(args)
-    }
-}
-
-enum HeaderOptions<'a> {
-    WithHeaders(&'a str),
-    WithoutHeaders,
-}
-
-fn parse_aligned_columns<'a>(
-    lines: impl Iterator<Item = &'a str>,
-    headers: HeaderOptions,
-    separator: &str,
-) -> Vec<Vec<(String, String)>> {
-    fn construct<'a>(
-        lines: impl Iterator<Item = &'a str>,
-        headers: Vec<(String, usize)>,
-    ) -> Vec<Vec<(String, String)>> {
-        lines
-            .map(|l| {
-                headers
-                    .iter()
-                    .enumerate()
-                    .map(|(i, (header_name, start_position))| {
-                        let val = match headers.get(i + 1) {
-                            Some((_, end)) => {
-                                if *end < l.len() {
-                                    l.get(*start_position..*end)
-                                } else {
-                                    l.get(*start_position..)
-                                }
-                            }
-                            None => l.get(*start_position..),
-                        }
-                        .unwrap_or("")
-                        .trim()
-                        .into();
-                        (header_name.clone(), val)
-                    })
-                    .collect()
-            })
-            .collect()
-    }
-
-    let find_indices = |line: &str| {
-        let values = line
-            .split(&separator)
-            .map(str::trim)
-            .filter(|s| !s.is_empty());
-        values
-            .fold(
-                (0, vec![]),
-                |(current_pos, mut indices), value| match line[current_pos..].find(value) {
-                    None => (current_pos, indices),
-                    Some(index) => {
-                        let absolute_index = current_pos + index;
-                        indices.push(absolute_index);
-                        (absolute_index + value.len(), indices)
-                    }
-                },
-            )
-            .1
-    };
-
-    let parse_with_headers = |lines, headers_raw: &str| {
-        let indices = find_indices(headers_raw);
-        let headers = headers_raw
-            .split(&separator)
-            .map(str::trim)
-            .filter(|s| !s.is_empty())
-            .map(String::from)
-            .zip(indices);
-
-        let columns = headers.collect::<Vec<(String, usize)>>();
-
-        construct(lines, columns)
-    };
-
-    let parse_without_headers = |ls: Vec<&str>| {
-        let mut indices = ls
-            .iter()
-            .flat_map(|s| find_indices(*s))
-            .collect::<Vec<usize>>();
-
-        indices.sort_unstable();
-        indices.dedup();
-
-        let headers: Vec<(String, usize)> = indices
-            .iter()
-            .enumerate()
-            .map(|(i, position)| (format!("Column{}", i + 1), *position))
-            .collect();
-
-        construct(ls.iter().map(|s| s.to_owned()), headers)
-    };
-
-    match headers {
-        HeaderOptions::WithHeaders(headers_raw) => parse_with_headers(lines, headers_raw),
-        HeaderOptions::WithoutHeaders => parse_without_headers(lines.collect()),
-    }
-}
-
-fn parse_separated_columns<'a>(
-    lines: impl Iterator<Item = &'a str>,
-    headers: HeaderOptions,
-    separator: &str,
-) -> Vec<Vec<(String, String)>> {
-    fn collect<'a>(
-        headers: Vec<String>,
-        rows: impl Iterator<Item = &'a str>,
-        separator: &str,
-    ) -> Vec<Vec<(String, String)>> {
-        rows.map(|r| {
-            headers
-                .iter()
-                .zip(r.split(separator).map(str::trim).filter(|s| !s.is_empty()))
-                .map(|(a, b)| (a.to_owned(), b.to_owned()))
-                .collect()
-        })
-        .collect()
-    }
-
-    let parse_with_headers = |lines, headers_raw: &str| {
-        let headers = headers_raw
-            .split(&separator)
-            .map(str::trim)
-            .map(str::to_owned)
-            .filter(|s| !s.is_empty())
-            .collect();
-        collect(headers, lines, separator)
-    };
-
-    let parse_without_headers = |ls: Vec<&str>| {
-        let num_columns = ls.iter().map(|r| r.len()).max().unwrap_or(0);
-
-        let headers = (1..=num_columns)
-            .map(|i| format!("Column{}", i))
-            .collect::<Vec<String>>();
-        collect(headers, ls.into_iter(), separator)
-    };
-
-    match headers {
-        HeaderOptions::WithHeaders(headers_raw) => parse_with_headers(lines, headers_raw),
-        HeaderOptions::WithoutHeaders => parse_without_headers(lines.collect()),
-    }
-}
-
-fn string_to_table(
-    s: &str,
-    noheaders: bool,
-    aligned_columns: bool,
-    split_at: usize,
-) -> Vec<Vec<(String, String)>> {
-    let mut lines = s.lines().filter(|l| !l.trim().is_empty());
-    let separator = " ".repeat(std::cmp::max(split_at, 1));
-
-    let (ls, header_options) = if noheaders {
-        (lines, HeaderOptions::WithoutHeaders)
-    } else {
-        match lines.next() {
-            Some(header) => (lines, HeaderOptions::WithHeaders(header)),
-            None => return vec![],
-        }
-    };
-
-    let f = if aligned_columns {
-        parse_aligned_columns
-    } else {
-        parse_separated_columns
-    };
-
-    f(ls, header_options, &separator)
-}
-
-fn from_ssv_string_to_value(
-    s: &str,
-    noheaders: bool,
-    aligned_columns: bool,
-    split_at: usize,
-    tag: impl Into<Tag>,
-) -> Value {
-    let tag = tag.into();
-    let rows = string_to_table(s, noheaders, aligned_columns, split_at)
-        .iter()
-        .map(|row| {
-            let mut tagged_dict = TaggedDictBuilder::new(&tag);
-            for (col, entry) in row {
-                tagged_dict.insert_value(
-                    col,
-                    UntaggedValue::Primitive(Primitive::String(String::from(entry)))
-                        .into_value(&tag),
-                )
-            }
-            tagged_dict.into_value()
-        })
-        .collect();
-
-    UntaggedValue::Table(rows).into_value(&tag)
-}
-
-fn from_ssv(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let noheaders = args.has_flag("noheaders");
-    let aligned_columns = args.has_flag("aligned-columns");
-    let minimum_spaces: Option<Tagged<usize>> = args.get_flag("minimum-spaces")?;
-
-    let concat_string = args.input.collect_string(name.clone())?;
-    let split_at = match minimum_spaces {
-        Some(number) => number.item,
-        None => DEFAULT_MINIMUM_SPACES,
-    };
-
-    Ok(
-        match from_ssv_string_to_value(
-            &concat_string.item,
-            noheaders,
-            aligned_columns,
-            split_at,
-            name,
-        ) {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => list.into_iter().into_output_stream(),
-            x => OutputStream::one(x),
-        },
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::*;
-
-    fn owned(x: &str, y: &str) -> (String, String) {
-        (String::from(x), String::from(y))
-    }
-
-    #[test]
-    fn it_trims_empty_and_whitespace_only_lines() {
-        let input = r#"
-
-            a       b
-
-            1       2
-
-            3       4
-        "#;
-        let result = string_to_table(input, false, true, 1);
-        assert_eq!(
-            result,
-            vec![
-                vec![owned("a", "1"), owned("b", "2")],
-                vec![owned("a", "3"), owned("b", "4")]
-            ]
-        );
-    }
-
-    #[test]
-    fn it_deals_with_single_column_input() {
-        let input = r#"
-            a
-            1
-            2
-        "#;
-        let result = string_to_table(input, false, true, 1);
-        assert_eq!(result, vec![vec![owned("a", "1")], vec![owned("a", "2")]]);
-    }
-
-    #[test]
-    fn it_uses_first_row_as_data_when_noheaders() {
-        let input = r#"
-            a b
-            1 2
-            3 4
-        "#;
-        let result = string_to_table(input, true, true, 1);
-        assert_eq!(
-            result,
-            vec![
-                vec![owned("Column1", "a"), owned("Column2", "b")],
-                vec![owned("Column1", "1"), owned("Column2", "2")],
-                vec![owned("Column1", "3"), owned("Column2", "4")]
-            ]
-        );
-    }
-
-    #[test]
-    fn it_allows_a_predefined_number_of_spaces() {
-        let input = r#"
-            column a   column b
-            entry 1    entry number  2
-            3          four
-        "#;
-
-        let result = string_to_table(input, false, true, 3);
-        assert_eq!(
-            result,
-            vec![
-                vec![
-                    owned("column a", "entry 1"),
-                    owned("column b", "entry number  2")
-                ],
-                vec![owned("column a", "3"), owned("column b", "four")]
-            ]
-        );
-    }
-
-    #[test]
-    fn it_trims_remaining_separator_space() {
-        let input = r#"
-            colA   colB     colC
-            val1   val2     val3
-        "#;
-
-        let trimmed = |s: &str| s.trim() == s;
-
-        let result = string_to_table(input, false, true, 2);
-        assert!(result
-            .iter()
-            .all(|row| row.iter().all(|(a, b)| trimmed(a) && trimmed(b))));
-    }
-
-    #[test]
-    fn it_keeps_empty_columns() {
-        let input = r#"
-            colA   col B     col C
-                   val2      val3
-            val4   val 5     val 6
-            val7             val8
-        "#;
-
-        let result = string_to_table(input, false, true, 2);
-        assert_eq!(
-            result,
-            vec![
-                vec![
-                    owned("colA", ""),
-                    owned("col B", "val2"),
-                    owned("col C", "val3")
-                ],
-                vec![
-                    owned("colA", "val4"),
-                    owned("col B", "val 5"),
-                    owned("col C", "val 6")
-                ],
-                vec![
-                    owned("colA", "val7"),
-                    owned("col B", ""),
-                    owned("col C", "val8")
-                ],
-            ]
-        );
-    }
-
-    #[test]
-    fn it_can_produce_an_empty_stream_for_header_only_input() {
-        let input = "colA   col B";
-
-        let result = string_to_table(input, false, true, 2);
-        let expected: Vec<Vec<(String, String)>> = vec![];
-        assert_eq!(expected, result);
-    }
-
-    #[test]
-    fn it_uses_the_full_final_column() {
-        let input = r#"
-            colA   col B
-            val1   val2   trailing value that should be included
-        "#;
-
-        let result = string_to_table(input, false, true, 2);
-        assert_eq!(
-            result,
-            vec![vec![
-                owned("colA", "val1"),
-                owned("col B", "val2   trailing value that should be included"),
-            ]]
-        );
-    }
-
-    #[test]
-    fn it_handles_empty_values_when_noheaders_and_aligned_columns() {
-        let input = r#"
-            a multi-word value  b           d
-            1                        3-3    4
-                                                       last
-        "#;
-
-        let result = string_to_table(input, true, true, 2);
-        assert_eq!(
-            result,
-            vec![
-                vec![
-                    owned("Column1", "a multi-word value"),
-                    owned("Column2", "b"),
-                    owned("Column3", ""),
-                    owned("Column4", "d"),
-                    owned("Column5", "")
-                ],
-                vec![
-                    owned("Column1", "1"),
-                    owned("Column2", ""),
-                    owned("Column3", "3-3"),
-                    owned("Column4", "4"),
-                    owned("Column5", "")
-                ],
-                vec![
-                    owned("Column1", ""),
-                    owned("Column2", ""),
-                    owned("Column3", ""),
-                    owned("Column4", ""),
-                    owned("Column5", "last")
-                ],
-            ]
-        );
-    }
-
-    #[test]
-    fn input_is_parsed_correctly_if_either_option_works() {
-        let input = r#"
-                docker-registry   docker-registry=default                   docker-registry=default   172.30.78.158   5000/TCP
-                kubernetes        component=apiserver,provider=kubernetes   <none>                    172.30.0.2      443/TCP
-                kubernetes-ro     component=apiserver,provider=kubernetes   <none>                    172.30.0.1      80/TCP
-            "#;
-
-        let aligned_columns_noheaders = string_to_table(input, true, true, 2);
-        let separator_noheaders = string_to_table(input, true, false, 2);
-        let aligned_columns_with_headers = string_to_table(input, false, true, 2);
-        let separator_with_headers = string_to_table(input, false, false, 2);
-        assert_eq!(aligned_columns_noheaders, separator_noheaders);
-        assert_eq!(aligned_columns_with_headers, separator_with_headers);
-    }
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use super::FromSsv;
-        use crate::examples::test as test_examples;
-
-        test_examples(FromSsv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/toml.rs b/old_nushell/crates/nu-command/src/commands/formats/from/toml.rs
deleted file mode 100644
index f65cd3d98..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/toml.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-#[derive(Debug, thiserror::Error)]
-pub enum DeserializationError {
-    #[error("Failed to parse input as TOML")]
-    Toml(#[from] toml::de::Error),
-
-    #[error("Failed to convert to a nushell value")]
-    Nu(#[from] Box<nu_serde::Error>),
-}
-
-pub struct FromToml;
-
-impl WholeStreamCommand for FromToml {
-    fn name(&self) -> &str {
-        "from toml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from toml")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .toml and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_toml(args)
-    }
-}
-
-pub fn from_toml_string_to_value(
-    s: String,
-    tag: impl Into<Tag>,
-) -> Result<Value, DeserializationError> {
-    let v: toml::Value = s.parse::<toml::Value>()?;
-
-    Ok(nu_serde::to_value(v, tag).map_err(Box::new)?)
-}
-
-pub fn from_toml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let concat_string = input.collect_string(tag.clone())?;
-    Ok(
-        match from_toml_string_to_value(concat_string.item, tag.clone()) {
-            Ok(x) => match x {
-                Value {
-                    value: UntaggedValue::Table(list),
-                    ..
-                } => list.into_iter().into_output_stream(),
-                x => OutputStream::one(x),
-            },
-            Err(_) => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Could not parse as TOML",
-                    "input cannot be parsed as TOML",
-                    &tag,
-                    "value originates from here",
-                    concat_string.tag,
-                ))
-            }
-        },
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromToml;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromToml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/tsv.rs b/old_nushell/crates/nu-command/src/commands/formats/from/tsv.rs
deleted file mode 100644
index 4c9c8b610..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/tsv.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use super::delimited::from_delimited_data;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-
-pub struct FromTsv;
-
-impl WholeStreamCommand for FromTsv {
-    fn name(&self) -> &str {
-        "from tsv"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from tsv").switch(
-            "noheaders",
-            "don't treat the first row as column names",
-            Some('n'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .tsv and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_tsv(args)
-    }
-}
-
-fn from_tsv(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let noheaders = args.has_flag("noheaders");
-    let input = args.input;
-
-    from_delimited_data(noheaders, '\t', "TSV", input, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromTsv;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromTsv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/url.rs b/old_nushell/crates/nu-command/src/commands/formats/from/url.rs
deleted file mode 100644
index f3c9e9bac..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/url.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, TaggedDictBuilder, UntaggedValue};
-
-pub struct FromUrl;
-
-impl WholeStreamCommand for FromUrl {
-    fn name(&self) -> &str {
-        "from url"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from url")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse url-encoded string as a table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_url(args)
-    }
-}
-
-fn from_url(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let concat_string = input.collect_string(tag.clone())?;
-
-    let result = serde_urlencoded::from_str::<Vec<(String, String)>>(&concat_string.item);
-
-    match result {
-        Ok(result) => {
-            let mut row = TaggedDictBuilder::new(tag);
-
-            for (k, v) in result {
-                row.insert_untagged(k, UntaggedValue::string(v));
-            }
-
-            Ok(OutputStream::one(row.into_value()))
-        }
-        _ => Err(ShellError::labeled_error_with_secondary(
-            "String not compatible with url-encoding",
-            "input not url-encoded",
-            tag,
-            "value originates from here",
-            concat_string.tag,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromUrl;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromUrl {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/vcf.rs b/old_nushell/crates/nu-command/src/commands/formats/from/vcf.rs
deleted file mode 100644
index f5b7d1f24..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/vcf.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use crate::prelude::*;
-use ical::parser::vcard::component::*;
-use ical::property::Property;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, TaggedDictBuilder, UntaggedValue, Value};
-
-pub struct FromVcf;
-
-impl WholeStreamCommand for FromVcf {
-    fn name(&self) -> &str {
-        "from vcf"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from vcf")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .vcf and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_vcf(args)
-    }
-}
-
-fn from_vcf(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let input_string = input.collect_string(tag.clone())?.item;
-    let input_bytes = input_string.into_bytes();
-    let cursor = std::io::Cursor::new(input_bytes);
-    let parser = ical::VcardParser::new(cursor);
-
-    let iter = parser.map(move |contact| match contact {
-        Ok(c) => contact_to_value(c, tag.clone()),
-        Err(_) => Value::error(ShellError::labeled_error(
-            "Could not parse as .vcf",
-            "input cannot be parsed as .vcf",
-            tag.clone(),
-        )),
-    });
-
-    let collected: Vec<_> = iter.collect();
-
-    Ok(collected.into_iter().into_output_stream())
-}
-
-fn contact_to_value(contact: VcardContact, tag: Tag) -> Value {
-    let mut row = TaggedDictBuilder::new(tag.clone());
-    row.insert_untagged("properties", properties_to_value(contact.properties, tag));
-    row.into_value()
-}
-
-fn properties_to_value(properties: Vec<Property>, tag: Tag) -> UntaggedValue {
-    UntaggedValue::table(
-        &properties
-            .into_iter()
-            .map(|prop| {
-                let mut row = TaggedDictBuilder::new(tag.clone());
-
-                let name = UntaggedValue::string(prop.name);
-                let value = match prop.value {
-                    Some(val) => UntaggedValue::string(val),
-                    None => UntaggedValue::Primitive(Primitive::Nothing),
-                };
-                let params = match prop.params {
-                    Some(param_list) => params_to_value(param_list, tag.clone()).into(),
-                    None => UntaggedValue::Primitive(Primitive::Nothing),
-                };
-
-                row.insert_untagged("name", name);
-                row.insert_untagged("value", value);
-                row.insert_untagged("params", params);
-                row.into_value()
-            })
-            .collect::<Vec<Value>>(),
-    )
-}
-
-fn params_to_value(params: Vec<(String, Vec<String>)>, tag: Tag) -> Value {
-    let mut row = TaggedDictBuilder::new(tag);
-
-    for (param_name, param_values) in params {
-        let values: Vec<Value> = param_values.into_iter().map(|val| val.into()).collect();
-        let values = UntaggedValue::table(&values);
-        row.insert_untagged(param_name, values);
-    }
-
-    row.into_value()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromVcf;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromVcf {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/xlsx.rs b/old_nushell/crates/nu-command/src/commands/formats/from/xlsx.rs
deleted file mode 100644
index 0bf2c0d6b..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/xlsx.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use crate::prelude::*;
-use calamine::*;
-use nu_data::TaggedListBuilder;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use std::io::Cursor;
-
-pub struct FromXlsx;
-
-impl WholeStreamCommand for FromXlsx {
-    fn name(&self) -> &str {
-        "from xlsx"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from xlsx")
-            .switch(
-                "noheaders",
-                "don't treat the first row as column names",
-                Some('n'),
-            )
-            .named(
-                "sheets",
-                SyntaxShape::Table,
-                "Only convert specified sheets",
-                Some('s'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Parse binary Excel(.xlsx) data and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_xlsx(args)
-    }
-}
-
-// Adapted from crates/nu-command/src/commands/dataframe/utils.rs
-fn convert_columns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
-    let res = columns
-        .iter()
-        .map(|value| match &value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => Ok(s.clone()),
-            _ => Err(ShellError::labeled_error(
-                "Incorrect column format",
-                "Only string as column name",
-                &value.tag,
-            )),
-        })
-        .collect::<Result<Vec<String>, _>>()?;
-
-    Ok(res)
-}
-
-fn from_xlsx(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let span = tag.span;
-
-    let mut sel_sheets = vec![];
-
-    if let Some(columns) = args.get_flag::<Vec<Value>>("sheets")? {
-        sel_sheets = convert_columns(columns.as_slice())?;
-    }
-
-    let value = args.input.collect_binary(tag.clone())?;
-
-    let buf: Cursor<Vec<u8>> = Cursor::new(value.item);
-    let mut xls = Xlsx::<_>::new(buf).map_err(|_| {
-        ShellError::labeled_error("Could not load xlsx file", "could not load xlsx file", &tag)
-    })?;
-
-    let mut dict = TaggedDictBuilder::new(&tag);
-
-    let mut sheet_names = xls.sheet_names().to_owned();
-    if !sel_sheets.is_empty() {
-        sheet_names.retain(|e| sel_sheets.contains(e));
-    }
-
-    for sheet_name in &sheet_names {
-        let mut sheet_output = TaggedListBuilder::new(&tag);
-
-        if let Some(Ok(current_sheet)) = xls.worksheet_range(sheet_name) {
-            for row in current_sheet.rows() {
-                let mut row_output = TaggedDictBuilder::new(&tag);
-                for (i, cell) in row.iter().enumerate() {
-                    let value = match cell {
-                        DataType::Empty => UntaggedValue::nothing(),
-                        DataType::String(s) => UntaggedValue::string(s),
-                        DataType::Float(f) => UntaggedValue::decimal_from_float(*f, span),
-                        DataType::Int(i) => UntaggedValue::int(*i),
-                        DataType::Bool(b) => UntaggedValue::boolean(*b),
-                        _ => UntaggedValue::nothing(),
-                    };
-
-                    row_output.insert_untagged(&format!("Column{}", i), value);
-                }
-
-                sheet_output.push_untagged(row_output.into_untagged_value());
-            }
-
-            dict.insert_untagged(sheet_name, sheet_output.into_untagged_value());
-        } else {
-            return Err(ShellError::labeled_error(
-                "Could not load sheet",
-                "could not load sheet",
-                &tag,
-            ));
-        }
-    }
-
-    Ok(OutputStream::one(dict.into_value()))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FromXlsx;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromXlsx {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/xml.rs b/old_nushell/crates/nu-command/src/commands/formats/from/xml.rs
deleted file mode 100644
index 34a94c6fc..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/xml.rs
+++ /dev/null
@@ -1,302 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, TaggedDictBuilder, UntaggedValue, Value};
-
-pub struct FromXml;
-
-impl WholeStreamCommand for FromXml {
-    fn name(&self) -> &str {
-        "from xml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from xml")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .xml and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_xml(args)
-    }
-}
-
-fn from_attributes_to_value(attributes: &[roxmltree::Attribute], tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-
-    let mut collected = TaggedDictBuilder::new(tag);
-    for a in attributes {
-        collected.insert_untagged(String::from(a.name()), UntaggedValue::string(a.value()));
-    }
-
-    collected.into_value()
-}
-
-fn from_node_to_value(n: &roxmltree::Node, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-
-    if n.is_element() {
-        let name = n.tag_name().name().trim().to_string();
-
-        let mut children_values = vec![];
-        for c in n.children() {
-            children_values.push(from_node_to_value(&c, &tag));
-        }
-
-        let children_values: Vec<Value> = children_values
-            .into_iter()
-            .filter(|x| match x {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(f)),
-                    ..
-                } => {
-                    !f.trim().is_empty() // non-whitespace characters?
-                }
-                _ => true,
-            })
-            .collect();
-
-        let mut collected = TaggedDictBuilder::new(&tag);
-
-        let attribute_value: Value = from_attributes_to_value(n.attributes(), &tag);
-
-        let mut row = TaggedDictBuilder::new(&tag);
-        row.insert_untagged(
-            String::from("children"),
-            UntaggedValue::Table(children_values),
-        );
-        row.insert_untagged(String::from("attributes"), attribute_value);
-        collected.insert_untagged(name, row.into_value());
-
-        collected.into_value()
-    } else if n.is_comment() {
-        UntaggedValue::string("<comment>").into_value(tag)
-    } else if n.is_pi() {
-        UntaggedValue::string("<processing_instruction>").into_value(tag)
-    } else if n.is_text() {
-        match n.text() {
-            Some(text) => UntaggedValue::string(text).into_value(tag),
-            None => UntaggedValue::string("<error>").into_value(tag),
-        }
-    } else {
-        UntaggedValue::string("<unknown>").into_value(tag)
-    }
-}
-
-fn from_document_to_value(d: &roxmltree::Document, tag: impl Into<Tag>) -> Value {
-    from_node_to_value(&d.root_element(), tag)
-}
-
-pub fn from_xml_string_to_value(s: String, tag: impl Into<Tag>) -> Result<Value, roxmltree::Error> {
-    let parsed = roxmltree::Document::parse(&s)?;
-    Ok(from_document_to_value(&parsed, tag))
-}
-
-fn from_xml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let concat_string = input.collect_string(tag.clone())?;
-
-    Ok(
-        match from_xml_string_to_value(concat_string.item, tag.clone()) {
-            Ok(x) => match x {
-                Value {
-                    value: UntaggedValue::Table(list),
-                    ..
-                } => list.into_iter().into_output_stream(),
-                x => OutputStream::one(x),
-            },
-            Err(_) => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Could not parse as XML",
-                    "input cannot be parsed as XML",
-                    &tag,
-                    "value originates from here",
-                    &concat_string.tag,
-                ))
-            }
-        },
-    )
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use indexmap::IndexMap;
-    use nu_protocol::{UntaggedValue, Value};
-
-    fn string(input: impl Into<String>) -> Value {
-        UntaggedValue::string(input.into()).into_untagged_value()
-    }
-
-    fn row(entries: IndexMap<String, Value>) -> Value {
-        UntaggedValue::row(entries).into_untagged_value()
-    }
-
-    fn table(list: &[Value]) -> Value {
-        UntaggedValue::table(list).into_untagged_value()
-    }
-
-    fn parse(xml: &str) -> Result<Value, roxmltree::Error> {
-        from_xml_string_to_value(xml.to_string(), Tag::unknown())
-    }
-
-    #[test]
-    fn parses_empty_element() -> Result<(), roxmltree::Error> {
-        let source = "<nu></nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[]),
-                    "attributes".into() => row(indexmap! {})
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn parses_element_with_text() -> Result<(), roxmltree::Error> {
-        let source = "<nu>La era de los tres caballeros</nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[string("La era de los tres caballeros")]),
-                    "attributes".into() => row(indexmap! {})
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn parses_element_with_elements() -> Result<(), roxmltree::Error> {
-        let source = "\
-<nu>
-    <dev>Andrés</dev>
-    <dev>Jonathan</dev>
-    <dev>Yehuda</dev>
-</nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[
-                        row(indexmap! {
-                            "dev".into() => row(indexmap! {
-                                "children".into() => table(&[string("Andrés")]),
-                                "attributes".into() => row(indexmap! {})
-                            })
-                        }),
-                        row(indexmap! {
-                            "dev".into() => row(indexmap! {
-                                "children".into() => table(&[string("Jonathan")]),
-                                "attributes".into() => row(indexmap! {})
-                            })
-                        }),
-                        row(indexmap! {
-                            "dev".into() => row(indexmap! {
-                                "children".into() => table(&[string("Yehuda")]),
-                                "attributes".into() => row(indexmap! {})
-                            })
-                        })
-                    ]),
-                    "attributes".into() => row(indexmap! {})
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn parses_element_with_attribute() -> Result<(), roxmltree::Error> {
-        let source = "\
-<nu version=\"2.0\">
-</nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[]),
-                    "attributes".into() => row(indexmap! {
-                        "version".into() => string("2.0")
-                    })
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn parses_element_with_attribute_and_element() -> Result<(), roxmltree::Error> {
-        let source = "\
-<nu version=\"2.0\">
-    <version>2.0</version>
-</nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[
-                           row(indexmap! {
-                                "version".into() => row(indexmap! {
-                                    "children".into() => table(&[string("2.0")]),
-                                    "attributes".into() => row(indexmap! {})
-                                })
-                          })
-                    ]),
-                    "attributes".into() => row(indexmap! {
-                        "version".into() => string("2.0")
-                    })
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn parses_element_with_multiple_attributes() -> Result<(), roxmltree::Error> {
-        let source = "\
-<nu version=\"2.0\" age=\"25\">
-</nu>";
-
-        assert_eq!(
-            parse(source)?,
-            row(indexmap! {
-                "nu".into() => row(indexmap! {
-                    "children".into() => table(&[]),
-                    "attributes".into() => row(indexmap! {
-                        "version".into() => string("2.0"),
-                        "age".into() => string("25")
-                    })
-                })
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use super::FromXml;
-        use crate::examples::test as test_examples;
-
-        test_examples(FromXml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/from/yaml.rs b/old_nushell/crates/nu-command/src/commands/formats/from/yaml.rs
deleted file mode 100644
index b371074a1..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/from/yaml.rs
+++ /dev/null
@@ -1,258 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, TaggedDictBuilder, UntaggedValue, Value};
-
-pub struct FromYaml;
-
-impl WholeStreamCommand for FromYaml {
-    fn name(&self) -> &str {
-        "from yaml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from yaml")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .yaml/.yml and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_yaml(args)
-    }
-}
-
-pub struct FromYml;
-
-impl WholeStreamCommand for FromYml {
-    fn name(&self) -> &str {
-        "from yml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("from yml")
-    }
-
-    fn usage(&self) -> &str {
-        "Parse text as .yaml/.yml and create table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        from_yaml(args)
-    }
-}
-
-fn convert_yaml_value_to_nu_value(
-    v: &serde_yaml::Value,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    let span = tag.span;
-
-    let err_not_compatible_number = ShellError::labeled_error(
-        "Expected a compatible number",
-        "expected a compatible number",
-        &tag,
-    );
-    Ok(match v {
-        serde_yaml::Value::Bool(b) => UntaggedValue::boolean(*b).into_value(tag),
-        serde_yaml::Value::Number(n) if n.is_i64() => {
-            UntaggedValue::int(n.as_i64().ok_or(err_not_compatible_number)?).into_value(tag)
-        }
-        serde_yaml::Value::Number(n) if n.is_f64() => {
-            UntaggedValue::decimal_from_float(n.as_f64().ok_or(err_not_compatible_number)?, span)
-                .into_value(tag)
-        }
-        serde_yaml::Value::String(s) => UntaggedValue::string(s).into_value(tag),
-        serde_yaml::Value::Sequence(a) => {
-            let result: Result<Vec<Value>, ShellError> = a
-                .iter()
-                .map(|x| convert_yaml_value_to_nu_value(x, &tag))
-                .collect();
-            UntaggedValue::Table(result?).into_value(tag)
-        }
-        serde_yaml::Value::Mapping(t) => {
-            let mut collected = TaggedDictBuilder::new(&tag);
-
-            for (k, v) in t {
-                // A ShellError that we re-use multiple times in the Mapping scenario
-                let err_unexpected_map = ShellError::labeled_error(
-                    format!("Unexpected YAML:\nKey: {:?}\nValue: {:?}", k, v),
-                    "unexpected",
-                    tag.clone(),
-                );
-                match (k, v) {
-                    (serde_yaml::Value::String(k), _) => {
-                        collected.insert_value(k.clone(), convert_yaml_value_to_nu_value(v, &tag)?);
-                    }
-                    // Hard-code fix for cases where "v" is a string without quotations with double curly braces
-                    // e.g. k = value
-                    // value: {{ something }}
-                    // Strangely, serde_yaml returns
-                    // "value" -> Mapping(Mapping { map: {Mapping(Mapping { map: {String("something"): Null} }): Null} })
-                    (serde_yaml::Value::Mapping(m), serde_yaml::Value::Null) => {
-                        return m
-                            .iter()
-                            .take(1)
-                            .collect_vec()
-                            .first()
-                            .and_then(|e| match e {
-                                (serde_yaml::Value::String(s), serde_yaml::Value::Null) => Some(
-                                    UntaggedValue::string("{{ ".to_owned() + s + " }}")
-                                        .into_value(tag),
-                                ),
-                                _ => None,
-                            })
-                            .ok_or(err_unexpected_map);
-                    }
-                    (_, _) => {
-                        return Err(err_unexpected_map);
-                    }
-                }
-            }
-
-            collected.into_value()
-        }
-        serde_yaml::Value::Null => UntaggedValue::Primitive(Primitive::Nothing).into_value(tag),
-        x => unimplemented!("Unsupported yaml case: {:?}", x),
-    })
-}
-
-pub fn from_yaml_string_to_value(s: String, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut documents = vec![];
-
-    for document in serde_yaml::Deserializer::from_str(&s) {
-        let v: serde_yaml::Value = serde_yaml::Value::deserialize(document).map_err(|x| {
-            ShellError::labeled_error(
-                format!("Could not load yaml: {}", x),
-                "could not load yaml from text",
-                &tag,
-            )
-        })?;
-
-        documents.push(convert_yaml_value_to_nu_value(&v, tag.clone())?);
-    }
-
-    match documents.len() {
-        0 => Ok(UntaggedValue::nothing().into_value(tag)),
-        1 => Ok(documents.remove(0)),
-        _ => Ok(UntaggedValue::Table(documents).into_value(tag)),
-    }
-}
-
-fn from_yaml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    let concat_string = input.collect_string(tag.clone())?;
-
-    match from_yaml_string_to_value(concat_string.item, tag.clone()) {
-        Ok(x) => match x {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => Ok(list.into_iter().into_output_stream()),
-            x => Ok(OutputStream::one(x)),
-        },
-        Err(_) => Err(ShellError::labeled_error_with_secondary(
-            "Could not parse as YAML",
-            "input cannot be parsed as YAML",
-            &tag,
-            "value originates from here",
-            &concat_string.tag,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::*;
-    use nu_protocol::row;
-    use nu_test_support::value::int;
-    use nu_test_support::value::row;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FromYaml {})
-    }
-
-    #[test]
-    fn test_problematic_yaml() {
-        struct TestCase {
-            description: &'static str,
-            input: &'static str,
-            expected: Result<Value, ShellError>,
-        }
-        let tt: Vec<TestCase> = vec![
-            TestCase {
-                description: "Double Curly Braces With Quotes",
-                input: r#"value: "{{ something }}""#,
-                expected: Ok(row!["value".to_owned() => string("{{ something }}")]),
-            },
-            TestCase {
-                description: "Double Curly Braces Without Quotes",
-                input: r#"value: {{ something }}"#,
-                expected: Ok(row!["value".to_owned() => string("{{ something }}")]),
-            },
-        ];
-        for tc in tt {
-            let actual = from_yaml_string_to_value(tc.input.to_owned(), Tag::default());
-            if actual.is_err() {
-                assert!(
-                    tc.expected.is_err(),
-                    "actual is Err for test:\nTest Description {}\nErr: {:?}",
-                    tc.description,
-                    actual
-                );
-            } else {
-                assert_eq!(actual, tc.expected, "{}", tc.description);
-            }
-        }
-    }
-
-    #[test]
-    fn test_empty_yaml() {
-        let input = "";
-
-        let expected = UntaggedValue::nothing().into_value(Tag::default());
-
-        let actual = from_yaml_string_to_value(input.to_owned(), Tag::default());
-
-        assert_eq!(Ok(expected), actual);
-    }
-
-    #[test]
-    fn test_single_doc_yaml() {
-        let input = "k: 107\nj: '106'\n";
-
-        let expected =
-            UntaggedValue::row(indexmap! {"k".into() => int(107), "j".into() => string("106") })
-                .into_value(Tag::default());
-
-        let actual = from_yaml_string_to_value(input.to_owned(), Tag::default());
-
-        assert_eq!(Ok(expected), actual);
-    }
-
-    #[test]
-    fn test_multidoc_yaml() {
-        let input = "---\nk: 107\n---\nj: '106'\n";
-
-        let expected = UntaggedValue::table(&[
-            row(indexmap! {"k".into() => int(107) }),
-            row(indexmap! {"j".into() => string("106") }),
-        ])
-        .into_value(Tag::default());
-
-        let actual = from_yaml_string_to_value(input.to_owned(), Tag::default());
-
-        assert_eq!(Ok(expected), actual);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/mod.rs b/old_nushell/crates/nu-command/src/commands/formats/mod.rs
deleted file mode 100644
index 86f06f85f..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod from;
-mod to;
-
-pub use from::*;
-pub use to::*;
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/command.rs b/old_nushell/crates/nu-command/src/commands/formats/to/command.rs
deleted file mode 100644
index 75573f098..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/command.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-#[derive(Clone)]
-pub struct To;
-
-impl WholeStreamCommand for To {
-    fn name(&self) -> &str {
-        "to"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to")
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into an output format (based on subcommand, like csv, html, json, yaml)."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&To, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::To;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(To {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/csv.rs b/old_nushell/crates/nu-command/src/commands/formats/to/csv.rs
deleted file mode 100644
index b7069c051..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/csv.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::commands::formats::to::delimited::to_delimited_data;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct ToCsv;
-
-impl WholeStreamCommand for ToCsv {
-    fn name(&self) -> &str {
-        "to csv"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to csv")
-            .named(
-                "separator",
-                SyntaxShape::String,
-                "a character to separate columns, defaults to ','",
-                Some('s'),
-            )
-            .switch(
-                "noheaders",
-                "do not output the columns names as the first row",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into .csv text "
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_csv(args)
-    }
-}
-
-fn to_csv(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let separator: Option<Value> = args.get_flag("separator")?;
-    let noheaders = args.has_flag("noheaders");
-    let input = args.input;
-    let sep = match separator {
-        Some(Value {
-            value: UntaggedValue::Primitive(Primitive::String(s)),
-            tag,
-            ..
-        }) => {
-            if s == r"\t" {
-                '\t'
-            } else {
-                let vec_s: Vec<char> = s.chars().collect();
-                if vec_s.len() != 1 {
-                    return Err(ShellError::labeled_error(
-                        "Expected a single separator char from --separator",
-                        "requires a single character string input",
-                        tag,
-                    ));
-                };
-                vec_s[0]
-            }
-        }
-        _ => ',',
-    };
-
-    to_delimited_data(noheaders, sep, "CSV", input, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToCsv;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToCsv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/delimited.rs b/old_nushell/crates/nu-command/src/commands/formats/to/delimited.rs
deleted file mode 100644
index 2b48d61f1..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/delimited.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-use crate::prelude::*;
-use csv::WriterBuilder;
-use indexmap::{indexset, IndexSet};
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, UntaggedValue, Value};
-use nu_source::Spanned;
-use nu_value_ext::{as_string, ValueExt};
-
-fn from_value_to_delimited_string(
-    tagged_value: &Value,
-    separator: char,
-) -> Result<String, ShellError> {
-    let v = &tagged_value.value;
-
-    match v {
-        UntaggedValue::Row(o) => {
-            let mut wtr = WriterBuilder::new()
-                .delimiter(separator as u8)
-                .from_writer(vec![]);
-            let mut fields: VecDeque<String> = VecDeque::new();
-            let mut values: VecDeque<String> = VecDeque::new();
-
-            for (k, v) in &o.entries {
-                fields.push_back(k.clone());
-
-                values.push_back(to_string_tagged_value(v)?);
-            }
-
-            wtr.write_record(fields).expect("can not write.");
-            wtr.write_record(values).expect("can not write.");
-
-            let v = String::from_utf8(wtr.into_inner().map_err(|_| {
-                ShellError::labeled_error(
-                    "Could not convert record",
-                    "original value",
-                    &tagged_value.tag,
-                )
-            })?)
-            .map_err(|_| {
-                ShellError::labeled_error(
-                    "Could not convert record",
-                    "original value",
-                    &tagged_value.tag,
-                )
-            })?;
-            Ok(v)
-        }
-        UntaggedValue::Table(list) => {
-            let mut wtr = WriterBuilder::new()
-                .delimiter(separator as u8)
-                .from_writer(vec![]);
-
-            let merged_descriptors = merge_descriptors(list);
-
-            if merged_descriptors.is_empty() {
-                wtr.write_record(
-                    list.iter()
-                        .map(|ele| to_string_tagged_value(ele).unwrap_or_else(|_| String::new()))
-                        .collect::<Vec<_>>(),
-                )
-                .expect("can not write");
-            } else {
-                wtr.write_record(merged_descriptors.iter().map(|item| &item.item[..]))
-                    .expect("can not write.");
-
-                for l in list {
-                    let mut row = vec![];
-                    for desc in &merged_descriptors {
-                        row.push(match l.get_data_by_key(desc.borrow_spanned()) {
-                            Some(s) => to_string_tagged_value(&s)?,
-                            None => String::new(),
-                        });
-                    }
-                    wtr.write_record(&row).expect("can not write");
-                }
-            }
-            let v = String::from_utf8(wtr.into_inner().map_err(|_| {
-                ShellError::labeled_error(
-                    "Could not convert record",
-                    "original value",
-                    &tagged_value.tag,
-                )
-            })?)
-            .map_err(|_| {
-                ShellError::labeled_error(
-                    "Could not convert record",
-                    "original value",
-                    &tagged_value.tag,
-                )
-            })?;
-            Ok(v)
-        }
-        _ => to_string_tagged_value(tagged_value),
-    }
-}
-
-// NOTE: could this be useful more widely and implemented on Value ?
-pub fn clone_tagged_value(v: &Value) -> Value {
-    match &v.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            UntaggedValue::Primitive(Primitive::String(s.clone()))
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => {
-            UntaggedValue::Primitive(Primitive::Nothing)
-        }
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => {
-            UntaggedValue::Primitive(Primitive::Boolean(*b))
-        }
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => {
-            UntaggedValue::Primitive(Primitive::Decimal(f.clone()))
-        }
-        UntaggedValue::Primitive(Primitive::Int(i)) => UntaggedValue::Primitive(Primitive::Int(*i)),
-        UntaggedValue::Primitive(Primitive::FilePath(x)) => {
-            UntaggedValue::Primitive(Primitive::FilePath(x.clone()))
-        }
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => {
-            UntaggedValue::Primitive(Primitive::Filesize(*b))
-        }
-        UntaggedValue::Primitive(Primitive::Date(d)) => {
-            UntaggedValue::Primitive(Primitive::Date(*d))
-        }
-        UntaggedValue::Row(o) => UntaggedValue::Row(o.clone()),
-        UntaggedValue::Table(l) => UntaggedValue::Table(l.clone()),
-        UntaggedValue::Block(_) => UntaggedValue::Primitive(Primitive::Nothing),
-        _ => UntaggedValue::Primitive(Primitive::Nothing),
-    }
-    .into_value(v.tag.clone())
-}
-
-// NOTE: could this be useful more widely and implemented on Value ?
-fn to_string_tagged_value(v: &Value) -> Result<String, ShellError> {
-    match &v.value {
-        UntaggedValue::Primitive(
-            Primitive::String(_)
-            | Primitive::Filesize(_)
-            | Primitive::Boolean(_)
-            | Primitive::Decimal(_)
-            | Primitive::FilePath(_)
-            | Primitive::Int(_)
-            | Primitive::BigInt(_),
-        ) => as_string(v),
-        UntaggedValue::Primitive(Primitive::Date(d)) => Ok(d.to_string()),
-        UntaggedValue::Primitive(Primitive::Nothing) => Ok(String::new()),
-        UntaggedValue::Table(_) => Ok(String::from("[Table]")),
-        UntaggedValue::Row(_) => Ok(String::from("[Row]")),
-        _ => Err(ShellError::labeled_error(
-            "Unexpected value",
-            "",
-            v.tag.clone(),
-        )),
-    }
-}
-
-fn merge_descriptors(values: &[Value]) -> Vec<Spanned<String>> {
-    let mut ret: Vec<Spanned<String>> = vec![];
-    let mut seen: IndexSet<String> = indexset! {};
-    for value in values {
-        for desc in value.data_descriptors() {
-            if !seen.contains(&desc) {
-                seen.insert(desc.clone());
-                ret.push(desc.spanned(value.tag.span));
-            }
-        }
-    }
-    ret
-}
-
-pub fn to_delimited_data(
-    noheaders: bool,
-    sep: char,
-    format_name: &'static str,
-    input: InputStream,
-    name: Tag,
-) -> Result<OutputStream, ShellError> {
-    let name_tag = name;
-    let name_span = name_tag.span;
-
-    let input: Vec<Value> = input.collect();
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    Ok((to_process_input.into_iter().map(move |value| {
-        match from_value_to_delimited_string(&clone_tagged_value(&value), sep) {
-            Ok(mut x) => {
-                if noheaders {
-                    if let Some(second_line) = x.find('\n') {
-                        let start = second_line + 1;
-                        x.replace_range(0..start, "");
-                    }
-                }
-                UntaggedValue::Primitive(Primitive::String(x)).into_value(&name_tag)
-            }
-            Err(_) => {
-                let expected = format!(
-                    "Expected a table with {}-compatible structure from pipeline",
-                    format_name
-                );
-                let requires = format!("requires {}-compatible input", format_name);
-                Value::error(ShellError::labeled_error_with_secondary(
-                    expected,
-                    requires,
-                    name_span,
-                    "originates from here".to_string(),
-                    value.tag.span,
-                ))
-            }
-        }
-    }))
-    .into_output_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/html.rs b/old_nushell/crates/nu-command/src/commands/formats/to/html.rs
deleted file mode 100644
index 991f17e69..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/html.rs
+++ /dev/null
@@ -1,743 +0,0 @@
-use crate::prelude::*;
-
-use nu_data::value::format_leaf;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::{AnchorLocation, Tagged};
-use regex::Regex;
-use rust_embed::RustEmbed;
-use serde::{Deserialize, Serialize};
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::error::Error;
-use std::fmt::Write;
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct HtmlThemes {
-    themes: Vec<HtmlTheme>,
-}
-
-#[allow(non_snake_case)]
-#[derive(Serialize, Deserialize, Debug)]
-pub struct HtmlTheme {
-    name: String,
-    black: String,
-    red: String,
-    green: String,
-    yellow: String,
-    blue: String,
-    purple: String,
-    cyan: String,
-    white: String,
-    brightBlack: String,
-    brightRed: String,
-    brightGreen: String,
-    brightYellow: String,
-    brightBlue: String,
-    brightPurple: String,
-    brightCyan: String,
-    brightWhite: String,
-    background: String,
-    foreground: String,
-}
-
-impl Default for HtmlThemes {
-    fn default() -> Self {
-        HtmlThemes {
-            themes: vec![HtmlTheme::default()],
-        }
-    }
-}
-
-impl Default for HtmlTheme {
-    fn default() -> Self {
-        HtmlTheme {
-            name: "nu_default".to_string(),
-            black: "black".to_string(),
-            red: "red".to_string(),
-            green: "green".to_string(),
-            yellow: "#717100".to_string(),
-            blue: "blue".to_string(),
-            purple: "#c800c8".to_string(),
-            cyan: "#037979".to_string(),
-            white: "white".to_string(),
-            brightBlack: "black".to_string(),
-            brightRed: "red".to_string(),
-            brightGreen: "green".to_string(),
-            brightYellow: "#717100".to_string(),
-            brightBlue: "blue".to_string(),
-            brightPurple: "#c800c8".to_string(),
-            brightCyan: "#037979".to_string(),
-            brightWhite: "white".to_string(),
-            background: "white".to_string(),
-            foreground: "black".to_string(),
-        }
-    }
-}
-
-#[derive(RustEmbed)]
-#[folder = "assets/"]
-struct Assets;
-
-pub struct ToHtml;
-
-impl WholeStreamCommand for ToHtml {
-    fn name(&self) -> &str {
-        "to html"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to html")
-            .switch("html_color", "change ansi colors to html colors", Some('c'))
-            .switch("no_color", "remove all ansi colors in output", Some('n'))
-            .switch(
-                "dark",
-                "indicate your background color is a darker color",
-                Some('d'),
-            )
-            .switch(
-                "partial",
-                "only output the html for the content itself",
-                Some('p'),
-            )
-            .named(
-                "theme",
-                SyntaxShape::String,
-                "the name of the theme to use (github, blulocolight, ...)",
-                Some('t'),
-            )
-            .switch("list", "list the names of all available themes", Some('l'))
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into simple HTML"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_html(args)
-    }
-}
-
-fn get_theme_from_asset_file(
-    is_dark: bool,
-    theme: &Option<Tagged<String>>,
-    theme_tag: &Tag,
-) -> Result<HashMap<&'static str, String>, ShellError> {
-    let theme_name = match theme {
-        Some(s) => s.as_str(),
-        None => "default", // There is no theme named "default" so this will be HtmlTheme::default(), which is "nu_default".
-    };
-
-    // 228 themes come from
-    // https://github.com/mbadolato/iTerm2-Color-Schemes/tree/master/windowsterminal
-    // we should find a hit on any name in there
-    let asset = get_asset_by_name_as_html_themes("228_themes.zip", "228_themes.json");
-
-    // If asset doesn't work, make sure to return the default theme
-    let asset = match asset {
-        Ok(a) => a,
-        _ => HtmlThemes::default(),
-    };
-
-    // Find the theme by theme name
-    let th = asset
-        .themes
-        .iter()
-        .find(|&n| n.name.to_lowercase() == theme_name.to_lowercase()); // case insensitive search
-
-    // If no theme is found by the name provided, ensure we return the default theme
-    let default_theme = HtmlTheme::default();
-    let th = match th {
-        Some(t) => t,
-        None => &default_theme,
-    };
-
-    // this just means no theme was passed in
-    if th.name.to_lowercase().eq(&"nu_default".to_string())
-        // this means there was a theme passed in
-        && theme.is_some()
-    {
-        return Err(ShellError::labeled_error(
-            "Error finding theme name",
-            "Error finding theme name",
-            theme_tag.span,
-        ));
-    }
-
-    Ok(convert_html_theme_to_hash_map(is_dark, th))
-}
-
-#[allow(unused_variables)]
-fn get_asset_by_name_as_html_themes(
-    zip_name: &str,
-    json_name: &str,
-) -> Result<HtmlThemes, Box<dyn Error>> {
-    match Assets::get(zip_name) {
-        Some(content) => {
-            let asset: Vec<u8> = match content {
-                Cow::Borrowed(bytes) => bytes.into(),
-                Cow::Owned(bytes) => bytes,
-            };
-            let reader = std::io::Cursor::new(asset);
-            #[cfg(feature = "zip")]
-            {
-                use std::io::Read;
-                let mut archive = zip::ZipArchive::new(reader)?;
-                let mut zip_file = archive.by_name(json_name)?;
-                let mut contents = String::new();
-                zip_file.read_to_string(&mut contents)?;
-                Ok(serde_json::from_str(&contents)?)
-            }
-            #[cfg(not(feature = "zip"))]
-            {
-                let th = HtmlThemes::default();
-                Ok(th)
-            }
-        }
-        None => {
-            let th = HtmlThemes::default();
-            Ok(th)
-        }
-    }
-}
-
-fn convert_html_theme_to_hash_map(
-    is_dark: bool,
-    theme: &HtmlTheme,
-) -> HashMap<&'static str, String> {
-    let mut hm: HashMap<&str, String> = HashMap::new();
-
-    hm.insert("bold_black", theme.brightBlack[..].to_string());
-    hm.insert("bold_red", theme.brightRed[..].to_string());
-    hm.insert("bold_green", theme.brightGreen[..].to_string());
-    hm.insert("bold_yellow", theme.brightYellow[..].to_string());
-    hm.insert("bold_blue", theme.brightBlue[..].to_string());
-    hm.insert("bold_magenta", theme.brightPurple[..].to_string());
-    hm.insert("bold_cyan", theme.brightCyan[..].to_string());
-    hm.insert("bold_white", theme.brightWhite[..].to_string());
-
-    hm.insert("black", theme.black[..].to_string());
-    hm.insert("red", theme.red[..].to_string());
-    hm.insert("green", theme.green[..].to_string());
-    hm.insert("yellow", theme.yellow[..].to_string());
-    hm.insert("blue", theme.blue[..].to_string());
-    hm.insert("magenta", theme.purple[..].to_string());
-    hm.insert("cyan", theme.cyan[..].to_string());
-    hm.insert("white", theme.white[..].to_string());
-
-    // Try to make theme work with light or dark but
-    // flipping the foreground and background but leave
-    // the other colors the same.
-    if is_dark {
-        hm.insert("background", theme.black[..].to_string());
-        hm.insert("foreground", theme.white[..].to_string());
-    } else {
-        hm.insert("background", theme.white[..].to_string());
-        hm.insert("foreground", theme.black[..].to_string());
-    }
-
-    hm
-}
-
-fn get_list_of_theme_names() -> Vec<String> {
-    let asset = get_asset_by_name_as_html_themes("228_themes.zip", "228_themes.json");
-
-    // If asset doesn't work, make sure to return the default theme
-    let html_themes = match asset {
-        Ok(a) => a,
-        _ => HtmlThemes::default(),
-    };
-
-    let theme_names: Vec<String> = html_themes.themes.iter().map(|n| n.name.clone()).collect();
-
-    theme_names
-}
-
-fn to_html(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-    let html_color = args.has_flag("html_color");
-    let no_color = args.has_flag("no_color");
-    let dark = args.has_flag("dark");
-    let partial = args.has_flag("partial");
-    let list = args.has_flag("list");
-    let theme: Option<Tagged<String>> = args.get_flag("theme")?;
-
-    let input: Vec<Value> = args.input.collect();
-    let headers = nu_protocol::merge_descriptors(&input);
-    let headers = Some(headers)
-        .filter(|headers| !headers.is_empty() && (headers.len() > 1 || !headers[0].is_empty()));
-    let mut output_string = String::new();
-    let mut regex_hm: HashMap<u32, (&str, String)> = HashMap::new();
-
-    if list {
-        // Get the list of theme names
-        let theme_names = get_list_of_theme_names();
-
-        // Put that list into the output string
-        for s in &theme_names {
-            writeln!(&mut output_string, "{}", s).unwrap();
-        }
-
-        output_string.push_str("\nScreenshots of themes can be found here:\n");
-        output_string.push_str("https://github.com/mbadolato/iTerm2-Color-Schemes\n");
-    } else {
-        let theme_tag = match &theme {
-            Some(v) => &v.tag,
-            None => &name_tag,
-        };
-
-        let color_hm = get_theme_from_asset_file(dark, &theme, theme_tag);
-        let color_hm = match color_hm {
-            Ok(c) => c,
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Error finding theme name",
-                    "Error finding theme name",
-                    theme_tag.span,
-                ))
-            }
-        };
-
-        // change the color of the page
-        if !partial {
-            write!(
-                &mut output_string,
-                r"<html><style>body {{ background-color:{};color:{}; }}</style><body>",
-                color_hm
-                    .get("background")
-                    .expect("Error getting background color"),
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting foreground color")
-            )
-            .unwrap();
-        } else {
-            write!(
-                &mut output_string,
-                "<div style=\"background-color:{};color:{};\">",
-                color_hm
-                    .get("background")
-                    .expect("Error getting background color"),
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting foreground color")
-            )
-            .unwrap();
-        }
-
-        let inner_value = match input.len() {
-            0 => String::default(),
-            1 => match headers {
-                Some(headers) => html_table(input, headers),
-                None => {
-                    let value = &input[0];
-                    html_value(value)
-                }
-            },
-            _ => match headers {
-                Some(headers) => html_table(input, headers),
-                None => html_list(input),
-            },
-        };
-
-        output_string.push_str(&inner_value);
-
-        if !partial {
-            output_string.push_str("</body></html>");
-        } else {
-            output_string.push_str("</div>")
-        }
-
-        // Check to see if we want to remove all color or change ansi to html colors
-        if html_color {
-            setup_html_color_regexes(&mut regex_hm, &color_hm);
-            output_string = run_regexes(&regex_hm, &output_string);
-        } else if no_color {
-            setup_no_color_regexes(&mut regex_hm);
-            output_string = run_regexes(&regex_hm, &output_string);
-        }
-    }
-    Ok(OutputStream::one(
-        UntaggedValue::string(output_string).into_value(name_tag),
-    ))
-}
-
-fn html_list(list: Vec<Value>) -> String {
-    let mut output_string = String::new();
-    output_string.push_str("<ol>");
-    for value in list {
-        output_string.push_str("<li>");
-        output_string.push_str(&html_value(&value));
-        output_string.push_str("</li>");
-    }
-    output_string.push_str("</ol>");
-    output_string
-}
-
-fn html_table(table: Vec<Value>, headers: Vec<String>) -> String {
-    let mut output_string = String::new();
-    // Add grid lines to html
-    // let mut output_string = "<html><head><style>".to_string();
-    // output_string.push_str("table, th, td { border: 2px solid black; border-collapse: collapse; padding: 10px; }");
-    // output_string.push_str("</style></head><body>");
-
-    output_string.push_str("<table>");
-
-    output_string.push_str("<tr>");
-    for header in &headers {
-        output_string.push_str("<th>");
-        output_string.push_str(&htmlescape::encode_minimal(header));
-        output_string.push_str("</th>");
-    }
-    output_string.push_str("</tr>");
-
-    for row in table {
-        if let UntaggedValue::Row(row) = row.value {
-            output_string.push_str("<tr>");
-            for header in &headers {
-                let data = row.get_data(header);
-                output_string.push_str("<td>");
-                output_string.push_str(&html_value(data.borrow()));
-                output_string.push_str("</td>");
-            }
-            output_string.push_str("</tr>");
-        }
-    }
-    output_string.push_str("</table>");
-
-    output_string
-}
-
-fn html_value(value: &Value) -> String {
-    let mut output_string = String::new();
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Binary(b)) => {
-            // This might be a bit much, but it's fun :)
-            match &value.tag.anchor {
-                Some(AnchorLocation::Url(f)) | Some(AnchorLocation::File(f)) => {
-                    let extension = f.split('.').last().map(String::from);
-                    match extension {
-                        Some(s)
-                            if ["png", "jpg", "bmp", "gif", "tiff", "jpeg"]
-                                .contains(&s.to_lowercase().as_str()) =>
-                        {
-                            output_string.push_str("<img src=\"data:image/");
-                            output_string.push_str(&s);
-                            output_string.push_str(";base64,");
-                            output_string.push_str(&base64::encode(&b));
-                            output_string.push_str("\">");
-                        }
-                        _ => {
-                            let output = nu_pretty_hex::pretty_hex(&b);
-
-                            output_string.push_str("<pre>");
-                            output_string.push_str(&output);
-                            output_string.push_str("</pre>");
-                        }
-                    }
-                }
-                _ => {
-                    let output = nu_pretty_hex::pretty_hex(&b);
-
-                    output_string.push_str("<pre>");
-                    output_string.push_str(&output);
-                    output_string.push_str("</pre>");
-                }
-            }
-        }
-        UntaggedValue::Primitive(Primitive::String(ref b)) => {
-            // This might be a bit much, but it's fun :)
-            match &value.tag.anchor {
-                Some(AnchorLocation::Url(f)) | Some(AnchorLocation::File(f)) => {
-                    let extension = f.split('.').last().map(String::from);
-                    match extension {
-                        Some(s) if s.to_lowercase() == "svg" => {
-                            output_string.push_str("<img src=\"data:image/svg+xml;base64,");
-                            output_string.push_str(&base64::encode(&b.as_bytes()));
-                            output_string.push_str("\">");
-                            return output_string;
-                        }
-                        _ => {}
-                    }
-                }
-                _ => {}
-            }
-            output_string.push_str(
-                &htmlescape::encode_minimal(&format_leaf(&value.value).plain_string(100_000))
-                    .replace("\n", "<br>"),
-            );
-        }
-        other => output_string.push_str(
-            &htmlescape::encode_minimal(&format_leaf(other).plain_string(100_000))
-                .replace("\n", "<br>"),
-        ),
-    }
-    output_string
-}
-
-fn setup_html_color_regexes(
-    hash: &mut HashMap<u32, (&'static str, String)>,
-    color_hm: &HashMap<&str, String>,
-) {
-    // All the bold colors
-    hash.insert(
-        0,
-        (
-            r"(?P<reset>\[0m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            // Reset the text color, normal weight font
-            format!(
-                r"<span style='color:{};font-weight:normal;'>$word</span>",
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting reset text color")
-            ),
-        ),
-    );
-    hash.insert(
-        1,
-        (
-            // Bold Black
-            r"(?P<bb>\[1;30m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting bold black text color")
-            ),
-        ),
-    );
-    hash.insert(
-        2,
-        (
-            // Bold Red
-            r"(?P<br>\[1;31m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_red")
-                    .expect("Error getting bold red text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        3,
-        (
-            // Bold Green
-            r"(?P<bg>\[1;32m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_green")
-                    .expect("Error getting bold green text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        4,
-        (
-            // Bold Yellow
-            r"(?P<by>\[1;33m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_yellow")
-                    .expect("Error getting bold yellow text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        5,
-        (
-            // Bold Blue
-            r"(?P<bu>\[1;34m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_blue")
-                    .expect("Error getting bold blue text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        6,
-        (
-            // Bold Magenta
-            r"(?P<bm>\[1;35m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_magenta")
-                    .expect("Error getting bold magenta text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        7,
-        (
-            // Bold Cyan
-            r"(?P<bc>\[1;36m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("bold_cyan")
-                    .expect("Error getting bold cyan text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        8,
-        (
-            // Bold White
-            // Let's change this to black since the html background
-            // is white. White on white = no bueno.
-            r"(?P<bw>\[1;37m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};font-weight:bold;'>$word</span>",
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting bold bold white text color"),
-            ),
-        ),
-    );
-    // All the normal colors
-    hash.insert(
-        9,
-        (
-            // Black
-            r"(?P<b>\[30m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting black text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        10,
-        (
-            // Red
-            r"(?P<r>\[31m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm.get("red").expect("Error getting red text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        11,
-        (
-            // Green
-            r"(?P<g>\[32m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm
-                    .get("green")
-                    .expect("Error getting green text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        12,
-        (
-            // Yellow
-            r"(?P<y>\[33m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm
-                    .get("yellow")
-                    .expect("Error getting yellow text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        13,
-        (
-            // Blue
-            r"(?P<u>\[34m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm.get("blue").expect("Error getting blue text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        14,
-        (
-            // Magenta
-            r"(?P<m>\[35m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm
-                    .get("magenta")
-                    .expect("Error getting magenta text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        15,
-        (
-            // Cyan
-            r"(?P<c>\[36m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm.get("cyan").expect("Error getting cyan text color"),
-            ),
-        ),
-    );
-    hash.insert(
-        16,
-        (
-            // White
-            // Let's change this to black since the html background
-            // is white. White on white = no bueno.
-            r"(?P<w>\[37m)(?P<word>[[:alnum:][:space:][:punct:]]*)",
-            format!(
-                r"<span style='color:{};'>$word</span>",
-                color_hm
-                    .get("foreground")
-                    .expect("Error getting white text color"),
-            ),
-        ),
-    );
-}
-
-fn setup_no_color_regexes(hash: &mut HashMap<u32, (&'static str, String)>) {
-    // We can just use one regex here because we're just removing ansi sequences
-    // and not replacing them with html colors.
-    // attribution: https://stackoverflow.com/questions/14693701/how-can-i-remove-the-ansi-escape-sequences-from-a-string-in-python
-    hash.insert(
-        0,
-        (
-            r"(?:\x1B[@-Z\\-_]|[\x80-\x9A\x9C-\x9F]|(?:\x1B\[|\x9B)[0-?]*[ -/]*[@-~])",
-            r"$name_group_doesnt_exist".to_string(),
-        ),
-    );
-}
-
-fn run_regexes(hash: &HashMap<u32, (&'static str, String)>, contents: &str) -> String {
-    let mut working_string = contents.to_owned();
-    let hash_count: u32 = hash.len() as u32;
-    for n in 0..hash_count {
-        let value = hash.get(&n).expect("error getting hash at index");
-        //println!("{},{}", value.0, value.1);
-        let re = Regex::new(value.0).expect("problem with color regex");
-        let after = re.replace_all(&working_string, &value.1[..]).to_string();
-        working_string = after.clone();
-    }
-    working_string
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::*;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToHtml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/json.rs b/old_nushell/crates/nu-command/src/commands/formats/to/json.rs
deleted file mode 100644
index 43f769ec8..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/json.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{Primitive, Signature, SyntaxShape, UnspannedPathMember, UntaggedValue, Value};
-use serde::Serialize;
-use serde_json::json;
-
-pub struct ToJson;
-
-impl WholeStreamCommand for ToJson {
-    fn name(&self) -> &str {
-        "to json"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to json").named(
-            "pretty",
-            SyntaxShape::Int,
-            "Formats the JSON text with the provided indentation setting",
-            Some('p'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Converts table data into JSON text."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_json(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description:
-                    "Outputs an unformatted JSON string representing the contents of this table",
-                example: "echo [1 2 3] | to json",
-                result: Some(vec![Value::from("[1,2,3]")]),
-            },
-            Example {
-                description:
-                    "Outputs a formatted JSON string representing the contents of this table with an indentation setting of 2 spaces",
-                example: "echo [1 2 3] | to json --pretty 2",
-                result: Some(vec![Value::from("[\n  1,\n  2,\n  3\n]")]),
-            },
-        ]
-    }
-}
-
-pub fn value_to_json_value(v: &Value) -> Result<serde_json::Value, ShellError> {
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => serde_json::Value::Bool(*b),
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => serde_json::Value::Number(
-            serde_json::Number::from(b.to_u64().expect("What about really big numbers")),
-        ),
-        UntaggedValue::Primitive(Primitive::Duration(i)) => {
-            serde_json::Value::String(i.to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Date(d)) => serde_json::Value::String(d.to_string()),
-        UntaggedValue::Primitive(Primitive::EndOfStream) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => {
-            if let Some(f) = f.to_f64() {
-                if let Some(num) = serde_json::Number::from_f64(
-                    f.to_f64().expect("TODO: What about really big decimals?"),
-                ) {
-                    serde_json::Value::Number(num)
-                } else {
-                    return Err(ShellError::labeled_error(
-                        "Could not convert value to decimal number",
-                        "could not convert to decimal",
-                        &v.tag,
-                    ));
-                }
-            } else {
-                return Err(ShellError::labeled_error(
-                    "Could not convert value to decimal number",
-                    "could not convert to decimal",
-                    &v.tag,
-                ));
-            }
-        }
-
-        UntaggedValue::Primitive(Primitive::Int(i)) => {
-            serde_json::Value::Number(serde_json::Number::from(*i))
-        }
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            serde_json::Value::Number(serde_json::Number::from(CoerceInto::<i64>::coerce_into(
-                i.tagged(&v.tag),
-                "converting to JSON number",
-            )?))
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::GlobPattern(s)) => serde_json::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::String(s)) => serde_json::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => serde_json::Value::Array(
-            path.iter()
-                .map(|x| match &x.unspanned {
-                    UnspannedPathMember::String(string) => {
-                        Ok(serde_json::Value::String(string.clone()))
-                    }
-                    UnspannedPathMember::Int(int) => {
-                        Ok(serde_json::Value::Number(serde_json::Number::from(*int)))
-                    }
-                })
-                .collect::<Result<Vec<serde_json::Value>, ShellError>>()?,
-        ),
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => {
-            serde_json::Value::String(s.display().to_string())
-        }
-
-        UntaggedValue::Table(l) => serde_json::Value::Array(json_list(l)?),
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Block(_) | UntaggedValue::Primitive(Primitive::Range(_)) => {
-            serde_json::Value::Null
-        }
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::Binary(b)) => serde_json::Value::Array(
-            b.iter()
-                .map(|x| {
-                    serde_json::Number::from_f64(*x as f64).ok_or_else(|| {
-                        ShellError::labeled_error(
-                            "Can not convert number from floating point",
-                            "can not convert to number",
-                            &v.tag,
-                        )
-                    })
-                })
-                .collect::<Result<Vec<serde_json::Number>, ShellError>>()?
-                .into_iter()
-                .map(serde_json::Value::Number)
-                .collect(),
-        ),
-        UntaggedValue::Row(o) => {
-            let mut m = serde_json::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), value_to_json_value(v)?);
-            }
-            serde_json::Value::Object(m)
-        }
-    })
-}
-
-fn json_list(input: &[Value]) -> Result<Vec<serde_json::Value>, ShellError> {
-    let mut out = vec![];
-
-    for value in input {
-        out.push(value_to_json_value(value)?);
-    }
-
-    Ok(out)
-}
-
-fn to_json(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-    let pretty: Option<Value> = args.get_flag("pretty")?;
-
-    let name_span = name_tag.span;
-    let input: Vec<Value> = args.input.collect();
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    Ok((to_process_input
-        .into_iter()
-        .map(move |value| match value_to_json_value(&value) {
-            Ok(json_value) => {
-                let value_span = value.tag.span;
-
-                match serde_json::to_string(&json_value) {
-                    Ok(mut serde_json_string) => {
-                        if let Some(pretty_value) = &pretty {
-                            let mut pretty_format_failed = true;
-
-                            if let Ok(pretty_u64) = pretty_value.as_u64() {
-                                if let Ok(serde_json_value) =
-                                    serde_json::from_str::<serde_json::Value>(&serde_json_string)
-                                {
-                                    let indentation_string = " ".repeat(pretty_u64 as usize);
-                                    let serde_formatter =
-                                        serde_json::ser::PrettyFormatter::with_indent(
-                                            indentation_string.as_bytes(),
-                                        );
-                                    let serde_buffer = Vec::new();
-                                    let mut serde_serializer =
-                                        serde_json::Serializer::with_formatter(
-                                            serde_buffer,
-                                            serde_formatter,
-                                        );
-                                    let serde_json_object = json!(serde_json_value);
-
-                                    if let Ok(()) =
-                                        serde_json_object.serialize(&mut serde_serializer)
-                                    {
-                                        if let Ok(ser_json_string) =
-                                            String::from_utf8(serde_serializer.into_inner())
-                                        {
-                                            pretty_format_failed = false;
-                                            serde_json_string = ser_json_string
-                                        }
-                                    }
-                                }
-                            }
-
-                            if pretty_format_failed {
-                                return Value::error(ShellError::labeled_error(
-                                    "Pretty formatting failed",
-                                    "failed",
-                                    pretty_value.tag(),
-                                ));
-                            }
-                        }
-
-                        UntaggedValue::Primitive(Primitive::String(serde_json_string))
-                            .into_value(&value.tag)
-                    }
-                    _ => Value::error(ShellError::labeled_error_with_secondary(
-                        "Expected a table with JSON-compatible structure.tag() from pipeline",
-                        "requires JSON-compatible input",
-                        name_span,
-                        "originates from here".to_string(),
-                        value_span,
-                    )),
-                }
-            }
-            _ => Value::error(ShellError::labeled_error(
-                "Expected a table with JSON-compatible structure from pipeline",
-                "requires JSON-compatible input",
-                &name_tag,
-            )),
-        }))
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToJson;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToJson {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/md.rs b/old_nushell/crates/nu-command/src/commands/formats/to/md.rs
deleted file mode 100644
index f29fe145d..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/md.rs
+++ /dev/null
@@ -1,380 +0,0 @@
-use crate::prelude::*;
-
-use nu_data::value::format_leaf;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct Command;
-
-#[derive(Deserialize)]
-pub struct Arguments {
-    pretty: bool,
-    #[serde(rename = "per-element")]
-    per_element: bool,
-}
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "to md"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to md")
-            .switch(
-                "pretty",
-                "Formats the Markdown table to vertically align items",
-                Some('p'),
-            )
-            .switch(
-                "per-element",
-                "treat each row as markdown syntax element",
-                Some('e'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into simple Markdown"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_md(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Outputs an unformatted table markdown string (default)",
-                example: "ls | to md",
-                result: Some(vec![Value::from(one(r#"
-                |name|type|chickens|modified|
-                |-|-|-|-|
-                |Andres.txt|File|10|2 years ago|
-                |Jonathan|Dir|5|2 years ago|
-                |Darren.txt|File|20|2 years ago|
-                |Yehuda|Dir|4|2 years ago|
-                "#))]),
-            },
-            Example {
-                description: "Optionally, output a formatted markdown string",
-                example: "ls | to md --pretty",
-                result: Some(vec![Value::from(one(r#"
-                    | name       | type | chickens | modified    |
-                    | ---------- | ---- | -------- | ----------- |
-                    | Andres.txt | File | 10       | 2 years ago |
-                    | Jonathan   | Dir  | 5        | 2 years ago |
-                    | Darren.txt | File | 20       | 2 years ago |
-                    | Yehuda     | Dir  | 4        | 2 years ago |
-                    "#))]),
-            },
-            Example {
-                description: "Treat each row as a markdown element",
-                example: "echo [[H1]; [\"Welcome to Nushell\"]] | append (ls | first 2) | to md --per-element --pretty",
-                result: Some(vec![Value::from(one(r#"
-                    # Welcome to Nushell
-                    | name       | type | chickens | modified    |
-                    | ---------- | ---- | -------- | ----------- |
-                    | Andres.txt | File | 10       | 2 years ago |
-                    | Jonathan   | Dir  | 5        | 2 years ago |
-                    "#))]),
-            }
-        ]
-    }
-}
-
-fn to_md(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-    let arguments = Arguments {
-        per_element: args.has_flag("per-element"),
-        pretty: args.has_flag("pretty"),
-    };
-
-    let input: Vec<Value> = args.input.collect();
-
-    Ok(OutputStream::one(
-        UntaggedValue::string(process(&input, arguments)).into_value(if input.is_empty() {
-            name_tag
-        } else {
-            input[0].tag()
-        }),
-    ))
-}
-
-fn process(
-    input: &[Value],
-    Arguments {
-        pretty,
-        per_element,
-    }: Arguments,
-) -> String {
-    if per_element {
-        input
-            .iter()
-            .map(|v| match &v.value {
-                UntaggedValue::Table(values) => table(values, pretty),
-                _ => fragment(v, pretty),
-            })
-            .collect::<String>()
-    } else {
-        table(input, pretty)
-    }
-}
-
-fn fragment(input: &Value, pretty: bool) -> String {
-    let headers = input.data_descriptors();
-    let mut out = String::new();
-
-    if headers.len() == 1 {
-        let markup = match (&headers[0]).to_ascii_lowercase().as_ref() {
-            "h1" => "# ".to_string(),
-            "h2" => "## ".to_string(),
-            "h3" => "### ".to_string(),
-            "blockquote" => "> ".to_string(),
-
-            _ => return table(&[input.clone()], pretty),
-        };
-
-        out.push_str(&markup);
-        out.push_str(&format_leaf(input.get_data(&headers[0]).borrow()).plain_string(100_000));
-    } else if input.is_row() {
-        let string = match input.row_entries().next() {
-            Some(value) => value.1.as_string().unwrap_or_default(),
-            None => String::from(""),
-        };
-
-        out = format_leaf(&UntaggedValue::from(string)).plain_string(100_000)
-    } else {
-        out = format_leaf(&input.value).plain_string(100_000)
-    }
-
-    out.push('\n');
-    out
-}
-
-fn collect_headers(headers: &[String]) -> (Vec<String>, Vec<usize>) {
-    let mut escaped_headers: Vec<String> = Vec::new();
-    let mut column_widths: Vec<usize> = Vec::new();
-
-    if !headers.is_empty() && (headers.len() > 1 || !headers[0].is_empty()) {
-        for header in headers {
-            let escaped_header_string = htmlescape::encode_minimal(header);
-            column_widths.push(escaped_header_string.len());
-            escaped_headers.push(escaped_header_string);
-        }
-    } else {
-        column_widths = vec![0; headers.len()]
-    }
-
-    (escaped_headers, column_widths)
-}
-
-fn table(input: &[Value], pretty: bool) -> String {
-    let headers = nu_protocol::merge_descriptors(input);
-
-    let (escaped_headers, mut column_widths) = collect_headers(&headers);
-
-    let mut escaped_rows: Vec<Vec<String>> = Vec::new();
-
-    for row in input {
-        let mut escaped_row: Vec<String> = Vec::new();
-
-        match row.value.clone() {
-            UntaggedValue::Row(row) => {
-                for i in 0..headers.len() {
-                    let data = row.get_data(&headers[i]);
-                    let value_string = format_leaf(data.borrow()).plain_string(100_000);
-                    let new_column_width = value_string.len();
-
-                    escaped_row.push(value_string);
-
-                    if column_widths[i] < new_column_width {
-                        column_widths[i] = new_column_width;
-                    }
-                }
-            }
-            p => {
-                let value_string =
-                    htmlescape::encode_minimal(&format_leaf(&p).plain_string(100_000));
-                escaped_row.push(value_string);
-            }
-        }
-
-        escaped_rows.push(escaped_row);
-    }
-
-    let output_string = if (column_widths.is_empty() || column_widths.iter().all(|x| *x == 0))
-        && escaped_rows.is_empty()
-    {
-        String::from("")
-    } else {
-        get_output_string(&escaped_headers, &escaped_rows, &column_widths, pretty)
-            .trim()
-            .to_string()
-    };
-
-    output_string
-}
-
-fn get_output_string(
-    headers: &[String],
-    rows: &[Vec<String>],
-    column_widths: &[usize],
-    pretty: bool,
-) -> String {
-    let mut output_string = String::new();
-
-    if !headers.is_empty() {
-        output_string.push('|');
-
-        for i in 0..headers.len() {
-            if pretty {
-                output_string.push(' ');
-                output_string.push_str(&get_padded_string(
-                    headers[i].clone(),
-                    column_widths[i],
-                    ' ',
-                ));
-                output_string.push(' ');
-            } else {
-                output_string.push_str(&headers[i]);
-            }
-
-            output_string.push('|');
-        }
-
-        output_string.push_str("\n|");
-
-        #[allow(clippy::needless_range_loop)]
-        for i in 0..headers.len() {
-            if pretty {
-                output_string.push(' ');
-                output_string.push_str(&get_padded_string(
-                    String::from("-"),
-                    column_widths[i],
-                    '-',
-                ));
-                output_string.push(' ');
-            } else {
-                output_string.push('-');
-            }
-
-            output_string.push('|');
-        }
-
-        output_string.push('\n');
-    }
-
-    for row in rows {
-        if !headers.is_empty() {
-            output_string.push('|');
-        }
-
-        for i in 0..row.len() {
-            if pretty {
-                output_string.push(' ');
-                output_string.push_str(&get_padded_string(row[i].clone(), column_widths[i], ' '));
-                output_string.push(' ');
-            } else {
-                output_string.push_str(&row[i]);
-            }
-
-            if !headers.is_empty() {
-                output_string.push('|');
-            }
-        }
-
-        output_string.push('\n');
-    }
-
-    output_string
-}
-
-fn get_padded_string(text: String, desired_length: usize, padding_character: char) -> String {
-    let repeat_length = if text.len() > desired_length {
-        0
-    } else {
-        desired_length - text.len()
-    };
-
-    format!(
-        "{}{}",
-        text,
-        padding_character.to_string().repeat(repeat_length)
-    )
-}
-
-fn one(string: &str) -> String {
-    string
-        .lines()
-        .skip(1)
-        .map(|line| line.trim())
-        .collect::<Vec<&str>>()
-        .join("\n")
-        .trim_end()
-        .to_string()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{fragment, one, table};
-    use nu_protocol::{row, Value};
-
-    #[test]
-    fn render_h1() {
-        let value = row! {"H1".into() => Value::from("Ecuador")};
-
-        assert_eq!(fragment(&value, false), "# Ecuador\n");
-    }
-
-    #[test]
-    fn render_h2() {
-        let value = row! {"H2".into() => Value::from("Ecuador")};
-
-        assert_eq!(fragment(&value, false), "## Ecuador\n");
-    }
-
-    #[test]
-    fn render_h3() {
-        let value = row! {"H3".into() => Value::from("Ecuador")};
-
-        assert_eq!(fragment(&value, false), "### Ecuador\n");
-    }
-
-    #[test]
-    fn render_blockquote() {
-        let value = row! {"BLOCKQUOTE".into() => Value::from("Ecuador")};
-
-        assert_eq!(fragment(&value, false), "> Ecuador\n");
-    }
-
-    #[test]
-    fn render_table() {
-        let value = vec![
-            row! { "country".into() => Value::from("Ecuador")},
-            row! { "country".into() => Value::from("New Zealand")},
-            row! { "country".into() => Value::from("USA")},
-        ];
-
-        assert_eq!(
-            table(&value, false),
-            one(r#"
-            |country|
-            |-|
-            |Ecuador|
-            |New Zealand|
-            |USA|
-        "#)
-        );
-
-        assert_eq!(
-            table(&value, true),
-            one(r#"
-            | country     |
-            | ----------- |
-            | Ecuador     |
-            | New Zealand |
-            | USA         |
-        "#)
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/mod.rs b/old_nushell/crates/nu-command/src/commands/formats/to/mod.rs
deleted file mode 100644
index e6e1ff7fc..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-mod command;
-pub(crate) mod csv;
-pub(crate) mod delimited;
-mod html;
-mod json;
-mod md;
-pub(crate) mod toml;
-mod tsv;
-pub(crate) mod url;
-mod xml;
-mod yaml;
-
-pub use self::csv::ToCsv;
-pub use self::toml::ToToml;
-pub use self::url::ToUrl;
-pub use command::To;
-pub use html::ToHtml;
-pub use json::ToJson;
-pub use md::Command as ToMarkdown;
-pub use tsv::ToTsv;
-pub use xml::ToXml;
-pub use yaml::ToYaml;
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/toml.rs b/old_nushell/crates/nu-command/src/commands/formats/to/toml.rs
deleted file mode 100644
index 1610e35c6..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/toml.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{Primitive, Signature, UnspannedPathMember, UntaggedValue, Value};
-
-pub struct ToToml;
-
-impl WholeStreamCommand for ToToml {
-    fn name(&self) -> &str {
-        "to toml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to toml")
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into .toml text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_toml(args)
-    }
-}
-
-// Helper method to recursively convert nu_protocol::Value -> toml::Value
-// This shouldn't be called at the top-level
-fn helper(v: &Value) -> Result<toml::Value, ShellError> {
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => toml::Value::Boolean(*b),
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => {
-            if let Some(value) = b.to_i64() {
-                toml::Value::Integer(value)
-            } else {
-                return Err(ShellError::labeled_error(
-                    "Value too large to write to toml",
-                    "value too large for toml",
-                    v.tag.span,
-                ));
-            }
-        }
-        UntaggedValue::Primitive(Primitive::Duration(i)) => toml::Value::String(i.to_string()),
-        UntaggedValue::Primitive(Primitive::Date(d)) => toml::Value::String(d.to_string()),
-        UntaggedValue::Primitive(Primitive::EndOfStream) => {
-            toml::Value::String("<End of Stream>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => {
-            toml::Value::String("<Beginning of Stream>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => {
-            toml::Value::Float(f.tagged(&v.tag).coerce_into("converting to TOML float")?)
-        }
-        UntaggedValue::Primitive(Primitive::Int(i)) => toml::Value::Integer(*i),
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            toml::Value::Integer(i.tagged(&v.tag).coerce_into("converting to TOML integer")?)
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => {
-            toml::Value::String("<Nothing>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::GlobPattern(s)) => toml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::String(s)) => toml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => {
-            toml::Value::String(s.display().to_string())
-        }
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => toml::Value::Array(
-            path.iter()
-                .map(|x| match &x.unspanned {
-                    UnspannedPathMember::String(string) => Ok(toml::Value::String(string.clone())),
-                    UnspannedPathMember::Int(int) => Ok(toml::Value::Integer(*int)),
-                })
-                .collect::<Result<Vec<toml::Value>, ShellError>>()?,
-        ),
-        UntaggedValue::Table(l) => toml::Value::Array(collect_values(l)?),
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Block(_) => toml::Value::String("<Block>".to_string()),
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-            toml::Value::String("<Data>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Range(_)) => toml::Value::String("<Range>".to_string()),
-        UntaggedValue::Primitive(Primitive::Binary(b)) => {
-            toml::Value::Array(b.iter().map(|x| toml::Value::Integer(*x as i64)).collect())
-        }
-        UntaggedValue::Row(o) => {
-            let mut m = toml::map::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), helper(v)?);
-            }
-            toml::Value::Table(m)
-        }
-    })
-}
-
-/// Converts a nu_protocol::Value into a toml::Value
-/// Will return a Shell Error, if the Nu Value is not a valid top-level TOML Value
-pub fn value_to_toml_value(v: &Value) -> Result<toml::Value, ShellError> {
-    match &v.value {
-        UntaggedValue::Row(o) => {
-            let mut m = toml::map::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), helper(v)?);
-            }
-            Ok(toml::Value::Table(m))
-        }
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            // Attempt to de-serialize the String
-            toml::de::from_str(s).map_err(|_| {
-                ShellError::labeled_error(
-                    format!("{:?} unable to de-serialize string to TOML", s),
-                    "invalid TOML",
-                    v.tag(),
-                )
-            })
-        }
-        _ => Err(ShellError::labeled_error(
-            format!("{:?} is not a valid top-level TOML", v.value),
-            "invalid TOML",
-            v.tag(),
-        )),
-    }
-}
-
-fn collect_values(input: &[Value]) -> Result<Vec<toml::Value>, ShellError> {
-    let mut out = vec![];
-
-    for value in input {
-        out.push(helper(value)?);
-    }
-
-    Ok(out)
-}
-
-fn to_toml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.name_tag();
-    let name_span = name_tag.span;
-    let input: Vec<Value> = args.input.collect();
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    Ok((to_process_input.into_iter().map(move |value| {
-        let value_span = value.tag.span;
-        match value_to_toml_value(&value) {
-            Ok(toml_value) => match toml::to_string(&toml_value) {
-                Ok(x) => UntaggedValue::Primitive(Primitive::String(x)).into_value(&name_tag),
-
-                _ => Value::error(ShellError::labeled_error_with_secondary(
-                    "Expected a table with TOML-compatible structure.tag() from pipeline",
-                    "requires TOML-compatible input",
-                    name_span,
-                    "originates from here".to_string(),
-                    value_span,
-                )),
-            },
-            _ => Value::error(ShellError::labeled_error(
-                "Expected a table with TOML-compatible structure from pipeline",
-                "requires TOML-compatible input",
-                &name_tag,
-            )),
-        }
-    }))
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::*;
-    use nu_protocol::Dictionary;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToToml {})
-    }
-
-    #[test]
-    fn test_value_to_toml_value() {
-        //
-        // Positive Tests
-        //
-
-        // Dictionary -> What we do in "crates/nu-cli/src/data/config.rs" to write the config file
-        let mut m = indexmap::IndexMap::new();
-        m.insert("rust".to_owned(), Value::from("editor"));
-        m.insert("is".to_owned(), Value::nothing());
-        m.insert(
-            "features".to_owned(),
-            UntaggedValue::Table(vec![
-                UntaggedValue::string("hello").into_untagged_value(),
-                UntaggedValue::string("array").into_untagged_value(),
-            ])
-            .into_untagged_value(),
-        );
-        let tv = value_to_toml_value(&UntaggedValue::Row(Dictionary::new(m)).into_untagged_value())
-            .expect("Expected Ok from valid TOML dictionary");
-        assert_eq!(
-            tv.get("features"),
-            Some(&toml::Value::Array(vec![
-                toml::Value::String("hello".to_owned()),
-                toml::Value::String("array".to_owned())
-            ]))
-        );
-        // TOML string
-        let tv = value_to_toml_value(&Value::from(
-            r#"
-            title = "TOML Example"
-
-            [owner]
-            name = "Tom Preston-Werner"
-            dob = 1979-05-27T07:32:00-08:00 # First class dates
-
-            [dependencies]
-            rustyline = "4.1.0"
-            sysinfo = "0.8.4"
-            chrono = { version = "0.4.6", features = ["serde"] }
-            "#,
-        ))
-        .expect("Expected Ok from valid TOML string");
-        assert_eq!(
-            tv.get("title").unwrap(),
-            &toml::Value::String("TOML Example".to_owned())
-        );
-        //
-        // Negative Tests
-        //
-        value_to_toml_value(&Value::from("not_valid"))
-            .expect_err("Expected non-valid toml (String) to cause error!");
-        value_to_toml_value(&UntaggedValue::Table(vec![Value::from("1")]).into_untagged_value())
-            .expect_err("Expected non-valid toml (Table) to cause error!");
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/tsv.rs b/old_nushell/crates/nu-command/src/commands/formats/to/tsv.rs
deleted file mode 100644
index f721bea56..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/tsv.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::commands::formats::to::delimited::to_delimited_data;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-
-pub struct ToTsv;
-
-impl WholeStreamCommand for ToTsv {
-    fn name(&self) -> &str {
-        "to tsv"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to tsv").switch(
-            "noheaders",
-            "do not output the column names as the first row",
-            Some('n'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into .tsv text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_tsv(args)
-    }
-}
-
-fn to_tsv(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let noheaders = args.has_flag("noheaders");
-
-    to_delimited_data(noheaders, '\t', "TSV", args.input, name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToTsv;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToTsv {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/url.rs b/old_nushell/crates/nu-command/src/commands/formats/to/url.rs
deleted file mode 100644
index e968f5c97..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/url.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct ToUrl;
-
-impl WholeStreamCommand for ToUrl {
-    fn name(&self) -> &str {
-        "to url"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to url")
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into url-encoded text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_url(args)
-    }
-}
-
-fn to_url(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let input = args.input;
-
-    Ok(input
-        .map(move |value| match value {
-            Value {
-                value: UntaggedValue::Row(row),
-                ..
-            } => {
-                let mut row_vec = vec![];
-                for (k, v) in row.entries {
-                    match v.as_string() {
-                        Ok(s) => {
-                            row_vec.push((k.clone(), s.to_string()));
-                        }
-                        _ => {
-                            return Value::error(ShellError::labeled_error_with_secondary(
-                                "Expected table with string values",
-                                "requires table with strings",
-                                &tag,
-                                "value originates from here",
-                                v.tag,
-                            ));
-                        }
-                    }
-                }
-
-                match serde_urlencoded::to_string(row_vec) {
-                    Ok(s) => UntaggedValue::string(s).into_value(&tag),
-                    _ => Value::error(ShellError::labeled_error(
-                        "Failed to convert to url-encoded",
-                        "cannot url-encode",
-                        &tag,
-                    )),
-                }
-            }
-            Value { tag: value_tag, .. } => Value::error(ShellError::labeled_error_with_secondary(
-                "Expected a table from pipeline",
-                "requires table input",
-                &tag,
-                "value originates from here",
-                value_tag.span,
-            )),
-        })
-        .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToUrl;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToUrl {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/xml.rs b/old_nushell/crates/nu-command/src/commands/formats/to/xml.rs
deleted file mode 100644
index 28fe8d0c2..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/xml.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use crate::prelude::*;
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event};
-use std::collections::HashSet;
-use std::io::Cursor;
-use std::io::Write;
-
-pub struct ToXml;
-
-impl WholeStreamCommand for ToXml {
-    fn name(&self) -> &str {
-        "to xml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to xml").named(
-            "pretty",
-            SyntaxShape::Int,
-            "Formats the XML text with the provided indentation setting",
-            Some('p'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into .xml text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_xml(args)
-    }
-}
-
-pub fn add_attributes<'a>(
-    element: &mut quick_xml::events::BytesStart<'a>,
-    attributes: &'a IndexMap<String, String>,
-) {
-    for (k, v) in attributes {
-        element.push_attribute((k.as_str(), v.as_str()));
-    }
-}
-
-pub fn get_attributes(row: &Value) -> Option<IndexMap<String, String>> {
-    if let UntaggedValue::Row(r) = &row.value {
-        if let Some(v) = r.entries.get("attributes") {
-            if let UntaggedValue::Row(a) = &v.value {
-                let mut h = IndexMap::new();
-                for (k, v) in &a.entries {
-                    h.insert(k.clone(), v.convert_to_string());
-                }
-                return Some(h);
-            }
-        }
-    }
-    None
-}
-
-pub fn get_children(row: &Value) -> Option<&Vec<Value>> {
-    if let UntaggedValue::Row(r) = &row.value {
-        if let Some(v) = r.entries.get("children") {
-            if let UntaggedValue::Table(t) = &v.value {
-                return Some(t);
-            }
-        }
-    }
-    None
-}
-
-pub fn is_xml_row(row: &Value) -> bool {
-    if let UntaggedValue::Row(r) = &row.value {
-        let keys: HashSet<&String> = r.keys().collect();
-        let children: String = "children".to_string();
-        let attributes: String = "attributes".to_string();
-        return keys.contains(&children) && keys.contains(&attributes) && keys.len() == 2;
-    }
-    false
-}
-
-pub fn write_xml_events<W: Write>(
-    current: &Value,
-    writer: &mut quick_xml::Writer<W>,
-) -> Result<(), ShellError> {
-    match &current.value {
-        UntaggedValue::Row(o) => {
-            for (k, v) in &o.entries {
-                let mut e = BytesStart::owned(k.as_bytes(), k.len());
-                if !is_xml_row(v) {
-                    return Err(ShellError::labeled_error(
-                        "Expected a row with 'children' and 'attributes' columns",
-                        "missing 'children' and 'attributes' columns ",
-                        &current.tag,
-                    ));
-                }
-                let a = get_attributes(v);
-                if let Some(ref a) = a {
-                    add_attributes(&mut e, a);
-                }
-                writer
-                    .write_event(Event::Start(e))
-                    .expect("Couldn't open XML node");
-                let c = get_children(v);
-                if let Some(c) = c {
-                    for v in c {
-                        write_xml_events(v, writer)?;
-                    }
-                }
-                writer
-                    .write_event(Event::End(BytesEnd::borrowed(k.as_bytes())))
-                    .expect("Couldn't close XML node");
-            }
-        }
-        UntaggedValue::Table(t) => {
-            for v in t {
-                write_xml_events(v, writer)?;
-            }
-        }
-        _ => {
-            let s = current.convert_to_string();
-            writer
-                .write_event(Event::Text(BytesText::from_plain_str(s.as_str())))
-                .expect("Couldn't write XML text");
-        }
-    }
-    Ok(())
-}
-
-fn to_xml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-    let name_span = name_tag.span;
-    let pretty: Option<Value> = args.get_flag("pretty")?;
-    let input: Vec<Value> = args.input.collect();
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    Ok((to_process_input.into_iter().map(move |value| {
-        let mut w = pretty.as_ref().map_or_else(
-            || quick_xml::Writer::new(Cursor::new(Vec::new())),
-            |p| {
-                quick_xml::Writer::new_with_indent(
-                    Cursor::new(Vec::new()),
-                    b' ',
-                    p.value.expect_int() as usize,
-                )
-            },
-        );
-
-        let value_span = value.tag.span;
-
-        match write_xml_events(&value, &mut w) {
-            Ok(_) => {
-                let b = w.into_inner().into_inner();
-                let s = if let Ok(s) = String::from_utf8(b) {
-                    s
-                } else {
-                    return Value::error(ShellError::untagged_runtime_error(
-                        "Could not convert a string to utf-8",
-                    ));
-                };
-                UntaggedValue::Primitive(Primitive::String(s)).into_value(&name_tag)
-            }
-            Err(_) => Value::error(ShellError::labeled_error_with_secondary(
-                "Expected a table with XML-compatible structure from pipeline",
-                "requires XML-compatible input",
-                name_span,
-                "originates from here".to_string(),
-                value_span,
-            )),
-        }
-    }))
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToXml;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToXml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/formats/to/yaml.rs b/old_nushell/crates/nu-command/src/commands/formats/to/yaml.rs
deleted file mode 100644
index 44f65d29f..000000000
--- a/old_nushell/crates/nu-command/src/commands/formats/to/yaml.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{Primitive, Signature, UnspannedPathMember, UntaggedValue, Value};
-
-pub struct ToYaml;
-
-impl WholeStreamCommand for ToYaml {
-    fn name(&self) -> &str {
-        "to yaml"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("to yaml")
-    }
-
-    fn usage(&self) -> &str {
-        "Convert table into .yaml/.yml text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_yaml(args)
-    }
-}
-
-pub fn value_to_yaml_value(v: &Value) -> Result<serde_yaml::Value, ShellError> {
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => serde_yaml::Value::Bool(*b),
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => {
-            serde_yaml::Value::Number(serde_yaml::Number::from(b.to_f64().ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Could not convert to bytes",
-                    "could not convert to bytes",
-                    &v.tag,
-                )
-            })?))
-        }
-        UntaggedValue::Primitive(Primitive::Duration(i)) => {
-            serde_yaml::Value::String(i.to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Date(d)) => serde_yaml::Value::String(d.to_string()),
-        UntaggedValue::Primitive(Primitive::EndOfStream) => serde_yaml::Value::Null,
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => serde_yaml::Value::Null,
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => {
-            serde_yaml::Value::Number(serde_yaml::Number::from(f.to_f64().ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Could not convert to decimal",
-                    "could not convert to decimal",
-                    &v.tag,
-                )
-            })?))
-        }
-        UntaggedValue::Primitive(Primitive::Int(i)) => {
-            serde_yaml::Value::Number(serde_yaml::Number::from(*i))
-        }
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            serde_yaml::Value::Number(serde_yaml::Number::from(CoerceInto::<i64>::coerce_into(
-                i.tagged(&v.tag),
-                "converting to YAML number",
-            )?))
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => serde_yaml::Value::Null,
-        UntaggedValue::Primitive(Primitive::GlobPattern(s)) => serde_yaml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::String(s)) => serde_yaml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => {
-            let mut out = vec![];
-
-            for member in path {
-                match &member.unspanned {
-                    UnspannedPathMember::String(string) => {
-                        out.push(serde_yaml::Value::String(string.clone()))
-                    }
-                    UnspannedPathMember::Int(int) => {
-                        out.push(serde_yaml::Value::Number(serde_yaml::Number::from(*int)))
-                    }
-                }
-            }
-
-            serde_yaml::Value::Sequence(out)
-        }
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => {
-            serde_yaml::Value::String(s.display().to_string())
-        }
-
-        UntaggedValue::Table(l) => {
-            let mut out = vec![];
-
-            for value in l {
-                out.push(value_to_yaml_value(value)?);
-            }
-
-            serde_yaml::Value::Sequence(out)
-        }
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Block(_) | UntaggedValue::Primitive(Primitive::Range(_)) => {
-            serde_yaml::Value::Null
-        }
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => serde_yaml::Value::Null,
-        UntaggedValue::Primitive(Primitive::Binary(b)) => serde_yaml::Value::Sequence(
-            b.iter()
-                .map(|x| serde_yaml::Value::Number(serde_yaml::Number::from(*x)))
-                .collect(),
-        ),
-        UntaggedValue::Row(o) => {
-            let mut m = serde_yaml::Mapping::new();
-            for (k, v) in &o.entries {
-                m.insert(
-                    serde_yaml::Value::String(k.clone()),
-                    value_to_yaml_value(v)?,
-                );
-            }
-            serde_yaml::Value::Mapping(m)
-        }
-    })
-}
-
-fn to_yaml(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.name_tag();
-    let name_span = name_tag.span;
-
-    let input: Vec<Value> = args.input.collect();
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    Ok((to_process_input.into_iter().map(move |value| {
-        let value_span = value.tag.span;
-
-        match value_to_yaml_value(&value) {
-            Ok(yaml_value) => match serde_yaml::to_string(&yaml_value) {
-                Ok(x) => UntaggedValue::Primitive(Primitive::String(x)).into_value(&name_tag),
-
-                _ => Value::error(ShellError::labeled_error_with_secondary(
-                    "Expected a table with YAML-compatible structure from pipeline",
-                    "requires YAML-compatible input",
-                    name_span,
-                    "originates from here".to_string(),
-                    value_span,
-                )),
-            },
-            _ => Value::error(ShellError::labeled_error(
-                "Expected a table with YAML-compatible structure from pipeline",
-                "requires YAML-compatible input",
-                &name_tag,
-            )),
-        }
-    }))
-    .into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::ToYaml;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ToYaml {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/cal.rs b/old_nushell/crates/nu-command/src/commands/generators/cal.rs
deleted file mode 100644
index 12195a4d1..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/cal.rs
+++ /dev/null
@@ -1,338 +0,0 @@
-use crate::prelude::*;
-use chrono::{Datelike, Local, NaiveDate};
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Cal;
-
-impl WholeStreamCommand for Cal {
-    fn name(&self) -> &str {
-        "cal"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("cal")
-            .switch("year", "Display the year column", Some('y'))
-            .switch("quarter", "Display the quarter column", Some('q'))
-            .switch("month", "Display the month column", Some('m'))
-            .named(
-                "full-year",
-                SyntaxShape::Int,
-                "Display a year-long calendar for the specified year",
-                None,
-            )
-            .named(
-                "week-start",
-                SyntaxShape::String,
-                "Display the calendar with the specified day as the first day of the week",
-                None,
-            )
-            .switch(
-                "month-names",
-                "Display the month names instead of integers",
-                None,
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Display a calendar."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        cal(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "This month's calendar",
-                example: "cal",
-                result: None,
-            },
-            Example {
-                description: "The calendar for all of 2012",
-                example: "cal --full-year 2012",
-                result: None,
-            },
-            Example {
-                description: "This month's calendar with the week starting on monday",
-                example: "cal --week-start monday",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn cal(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let mut calendar_vec_deque = VecDeque::new();
-    let tag = args.call_info.name_tag.clone();
-
-    let (current_year, current_month, current_day) = get_current_date();
-
-    let mut selected_year: i32 = current_year;
-    let mut current_day_option: Option<u32> = Some(current_day);
-
-    let full_year_value: Option<u64> = args.get_flag("full-year")?;
-    let month_range = if let Some(full_year_value) = full_year_value {
-        selected_year = full_year_value as i32;
-
-        if selected_year != current_year {
-            current_day_option = None
-        }
-
-        (1, 12)
-    } else {
-        (current_month, current_month)
-    };
-
-    add_months_of_year_to_table(
-        &args,
-        &mut calendar_vec_deque,
-        &tag,
-        selected_year,
-        month_range,
-        current_month,
-        current_day_option,
-    )?;
-
-    Ok(calendar_vec_deque.into_iter().into_action_stream())
-}
-
-fn get_invalid_year_shell_error(year_tag: &Tag) -> ShellError {
-    ShellError::labeled_error("The year is invalid", "invalid year", year_tag)
-}
-
-struct MonthHelper {
-    selected_year: i32,
-    selected_month: u32,
-    day_number_of_week_month_starts_on: u32,
-    number_of_days_in_month: u32,
-    quarter_number: u32,
-    month_name: String,
-}
-
-impl MonthHelper {
-    pub fn new(selected_year: i32, selected_month: u32) -> Result<MonthHelper, ()> {
-        let naive_date = NaiveDate::from_ymd_opt(selected_year, selected_month, 1).ok_or(())?;
-        let number_of_days_in_month =
-            MonthHelper::calculate_number_of_days_in_month(selected_year, selected_month)?;
-
-        Ok(MonthHelper {
-            selected_year,
-            selected_month,
-            day_number_of_week_month_starts_on: naive_date.weekday().num_days_from_sunday(),
-            number_of_days_in_month,
-            quarter_number: ((selected_month - 1) / 3) + 1,
-            month_name: naive_date.format("%B").to_string().to_ascii_lowercase(),
-        })
-    }
-
-    fn calculate_number_of_days_in_month(
-        mut selected_year: i32,
-        mut selected_month: u32,
-    ) -> Result<u32, ()> {
-        // Chrono does not provide a method to output the amount of days in a month
-        // This is a workaround taken from the example code from the Chrono docs here:
-        // https://docs.rs/chrono/0.3.0/chrono/naive/date/struct.NaiveDate.html#example-30
-        if selected_month == 12 {
-            selected_year += 1;
-            selected_month = 1;
-        } else {
-            selected_month += 1;
-        };
-
-        let next_month_naive_date =
-            NaiveDate::from_ymd_opt(selected_year, selected_month, 1).ok_or(())?;
-
-        Ok(next_month_naive_date.pred().day())
-    }
-}
-
-fn get_current_date() -> (i32, u32, u32) {
-    let local_now_date = Local::now().date();
-
-    let current_year: i32 = local_now_date.year();
-    let current_month: u32 = local_now_date.month();
-    let current_day: u32 = local_now_date.day();
-
-    (current_year, current_month, current_day)
-}
-
-fn add_months_of_year_to_table(
-    args: &CommandArgs,
-    calendar_vec_deque: &mut VecDeque<Value>,
-    tag: &Tag,
-    selected_year: i32,
-    (start_month, end_month): (u32, u32),
-    current_month: u32,
-    current_day_option: Option<u32>,
-) -> Result<(), ShellError> {
-    for month_number in start_month..=end_month {
-        let mut new_current_day_option: Option<u32> = None;
-
-        if let Some(current_day) = current_day_option {
-            if month_number == current_month {
-                new_current_day_option = Some(current_day)
-            }
-        }
-
-        let add_month_to_table_result = add_month_to_table(
-            args,
-            calendar_vec_deque,
-            tag,
-            selected_year,
-            month_number,
-            new_current_day_option,
-        );
-
-        add_month_to_table_result?
-    }
-
-    Ok(())
-}
-
-fn add_month_to_table(
-    args: &CommandArgs,
-    calendar_vec_deque: &mut VecDeque<Value>,
-    tag: &Tag,
-    selected_year: i32,
-    current_month: u32,
-    current_day_option: Option<u32>,
-) -> Result<(), ShellError> {
-    let month_helper_result = MonthHelper::new(selected_year, current_month);
-
-    let full_year_value: Option<Tagged<u64>> = args.get_flag("full-year")?;
-
-    let month_helper = match month_helper_result {
-        Ok(month_helper) => month_helper,
-        Err(()) => match full_year_value {
-            Some(full_year_value) => {
-                return Err(get_invalid_year_shell_error(&full_year_value.tag()))
-            }
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Issue parsing command",
-                    "invalid command",
-                    tag,
-                ))
-            }
-        },
-    };
-
-    let mut days_of_the_week = [
-        "sunday",
-        "monday",
-        "tuesday",
-        "wednesday",
-        "thursday",
-        "friday",
-        "saturday",
-    ];
-
-    let mut week_start_day = days_of_the_week[0].to_string();
-
-    if let Some(day) = args.get_flag::<Tagged<String>>("week-start")? {
-        if days_of_the_week.contains(&day.item.as_str()) {
-            week_start_day = day.item;
-        } else {
-            return Err(ShellError::labeled_error(
-                "The specified week start day is invalid",
-                "invalid week start day",
-                day.tag(),
-            ));
-        }
-    }
-
-    let week_start_day_offset = days_of_the_week.len()
-        - days_of_the_week
-            .iter()
-            .position(|day| *day == week_start_day)
-            .unwrap_or(0);
-
-    days_of_the_week.rotate_right(week_start_day_offset);
-
-    let mut total_start_offset: u32 =
-        month_helper.day_number_of_week_month_starts_on + week_start_day_offset as u32;
-    total_start_offset %= days_of_the_week.len() as u32;
-
-    let mut day_number: u32 = 1;
-    let day_limit: u32 = total_start_offset + month_helper.number_of_days_in_month;
-
-    let should_show_year_column = args.has_flag("year");
-    let should_show_quarter_column = args.has_flag("quarter");
-    let should_show_month_column = args.has_flag("month");
-    let should_show_month_names = args.has_flag("month-names");
-
-    while day_number <= day_limit {
-        let mut indexmap = IndexMap::new();
-
-        if should_show_year_column {
-            indexmap.insert(
-                "year".to_string(),
-                UntaggedValue::int(month_helper.selected_year).into_value(tag),
-            );
-        }
-
-        if should_show_quarter_column {
-            indexmap.insert(
-                "quarter".to_string(),
-                UntaggedValue::int(month_helper.quarter_number).into_value(tag),
-            );
-        }
-
-        if should_show_month_column || should_show_month_names {
-            let month_value = if should_show_month_names {
-                UntaggedValue::string(month_helper.month_name.clone()).into_value(tag)
-            } else {
-                UntaggedValue::int(month_helper.selected_month).into_value(tag)
-            };
-
-            indexmap.insert("month".to_string(), month_value);
-        }
-
-        for day in &days_of_the_week {
-            let should_add_day_number_to_table =
-                (day_number > total_start_offset) && (day_number <= day_limit);
-
-            let mut value = UntaggedValue::nothing().into_value(tag);
-
-            if should_add_day_number_to_table {
-                let adjusted_day_number = day_number - total_start_offset;
-
-                value = UntaggedValue::int(adjusted_day_number).into_value(tag);
-
-                if let Some(current_day) = current_day_option {
-                    if current_day == adjusted_day_number {
-                        // TODO: Update the value here with a color when color support is added
-                        // This colors the current day
-                    }
-                }
-            }
-
-            indexmap.insert((*day).to_string(), value);
-
-            day_number += 1;
-        }
-
-        calendar_vec_deque
-            .push_back(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(tag));
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Cal;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Cal {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/command.rs b/old_nushell/crates/nu-command/src/commands/generators/date/command.rs
deleted file mode 100644
index 1e736eb10..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/command.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date")
-    }
-
-    fn usage(&self) -> &str {
-        "Apply date function."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/format.rs b/old_nushell/crates/nu-command/src/commands/generators/date/format.rs
deleted file mode 100644
index 73c486180..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/format.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::fmt::{self, write};
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date format"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date format")
-            .required("format", SyntaxShape::String, "strftime format")
-            .switch("table", "print date in a table", Some('t'))
-    }
-
-    fn usage(&self) -> &str {
-        "Format a given date using the given format string."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        format(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Format the current date",
-                example: "date now | date format '%Y.%m.%d_%H %M %S,%z'",
-                result: None,
-            },
-            Example {
-                description: "Format the current date and print in a table",
-                example: "date now | date format -t '%Y-%m-%d_%H:%M:%S %z'",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn format(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let format: Tagged<String> = args.req(0)?;
-    let table: Option<bool> = args.get_flag("table")?;
-
-    let input = if args.input.is_empty() {
-        InputStream::one(super::now::date_now(&tag))
-    } else {
-        args.input
-    };
-
-    Ok(input
-        .map(move |value| match value {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Date(dt)),
-                ..
-            } => {
-                let mut output = String::new();
-                if let Err(fmt::Error) =
-                    write(&mut output, format_args!("{}", dt.format(&format.item)))
-                {
-                    Err(ShellError::labeled_error(
-                        "The date format is invalid",
-                        "invalid strftime format",
-                        &format.tag,
-                    ))
-                } else {
-                    let value = if table.is_some() {
-                        let mut indexmap = IndexMap::new();
-                        indexmap.insert(
-                            "formatted".to_string(),
-                            UntaggedValue::string(&output).into_value(&tag),
-                        );
-
-                        UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag)
-                    } else {
-                        UntaggedValue::string(&output).into_value(&tag)
-                    };
-
-                    Ok(value)
-                }
-            }
-            _ => Err(ShellError::labeled_error(
-                "Expected a date from pipeline",
-                "requires date input",
-                &tag,
-            )),
-        })
-        .into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/humanize.rs b/old_nushell/crates/nu-command/src/commands/generators/date/humanize.rs
deleted file mode 100644
index af440f981..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/humanize.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, Signature, UntaggedValue, Value};
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date humanize"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date humanize").switch("table", "print date in a table", Some('t'))
-    }
-
-    fn usage(&self) -> &str {
-        "Print a 'humanized' format for the date, relative to now."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        humanize(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Humanize the current date",
-            example: "date now | date humanize",
-            result: None,
-        }]
-    }
-}
-
-pub fn humanize(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let table: Option<bool> = args.get_flag("table")?;
-    let input = args.input;
-
-    Ok(input
-        .map(move |value| match value {
-            Value {
-                value: UntaggedValue::Primitive(dt @ Primitive::Date(_)),
-                ..
-            } => {
-                let output = nu_protocol::format_primitive(&dt, None);
-                let value = if table.is_some() {
-                    let mut indexmap = IndexMap::new();
-                    indexmap.insert(
-                        "formatted".to_string(),
-                        UntaggedValue::string(&output).into_value(&tag),
-                    );
-
-                    UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag)
-                } else {
-                    UntaggedValue::string(&output).into_value(&tag)
-                };
-
-                Ok(value)
-            }
-            _ => Err(ShellError::labeled_error(
-                "Expected a date from pipeline",
-                "requires date input",
-                &tag,
-            )),
-        })
-        .into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/list_timezone.rs b/old_nushell/crates/nu-command/src/commands/generators/date/list_timezone.rs
deleted file mode 100644
index af7fc94ad..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/list_timezone.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use crate::prelude::*;
-use chrono_tz::TZ_VARIANTS;
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Signature, UntaggedValue};
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date list-timezone"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date list-timezone")
-    }
-
-    fn usage(&self) -> &str {
-        "List supported time zones."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        list_timezone(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "List all supported time zones",
-                example: "date list-timezone",
-                result: None,
-            },
-            Example {
-                description: "List all supported European time zones",
-                example: "date list-timezone | where timezone =~ Europe",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn list_timezone(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag;
-
-    let list = TZ_VARIANTS.iter().map(move |tz| {
-        let mut entries = IndexMap::new();
-
-        entries.insert(
-            "timezone".to_string(),
-            UntaggedValue::string(tz.name()).into_value(&tag),
-        );
-
-        Ok(UntaggedValue::Row(Dictionary { entries }).into_value(&tag))
-    });
-
-    Ok(list.into_iter().into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/mod.rs b/old_nushell/crates/nu-command/src/commands/generators/date/mod.rs
deleted file mode 100644
index c98e62ef2..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub mod command;
-pub mod format;
-pub mod humanize;
-pub mod list_timezone;
-pub mod now;
-pub mod to_table;
-pub mod to_timezone;
-
-mod parser;
-
-pub use command::Command as Date;
-pub use format::Date as DateFormat;
-pub use humanize::Date as DateHumanize;
-pub use list_timezone::Date as DateListTimeZone;
-pub use now::Date as DateNow;
-pub use to_table::Date as DateToTable;
-pub use to_timezone::Date as DateToTimeZone;
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/now.rs b/old_nushell/crates/nu-command/src/commands/generators/date/now.rs
deleted file mode 100644
index fda7b596a..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/now.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use crate::prelude::*;
-use chrono::{DateTime, Local};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date now"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date now")
-    }
-
-    fn usage(&self) -> &str {
-        "Get the current date."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        now(args)
-    }
-}
-
-pub fn date_now(tag: &Tag) -> Value {
-    let now: DateTime<Local> = Local::now();
-
-    UntaggedValue::date(now.with_timezone(now.offset())).into_value(tag)
-}
-
-pub fn now(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let value = date_now(&args.call_info.name_tag);
-
-    Ok(OutputStream::one(value))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/parser.rs b/old_nushell/crates/nu-command/src/commands/generators/date/parser.rs
deleted file mode 100644
index d2d1f3a85..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/parser.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Modified from chrono::format::scan
-
-use chrono::{DateTime, FixedOffset, Local, Offset, TimeZone};
-use chrono_tz::Tz;
-use titlecase::titlecase;
-
-#[derive(Debug, Clone, PartialEq, Eq, Copy)]
-pub enum ParseErrorKind {
-    /// Given field is out of permitted range.
-    OutOfRange,
-
-    /// The input string has some invalid character sequence for given formatting items.
-    Invalid,
-
-    /// The input string has been prematurely ended.
-    TooShort,
-}
-
-pub fn datetime_in_timezone(
-    dt: &DateTime<FixedOffset>,
-    s: &str,
-) -> Result<DateTime<FixedOffset>, ParseErrorKind> {
-    match timezone_offset_internal(s, true, true) {
-        Ok(offset) => match FixedOffset::east_opt(offset) {
-            Some(offset) => Ok(dt.with_timezone(&offset)),
-            None => Err(ParseErrorKind::OutOfRange),
-        },
-        Err(ParseErrorKind::Invalid) => {
-            if s.to_lowercase() == "local" {
-                Ok(dt.with_timezone(Local::now().offset()))
-            } else {
-                let tz: Tz = parse_timezone_internal(s)?;
-                let offset = tz.offset_from_utc_datetime(&dt.naive_utc()).fix();
-                Ok(dt.with_timezone(&offset))
-            }
-        }
-        Err(e) => Err(e),
-    }
-}
-
-fn parse_timezone_internal(s: &str) -> Result<Tz, ParseErrorKind> {
-    if let Ok(tz) = s.parse() {
-        Ok(tz)
-    } else if let Ok(tz) = titlecase(s).parse() {
-        Ok(tz)
-    } else if let Ok(tz) = s.to_uppercase().parse() {
-        Ok(tz)
-    } else {
-        Err(ParseErrorKind::Invalid)
-    }
-}
-
-fn timezone_offset_internal(
-    mut s: &str,
-    consume_colon: bool,
-    allow_missing_minutes: bool,
-) -> Result<i32, ParseErrorKind> {
-    fn digits(s: &str) -> Result<(u8, u8), ParseErrorKind> {
-        let b = s.as_bytes();
-        if b.len() < 2 {
-            Err(ParseErrorKind::TooShort)
-        } else {
-            Ok((b[0], b[1]))
-        }
-    }
-    let negative = match s.as_bytes().first() {
-        Some(&b'+') => false,
-        Some(&b'-') => true,
-        Some(_) => return Err(ParseErrorKind::Invalid),
-        None => return Err(ParseErrorKind::TooShort),
-    };
-    s = &s[1..];
-
-    // hours (00--99)
-    let hours = match digits(s)? {
-        (h1 @ b'0'..=b'9', h2 @ b'0'..=b'9') => i32::from((h1 - b'0') * 10 + (h2 - b'0')),
-        _ => return Err(ParseErrorKind::Invalid),
-    };
-    s = &s[2..];
-
-    // colons (and possibly other separators)
-    if consume_colon {
-        s = s.trim_start_matches(|c: char| c == ':' || c.is_whitespace());
-    }
-
-    // minutes (00--59)
-    // if the next two items are digits then we have to add minutes
-    let minutes = if let Ok(ds) = digits(s) {
-        match ds {
-            (m1 @ b'0'..=b'5', m2 @ b'0'..=b'9') => i32::from((m1 - b'0') * 10 + (m2 - b'0')),
-            (b'6'..=b'9', b'0'..=b'9') => return Err(ParseErrorKind::OutOfRange),
-            _ => return Err(ParseErrorKind::Invalid),
-        }
-    } else if allow_missing_minutes {
-        0
-    } else {
-        return Err(ParseErrorKind::TooShort);
-    };
-    match s.len() {
-        len if len >= 2 => &s[2..],
-        len if len == 0 => s,
-        _ => return Err(ParseErrorKind::TooShort),
-    };
-
-    let seconds = hours * 3600 + minutes * 60;
-    Ok(if negative { -seconds } else { seconds })
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/to_table.rs b/old_nushell/crates/nu-command/src/commands/generators/date/to_table.rs
deleted file mode 100644
index 10163451f..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/to_table.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use crate::prelude::*;
-use chrono::{Datelike, Timelike};
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, Signature, UntaggedValue, Value};
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date to-table"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date to-table")
-    }
-
-    fn usage(&self) -> &str {
-        "Print the date in a structured table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_table(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Print the current date in a table",
-            example: "date now | date to-table",
-            result: None,
-        }]
-    }
-}
-
-fn to_table(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let input = if args.input.is_empty() {
-        InputStream::one(super::now::date_now(&tag))
-    } else {
-        args.input
-    };
-
-    Ok(input
-        .map(move |value| match value {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Date(dt)),
-                ..
-            } => {
-                let mut indexmap = IndexMap::new();
-
-                indexmap.insert(
-                    "year".to_string(),
-                    UntaggedValue::int(dt.year()).into_value(&tag),
-                );
-                indexmap.insert(
-                    "month".to_string(),
-                    UntaggedValue::int(dt.month()).into_value(&tag),
-                );
-                indexmap.insert(
-                    "day".to_string(),
-                    UntaggedValue::int(dt.day()).into_value(&tag),
-                );
-                indexmap.insert(
-                    "hour".to_string(),
-                    UntaggedValue::int(dt.hour()).into_value(&tag),
-                );
-                indexmap.insert(
-                    "minute".to_string(),
-                    UntaggedValue::int(dt.minute()).into_value(&tag),
-                );
-                indexmap.insert(
-                    "second".to_string(),
-                    UntaggedValue::int(dt.second()).into_value(&tag),
-                );
-
-                let tz = dt.offset();
-                indexmap.insert(
-                    "timezone".to_string(),
-                    UntaggedValue::string(tz.to_string()).into_value(&tag),
-                );
-
-                let value = UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag);
-
-                Ok(value)
-            }
-            _ => Err(ShellError::labeled_error(
-                "Expected a date from pipeline",
-                "requires date input",
-                &tag,
-            )),
-        })
-        .into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/date/to_timezone.rs b/old_nushell/crates/nu-command/src/commands/generators/date/to_timezone.rs
deleted file mode 100644
index 6e1994ba7..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/date/to_timezone.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use super::parser::{datetime_in_timezone, ParseErrorKind};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Date;
-
-impl WholeStreamCommand for Date {
-    fn name(&self) -> &str {
-        "date to-timezone"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("date to-timezone").required(
-            "time zone",
-            SyntaxShape::String,
-            "time zone description",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert a date to a given time zone."
-    }
-
-    fn extra_usage(&self) -> &str {
-        "Use 'date list-timezone' to list all supported time zones."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        to_timezone(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get the current date in UTC+05:00",
-                example: "date now | date to-timezone +0500",
-                result: None,
-            },
-            Example {
-                description: "Get the current local date",
-                example: "date now | date to-timezone local",
-                result: None,
-            },
-            Example {
-                description: "Get the current date in Hawaii",
-                example: "date now | date to-timezone US/Hawaii",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn to_timezone(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let timezone: Tagged<String> = args.req(0)?;
-
-    Ok(args
-        .input
-        .map(move |value| match value {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Date(dt)),
-                ..
-            } => match datetime_in_timezone(&dt, &timezone.item) {
-                Ok(dt) => {
-                    let value = UntaggedValue::date(dt).into_value(&tag);
-
-                    Ok(value)
-                }
-                Err(e) => Err(ShellError::labeled_error(
-                    error_message(e),
-                    "invalid time zone",
-                    &timezone.tag,
-                )),
-            },
-            _ => Err(ShellError::labeled_error(
-                "Expected a date from pipeline",
-                "requires date input",
-                &tag,
-            )),
-        })
-        .into_input_stream())
-}
-
-fn error_message(err: ParseErrorKind) -> &'static str {
-    match err {
-        ParseErrorKind::Invalid => "The time zone description is invalid",
-        ParseErrorKind::OutOfRange => "The time zone offset is out of range",
-        ParseErrorKind::TooShort => "The format of the time zone is invalid",
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Date {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/for_in.rs b/old_nushell/crates/nu-command/src/commands/generators/for_in.rs
deleted file mode 100644
index ef455c610..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/for_in.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-use crate::prelude::*;
-use nu_engine::{evaluate_baseline_expr, run_block};
-use nu_engine::{FromValue, WholeStreamCommand};
-
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{CapturedBlock, ExternalRedirection},
-    Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value,
-};
-
-pub struct ForIn;
-
-impl WholeStreamCommand for ForIn {
-    fn name(&self) -> &str {
-        "for"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("for")
-            .required("var", SyntaxShape::String, "the name of the variable")
-            .required("in", SyntaxShape::String, "the word 'in'")
-            .required("value", SyntaxShape::Any, "the value we want to iterate")
-            .required("block", SyntaxShape::Block, "the block to run on each item")
-            .switch(
-                "numbered",
-                "returned a numbered item ($it.index and $it.item)",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Run a block on each row of the table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        for_in(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Echo the square of each integer",
-                example: "for x in [1 2 3] { $x * $x }",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(9).into(),
-                ]),
-            },
-            Example {
-                description: "Work with elements of a range",
-                example: "for $x in 1..3 { $x }",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                ]),
-            },
-            Example {
-                description: "Number each item and echo a message",
-                example: "for $it in ['bob' 'fred'] --numbered { $\"($it.index) is ($it.item)\" }",
-                result: Some(vec![Value::from("0 is bob"), Value::from("1 is fred")]),
-            },
-        ]
-    }
-}
-
-pub fn process_row(
-    captured_block: &CapturedBlock,
-    context: &EvaluationContext,
-    input: Value,
-    var_name: &str,
-    external_redirection: ExternalRedirection,
-) -> Result<OutputStream, ShellError> {
-    let input_clone = input.clone();
-    // When we process a row, we need to know whether the block wants to have the contents of the row as
-    // a parameter to the block (so it gets assigned to a variable that can be used inside the block) or
-    // if it wants the contents as as an input stream
-
-    let input_stream = if !captured_block.block.params.positional.is_empty() {
-        InputStream::empty()
-    } else {
-        vec![Ok(input_clone)].into_iter().into_input_stream()
-    };
-
-    context.scope.enter_scope();
-    context.scope.add_vars(&captured_block.captured.entries);
-
-    context.scope.add_var(var_name, input);
-
-    let result = run_block(
-        &captured_block.block,
-        context,
-        input_stream,
-        external_redirection,
-    );
-
-    context.scope.exit_scope();
-
-    result
-}
-
-pub(crate) fn make_indexed_item(index: usize, item: Value) -> Value {
-    let mut dict = TaggedDictBuilder::new(item.tag());
-    dict.insert_untagged("index", UntaggedValue::int(index as i64));
-    dict.insert_value("item", item);
-
-    dict.into_value()
-}
-
-fn for_in(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let context = args.context.clone();
-    let external_redirection = args.call_info.args.external_redirection;
-    //
-    let numbered: bool = args.call_info.switch_present("numbered");
-    let positional = args
-        .call_info
-        .args
-        .positional
-        .expect("Internal error: type checker should require args");
-
-    let var_name = positional[0].var_name()?;
-    let rhs = evaluate_baseline_expr(&positional[2], &context)?;
-
-    let block: CapturedBlock =
-        FromValue::from_value(&evaluate_baseline_expr(&positional[3], &context)?)?;
-
-    let input = crate::commands::core_commands::echo::expand_value_to_stream(rhs);
-
-    if numbered {
-        Ok(input
-            .enumerate()
-            .flat_map(move |input| {
-                let row = make_indexed_item(input.0, input.1);
-
-                match process_row(&block, &context, row, &var_name, external_redirection) {
-                    Ok(s) => s,
-                    Err(e) => OutputStream::one(Value::error(e)),
-                }
-            })
-            .into_output_stream())
-    } else {
-        Ok(input
-            .flat_map(move |input| {
-                let block = block.clone();
-
-                match process_row(&block, &context, input, &var_name, external_redirection) {
-                    Ok(s) => s,
-                    Err(e) => OutputStream::one(Value::error(e)),
-                }
-            })
-            .into_output_stream())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ForIn;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(ForIn {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/base64_.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/base64_.rs
deleted file mode 100644
index a623bc3a6..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/base64_.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::{Tag, Tagged};
-
-use base64::{decode_config, encode_config};
-
-#[derive(Clone)]
-pub struct Base64Config {
-    pub character_set: String,
-    pub action_type: ActionType,
-}
-
-#[derive(Clone, Copy, PartialEq)]
-pub enum ActionType {
-    Encode,
-    Decode,
-}
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "hash base64"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("hash base64")
-            .named(
-                "character_set",
-                SyntaxShape::String,
-                "specify the character rules for encoding the input.\n\
-                        \tValid values are 'standard', 'standard-no-padding', 'url-safe', 'url-safe-no-padding',\
-                        'binhex', 'bcrypt', 'crypt'",
-                Some('c'),
-            )
-            .switch(
-                "encode",
-                "encode the input as base64. This is the default behavior if not specified.",
-                Some('e')
-            )
-            .switch(
-                "decode",
-                "decode the input from base64",
-                Some('d'))
-            .rest(
-"rest",
-                SyntaxShape::ColumnPath,
-                "optionally base64 encode / decode data by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "base64 encode or decode a value"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Base64 encode a string with default settings",
-                example: "echo 'username:password' | hash base64",
-                result: Some(vec![
-                    UntaggedValue::string("dXNlcm5hbWU6cGFzc3dvcmQ=").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Base64 encode a string with the binhex character set",
-                example: "echo 'username:password' | hash base64 --character_set binhex --encode",
-                result: Some(vec![
-                    UntaggedValue::string("F@0NEPjJD97kE'&bEhFZEP3").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Base64 decode a value",
-                example: "echo 'dXNlcm5hbWU6cGFzc3dvcmQ=' | hash base64 --decode",
-                result: Some(vec![
-                    UntaggedValue::string("username:password").into_untagged_value()
-                ]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-
-    let encode = args.has_flag("encode");
-    let decode = args.has_flag("decode");
-    let character_set: Option<Tagged<String>> = args.get_flag("character_set")?;
-    let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-    if encode && decode {
-        return Err(ShellError::labeled_error(
-            "only one of --decode and --encode flags can be used",
-            "conflicting flags",
-            name_tag,
-        ));
-    }
-
-    // Default the action to be encoding if no flags are specified.
-    let action_type = if decode {
-        ActionType::Decode
-    } else {
-        ActionType::Encode
-    };
-
-    // Default the character set to standard if the argument is not specified.
-    let character_set = match character_set {
-        Some(inner_tag) => inner_tag.item().to_string(),
-        None => "standard".to_string(),
-    };
-
-    let encoding_config = Base64Config {
-        character_set,
-        action_type,
-    };
-
-    Ok(args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, &encoding_config, v.tag())
-            } else {
-                let mut ret = v;
-
-                for path in &column_paths {
-                    let config = encoding_config.clone();
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &config, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-fn action(
-    input: &Value,
-    base64_config: &Base64Config,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let base64_config_enum: base64::Config = if &base64_config.character_set == "standard" {
-                base64::STANDARD
-            } else if &base64_config.character_set == "standard-no-padding" {
-                base64::STANDARD_NO_PAD
-            } else if &base64_config.character_set == "url-safe" {
-                base64::URL_SAFE
-            } else if &base64_config.character_set == "url-safe-no-padding" {
-                base64::URL_SAFE_NO_PAD
-            } else if &base64_config.character_set == "binhex" {
-                base64::BINHEX
-            } else if &base64_config.character_set == "bcrypt" {
-                base64::BCRYPT
-            } else if &base64_config.character_set == "crypt" {
-                base64::CRYPT
-            } else {
-                return Err(ShellError::labeled_error(
-                    "value is not an accepted character set",
-                    format!(
-                        "{} is not a valid character-set.\nPlease use `help hash base64` to see a list of valid character sets.",
-                        &base64_config.character_set
-                    ),
-                    tag.into().span,
-                ));
-            };
-
-            match base64_config.action_type {
-                ActionType::Encode => Ok(UntaggedValue::string(encode_config(
-                    &s,
-                    base64_config_enum,
-                ))
-                .into_value(tag)),
-                ActionType::Decode => {
-                    let decode_result = decode_config(&s, base64_config_enum);
-
-                    match decode_result {
-                        Ok(decoded_value) => Ok(UntaggedValue::string(
-                            std::string::String::from_utf8_lossy(&decoded_value),
-                        )
-                        .into_value(tag)),
-                        Err(_) => Err(ShellError::labeled_error(
-                            "value could not be base64 decoded",
-                            format!(
-                                "invalid base64 input for character set {}",
-                                &base64_config.character_set
-                            ),
-                            tag.into().span,
-                        )),
-                    }
-                }
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, ActionType, Base64Config};
-    use nu_protocol::UntaggedValue;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn base64_encode_standard() {
-        let word = string("username:password");
-        let expected = UntaggedValue::string("dXNlcm5hbWU6cGFzc3dvcmQ=").into_untagged_value();
-
-        let actual = action(
-            &word,
-            &Base64Config {
-                character_set: "standard".to_string(),
-                action_type: ActionType::Encode,
-            },
-            Tag::unknown(),
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_encode_standard_no_padding() {
-        let word = string("username:password");
-        let expected = UntaggedValue::string("dXNlcm5hbWU6cGFzc3dvcmQ").into_untagged_value();
-
-        let actual = action(
-            &word,
-            &Base64Config {
-                character_set: "standard-no-padding".to_string(),
-                action_type: ActionType::Encode,
-            },
-            Tag::unknown(),
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_encode_url_safe() {
-        let word = string("this is for url");
-        let expected = UntaggedValue::string("dGhpcyBpcyBmb3IgdXJs").into_untagged_value();
-
-        let actual = action(
-            &word,
-            &Base64Config {
-                character_set: "url-safe".to_string(),
-                action_type: ActionType::Encode,
-            },
-            Tag::unknown(),
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn base64_decode_binhex() {
-        let word = string("A5\"KC9jRB@IIF'8bF!");
-        let expected = UntaggedValue::string("a binhex test").into_untagged_value();
-
-        let actual = action(
-            &word,
-            &Base64Config {
-                character_set: "binhex".to_string(),
-                action_type: ActionType::Decode,
-            },
-            Tag::unknown(),
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/command.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/command.rs
deleted file mode 100644
index 90ea80962..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/command.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "hash"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("hash").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Apply hash function."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/generic_digest.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/generic_digest.rs
deleted file mode 100644
index bc0542e5f..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/generic_digest.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use std::marker::PhantomData;
-
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, SyntaxShape, UntaggedValue, Value};
-use nu_protocol::{ShellTypeName, Signature};
-use nu_source::Tag;
-
-pub trait HashDigest: digest::Digest {
-    fn name() -> &'static str;
-    fn examples() -> Vec<Example>;
-}
-
-pub struct SubCommand<D: HashDigest> {
-    name_string: String,
-    usage_string: String,
-    phantom: PhantomData<D>,
-}
-
-impl<D: HashDigest> Default for SubCommand<D> {
-    fn default() -> Self {
-        Self {
-            name_string: format!("hash {}", D::name()),
-            usage_string: format!("{} encode a value", D::name()),
-            phantom: PhantomData,
-        }
-    }
-}
-
-impl<D> WholeStreamCommand for SubCommand<D>
-where
-    D: HashDigest + Send + Sync,
-    digest::Output<D>: core::fmt::LowerHex,
-{
-    fn name(&self) -> &str {
-        &self.name_string
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name()).rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            format!("optionally {} encode data by column paths", D::name()),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        &self.usage_string
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        D::examples()
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let column_paths: Vec<ColumnPath> = args.rest(0)?;
-
-        Ok(args
-            .input
-            .map(move |v| {
-                if column_paths.is_empty() {
-                    action::<D>(&v, v.tag())
-                } else {
-                    let mut ret = v;
-
-                    for path in &column_paths {
-                        ret = ret.swap_data_by_column_path(
-                            path,
-                            Box::new(move |old| action::<D>(old, old.tag())),
-                        )?;
-                    }
-
-                    Ok(ret)
-                }
-            })
-            .into_input_stream())
-    }
-}
-
-pub fn action<D>(input: &Value, tag: Tag) -> Result<Value, ShellError>
-where
-    D: HashDigest,
-    digest::Output<D>: core::fmt::LowerHex,
-{
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let digest_result = D::digest(s.as_bytes());
-            Ok(UntaggedValue::string(&format!("{:x}", digest_result)).into_value(tag))
-        }
-        UntaggedValue::Primitive(Primitive::Binary(bytes)) => {
-            let digest_result = D::digest(bytes);
-            Ok(UntaggedValue::string(&format!("{:x}", digest_result)).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                format!("value is not supported for hashing as {}", D::name()),
-                got,
-                tag.span,
-            ))
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/md5_.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/md5_.rs
deleted file mode 100644
index 0559e7dfc..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/md5_.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use crate::prelude::*;
-use md5::Md5;
-use nu_protocol::UntaggedValue;
-
-use super::generic_digest::{self, HashDigest};
-
-pub type SubCommand = generic_digest::SubCommand<Md5>;
-
-impl HashDigest for Md5 {
-    fn name() -> &'static str {
-        "md5"
-    }
-
-    fn examples() -> Vec<Example> {
-        vec![
-            Example {
-                description: "md5 encode a string",
-                example: "echo 'abcdefghijklmnopqrstuvwxyz' | hash md5",
-                result: Some(vec![UntaggedValue::string(
-                    "c3fcd3d76192e4007dfb496cca67e13b",
-                )
-                .into_untagged_value()]),
-            },
-            Example {
-                description: "md5 encode a file",
-                example: "open ./nu_0_24_1_windows.zip | hash md5",
-                result: Some(vec![UntaggedValue::string(
-                    "dcf30f2836a1a99fc55cf72e28272606",
-                )
-                .into_untagged_value()]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use md5::Md5;
-    use nu_protocol::{Primitive, UntaggedValue};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    use crate::commands::generators::hash_::generic_digest::action;
-
-    #[test]
-    fn md5_encode_string() {
-        let word = string("abcdefghijklmnopqrstuvwxyz");
-        let expected =
-            UntaggedValue::string("c3fcd3d76192e4007dfb496cca67e13b").into_untagged_value();
-
-        let actual = action::<Md5>(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn md5_encode_bytes() {
-        let bytes = vec![0xC0, 0xFF, 0xEE];
-        let binary = UntaggedValue::Primitive(Primitive::Binary(bytes)).into_untagged_value();
-        let expected =
-            UntaggedValue::string("5f80e231382769b0102b1164cf722d83").into_untagged_value();
-
-        let actual = action::<Md5>(&binary, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/mod.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/mod.rs
deleted file mode 100644
index 0a76ae094..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod base64_;
-mod command;
-mod generic_digest;
-mod md5_;
-mod sha256_;
-
-pub use base64_::SubCommand as HashBase64;
-pub use command::Command as Hash;
-pub use md5_::SubCommand as HashMd5;
-pub use sha256_::SubCommand as HashSha256;
diff --git a/old_nushell/crates/nu-command/src/commands/generators/hash_/sha256_.rs b/old_nushell/crates/nu-command/src/commands/generators/hash_/sha256_.rs
deleted file mode 100644
index 4028dfdb4..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/hash_/sha256_.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::prelude::*;
-use nu_protocol::UntaggedValue;
-use sha2::Sha256;
-
-use super::generic_digest::{self, HashDigest};
-
-pub type SubCommand = generic_digest::SubCommand<Sha256>;
-
-impl HashDigest for Sha256 {
-    fn name() -> &'static str {
-        "sha256"
-    }
-
-    fn examples() -> Vec<Example> {
-        vec![
-            Example {
-                description: "sha256 encode a string",
-                example: "echo 'abcdefghijklmnopqrstuvwxyz' | hash sha256",
-                result: Some(vec![UntaggedValue::string(
-                    "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73",
-                )
-                .into_untagged_value()]),
-            },
-            Example {
-                description: "sha256 encode a file",
-                example: "open ./nu_0_24_1_windows.zip | hash sha256",
-                result: Some(vec![UntaggedValue::string(
-                    "c47a10dc272b1221f0380a2ae0f7d7fa830b3e378f2f5309bbf13f61ad211913",
-                )
-                .into_untagged_value()]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use nu_protocol::{Primitive, UntaggedValue};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-    use sha2::Sha256;
-
-    use crate::commands::generators::hash_::generic_digest::action;
-
-    #[test]
-    fn md5_encode_string() {
-        let word = string("abcdefghijklmnopqrstuvwxyz");
-        let expected = UntaggedValue::string(
-            "71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73",
-        )
-        .into_untagged_value();
-
-        let actual = action::<Sha256>(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn md5_encode_bytes() {
-        let bytes = vec![0xC0, 0xFF, 0xEE];
-        let binary = UntaggedValue::Primitive(Primitive::Binary(bytes)).into_untagged_value();
-        let expected = UntaggedValue::string(
-            "c47a10dc272b1221f0380a2ae0f7d7fa830b3e378f2f5309bbf13f61ad211913",
-        )
-        .into_untagged_value();
-
-        let actual = action::<Sha256>(&binary, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/mod.rs b/old_nushell/crates/nu-command/src/commands/generators/mod.rs
deleted file mode 100644
index 21e5102bf..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod cal;
-mod date;
-mod for_in;
-mod hash_;
-mod seq;
-mod seq_dates;
-
-pub use cal::Cal;
-pub use date::*;
-pub use for_in::ForIn;
-pub use hash_::*;
-pub use seq::Seq;
-pub use seq_dates::SeqDates;
diff --git a/old_nushell/crates/nu-command/src/commands/generators/seq.rs b/old_nushell/crates/nu-command/src/commands/generators/seq.rs
deleted file mode 100644
index a0eb3fb95..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/seq.rs
+++ /dev/null
@@ -1,368 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::value::{DecimalExt, I64Ext, StrExt};
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::cmp;
-
-pub struct Seq;
-
-impl WholeStreamCommand for Seq {
-    fn name(&self) -> &str {
-        "seq"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("seq")
-            .rest("rest", SyntaxShape::Number, "sequence values")
-            .named(
-                "separator",
-                SyntaxShape::String,
-                "separator character (defaults to \\n)",
-                Some('s'),
-            )
-            .named(
-                "terminator",
-                SyntaxShape::String,
-                "terminator character (defaults to \\n)",
-                Some('t'),
-            )
-            .switch(
-                "widths",
-                "equalize widths of all numbers by padding with zeros",
-                Some('w'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Print sequences of numbers."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        seq(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "sequence 1 to 10 with newline separator",
-                example: "seq 1 10",
-                result: Some(vec![
-                    UntaggedValue::int(1).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(3).into(),
-                    UntaggedValue::int(4).into(),
-                    UntaggedValue::int(5).into(),
-                    UntaggedValue::int(6).into(),
-                    UntaggedValue::int(7).into(),
-                    UntaggedValue::int(8).into(),
-                    UntaggedValue::int(9).into(),
-                    UntaggedValue::int(10).into(),
-                ]),
-            },
-            Example {
-                description: "sequence 1.0 to 2.0 by 0.1s with newline separator",
-                example: "seq 1.0 0.1 2.0",
-                result: Some(vec![
-                    UntaggedValue::decimal_from_float(1.0000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.1000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.2000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.3000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.4000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.5000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.6000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.7000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.8000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(1.9000, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(2.0000, Span::default()).into(),
-                ]),
-            },
-            Example {
-                description: "sequence 1 to 10 with pipe separator",
-                example: "seq -s '|' 1 10",
-                result: Some(vec![Value::from("1|2|3|4|5|6|7|8|9|10")]),
-            },
-            Example {
-                description: "sequence 1 to 10 with pipe separator padded with 0",
-                example: "seq -s '|' -w 1 10",
-                result: Some(vec![Value::from("01|02|03|04|05|06|07|08|09|10")]),
-            },
-            Example {
-                description: "sequence 1 to 10 with pipe separator padded by 2s",
-                example: "seq -s ' | ' -w 1 2 10",
-                result: Some(vec![Value::from("01 | 03 | 05 | 07 | 09")]),
-            },
-        ]
-    }
-}
-
-fn seq(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let rest_nums: Vec<Tagged<f64>> = args.rest(0)?;
-    let separator: Option<Tagged<String>> = args.get_flag("separator")?;
-    let terminator: Option<Tagged<String>> = args.get_flag("terminator")?;
-    let widths = args.has_flag("widths");
-
-    if rest_nums.is_empty() {
-        return Err(ShellError::labeled_error(
-            "seq requires some parameters",
-            "needs parameter",
-            name,
-        ));
-    }
-
-    let sep: String = match separator {
-        Some(s) => {
-            if s.item == r"\t" {
-                '\t'.to_string()
-            } else if s.item == r"\n" {
-                '\n'.to_string()
-            } else if s.item == r"\r" {
-                '\r'.to_string()
-            } else {
-                let vec_s: Vec<char> = s.chars().collect();
-                if vec_s.is_empty() {
-                    return Err(ShellError::labeled_error(
-                        "Expected a single separator char from --separator",
-                        "requires a single character string input",
-                        &s.tag,
-                    ));
-                };
-                vec_s.iter().collect()
-            }
-        }
-        _ => '\n'.to_string(),
-    };
-
-    let term: String = match terminator {
-        Some(t) => {
-            if t.item == r"\t" {
-                '\t'.to_string()
-            } else if t.item == r"\n" {
-                '\n'.to_string()
-            } else if t.item == r"\r" {
-                '\r'.to_string()
-            } else {
-                let vec_t: Vec<char> = t.chars().collect();
-                if vec_t.is_empty() {
-                    return Err(ShellError::labeled_error(
-                        "Expected a single terminator char from --terminator",
-                        "requires a single character string input",
-                        &t.tag,
-                    ));
-                };
-                vec_t.iter().collect()
-            }
-        }
-        _ => '\n'.to_string(),
-    };
-
-    let rest_nums: Vec<String> = rest_nums.iter().map(|n| n.item.to_string()).collect();
-
-    run_seq(sep, Some(term), widths, rest_nums)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Seq;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Seq {})
-    }
-}
-
-fn parse_float(mut s: &str) -> Result<f64, String> {
-    if s.starts_with('+') {
-        s = &s[1..];
-    }
-    match s.parse() {
-        Ok(n) => Ok(n),
-        Err(e) => Err(format!(
-            "seq: invalid floating point argument `{}`: {}",
-            s, e
-        )),
-    }
-}
-
-fn escape_sequences(s: &str) -> String {
-    s.replace("\\n", "\n").replace("\\t", "\t")
-}
-
-pub fn run_seq(
-    sep: String,
-    termy: Option<String>,
-    widths: bool,
-    free: Vec<String>,
-) -> Result<OutputStream, ShellError> {
-    let mut largest_dec = 0;
-    let mut padding = 0;
-    let first = if free.len() > 1 {
-        let slice = &free[0][..];
-        let len = slice.len();
-        let dec = slice.find('.').unwrap_or(len);
-        largest_dec = len - dec;
-        padding = dec;
-        match parse_float(slice) {
-            Ok(n) => n,
-            Err(s) => {
-                return Err(ShellError::labeled_error(
-                    s,
-                    "error parsing float",
-                    Tag::unknown(),
-                ));
-            }
-        }
-    } else {
-        1.0
-    };
-    let step = if free.len() > 2 {
-        let slice = &free[1][..];
-        let len = slice.len();
-        let dec = slice.find('.').unwrap_or(len);
-        largest_dec = cmp::max(largest_dec, len - dec);
-        padding = cmp::max(padding, dec);
-        match parse_float(slice) {
-            Ok(n) => n,
-            Err(s) => {
-                return Err(ShellError::labeled_error(
-                    s,
-                    "error parsing float",
-                    Tag::unknown(),
-                ));
-            }
-        }
-    } else {
-        1.0
-    };
-    let last = {
-        let slice = &free[free.len() - 1][..];
-        padding = cmp::max(padding, slice.find('.').unwrap_or_else(|| slice.len()));
-        match parse_float(slice) {
-            Ok(n) => n,
-            Err(s) => {
-                return Err(ShellError::labeled_error(
-                    s,
-                    "error parsing float",
-                    Tag::unknown(),
-                ));
-            }
-        }
-    };
-    if largest_dec > 0 {
-        largest_dec -= 1;
-    }
-    let separator = escape_sequences(&sep[..]);
-    let terminator = match termy {
-        Some(term) => escape_sequences(&term[..]),
-        None => separator.clone(),
-    };
-    Ok(print_seq(
-        first,
-        step,
-        last,
-        largest_dec,
-        separator,
-        terminator,
-        widths,
-        padding,
-    ))
-}
-
-fn done_printing(next: f64, step: f64, last: f64) -> bool {
-    if step >= 0f64 {
-        next > last
-    } else {
-        next < last
-    }
-}
-
-#[allow(clippy::too_many_arguments)]
-fn print_seq(
-    first: f64,
-    step: f64,
-    last: f64,
-    largest_dec: usize,
-    separator: String,
-    terminator: String,
-    pad: bool,
-    padding: usize,
-) -> OutputStream {
-    let mut i = 0isize;
-    let mut value = first + i as f64 * step;
-    // for string output
-    let mut ret_str = "".to_owned();
-    // for number output
-    let mut ret_num = vec![];
-    // If the separator and terminator are line endings we can convert to numbers
-    let use_num =
-        (separator == "\n" || separator == "\r") && (terminator == "\n" || terminator == "\r");
-
-    while !done_printing(value, step, last) {
-        if use_num {
-            ret_num.push(value);
-        } else {
-            // formatting for string output with potential padding
-            let istr = format!("{:.*}", largest_dec, value);
-            let ilen = istr.len();
-            let before_dec = istr.find('.').unwrap_or(ilen);
-            if pad && before_dec < padding {
-                for _ in 0..(padding - before_dec) {
-                    ret_str.push('0');
-                }
-            }
-            ret_str.push_str(&istr);
-        }
-        i += 1;
-        value = first + i as f64 * step;
-        if !done_printing(value, step, last) {
-            ret_str.push_str(&separator);
-        }
-    }
-
-    if !use_num && ((first >= last && step < 0f64) || (first <= last && step > 0f64)) {
-        ret_str.push_str(&terminator);
-    }
-
-    if use_num {
-        // we'd like to keep the datatype the same for the output, so check
-        // and see if any of the output is really decimals, and if it is
-        // we'll make the entire output decimals
-        let contains_decimals = vec_contains_decimals(&ret_num);
-        let rows: Vec<Value> = ret_num
-            .iter()
-            .map(|v| {
-                if contains_decimals {
-                    v.to_value_create_tag()
-                } else {
-                    let vi64 = *v as i64;
-                    vi64.to_value_create_tag()
-                }
-            })
-            .collect();
-        (rows.into_iter()).into_output_stream()
-    } else {
-        let rows: Vec<Value> = ret_str
-            .lines()
-            .map(|v| v.to_str_value_create_tag())
-            .collect();
-        (rows.into_iter()).into_output_stream()
-    }
-}
-
-fn vec_contains_decimals(array: &[f64]) -> bool {
-    let mut found_decimal = false;
-    for x in array {
-        if x.fract() != 0.0 {
-            found_decimal = true;
-            break;
-        }
-    }
-
-    found_decimal
-}
diff --git a/old_nushell/crates/nu-command/src/commands/generators/seq_dates.rs b/old_nushell/crates/nu-command/src/commands/generators/seq_dates.rs
deleted file mode 100644
index 184aae7c9..000000000
--- a/old_nushell/crates/nu-command/src/commands/generators/seq_dates.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use crate::prelude::*;
-use chrono::naive::NaiveDate;
-use chrono::{Duration, Local};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{value::I64Ext, value::StrExt, value::StringExt};
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SeqDates;
-
-impl WholeStreamCommand for SeqDates {
-    fn name(&self) -> &str {
-        "seq date"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("seq date")
-            .named(
-                "separator",
-                SyntaxShape::String,
-                "separator character (defaults to \\n)",
-                Some('s'),
-            )
-            .named(
-                "output-format",
-                SyntaxShape::String,
-                "prints dates in this format (defaults to %Y-%m-%d)",
-                Some('o'),
-            )
-            .named(
-                "input-format",
-                SyntaxShape::String,
-                "give argument dates in this format (defaults to %Y-%m-%d)",
-                Some('i'),
-            )
-            .named(
-                "begin-date",
-                SyntaxShape::String,
-                "beginning date range",
-                Some('b'),
-            )
-            .named("end-date", SyntaxShape::String, "ending date", Some('e'))
-            .named(
-                "increment",
-                SyntaxShape::Int,
-                "increment dates by this number",
-                Some('n'),
-            )
-            .named(
-                "days",
-                SyntaxShape::Int,
-                "number of days to print",
-                Some('d'),
-            )
-            .switch("reverse", "print dates in reverse", Some('r'))
-    }
-
-    fn usage(&self) -> &str {
-        "print sequences of dates"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        seq_dates(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "print the next 10 days in YYYY-MM-DD format with newline separator",
-                example: "seq date --days 10",
-                result: None,
-            },
-            Example {
-                description: "print the previous 10 days in YYYY-MM-DD format with newline separator",
-                example: "seq date --days 10 -r",
-                result: None,
-            },
-            Example {
-                description: "print the previous 10 days starting today in MM/DD/YYYY format with newline separator",
-                example: "seq date --days 10 -o '%m/%d/%Y' -r",
-                result: None,
-            },
-            Example {
-                description: "print the first 10 days in January, 2020",
-                example: "seq date -b '2020-01-01' -e '2020-01-10'",
-                result: Some(vec![
-                    UntaggedValue::string("2020-01-01").into(),
-                    UntaggedValue::string("2020-01-02").into(),
-                    UntaggedValue::string("2020-01-03").into(),
-                    UntaggedValue::string("2020-01-04").into(),
-                    UntaggedValue::string("2020-01-05").into(),
-                    UntaggedValue::string("2020-01-06").into(),
-                    UntaggedValue::string("2020-01-07").into(),
-                    UntaggedValue::string("2020-01-08").into(),
-                    UntaggedValue::string("2020-01-09").into(),
-                    UntaggedValue::string("2020-01-10").into(),
-                ]),
-            },
-            Example {
-                description: "print every fifth day between January 1st 2020 and January 31st 2020",
-                example: "seq date -b '2020-01-01' -e '2020-01-31' -n 5",
-                result: Some(vec![
-                    UntaggedValue::string("2020-01-01").into(),
-                    UntaggedValue::string("2020-01-06").into(),
-                    UntaggedValue::string("2020-01-11").into(),
-                    UntaggedValue::string("2020-01-16").into(),
-                    UntaggedValue::string("2020-01-21").into(),
-                    UntaggedValue::string("2020-01-26").into(),
-                    UntaggedValue::string("2020-01-31").into(),
-                ]),
-            },
-            Example {
-                description: "starting on May 5th, 2020, print the next 10 days in your locale's date format, colon separated",
-                example: "seq date -o %x -s ':' -d 10 -b '2020-05-01'",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn seq_dates(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let _name = args.call_info.name_tag.clone();
-
-    let separator: Option<Tagged<String>> = args.get_flag("separator")?;
-    let output_format: Option<Tagged<String>> = args.get_flag("output-format")?;
-    let input_format: Option<Tagged<String>> = args.get_flag("input-format")?;
-    let begin_date: Option<Tagged<String>> = args.get_flag("begin-date")?;
-    let end_date: Option<Tagged<String>> = args.get_flag("end-date")?;
-    let increment: Option<Tagged<i64>> = args.get_flag("increment")?;
-    let days: Option<Tagged<i64>> = args.get_flag("days")?;
-    let reverse = args.has_flag("reverse");
-
-    let sep: String = match separator {
-        Some(s) => {
-            if s.item == r"\t" {
-                '\t'.to_string()
-            } else if s.item == r"\n" {
-                '\n'.to_string()
-            } else if s.item == r"\r" {
-                '\r'.to_string()
-            } else {
-                let vec_s: Vec<char> = s.chars().collect();
-                if vec_s.is_empty() {
-                    return Err(ShellError::labeled_error(
-                        "Expected a single separator char from --separator",
-                        "requires a single character string input",
-                        &s.tag,
-                    ));
-                };
-                vec_s.iter().collect()
-            }
-        }
-        _ => '\n'.to_string(),
-    };
-
-    let outformat = match output_format {
-        Some(s) => Some(s.item.to_string_value(s.tag)),
-        _ => None,
-    };
-
-    let informat = match input_format {
-        Some(s) => Some(s.item.to_string_value(s.tag)),
-        _ => None,
-    };
-
-    let begin = match begin_date {
-        Some(s) => Some(s.item),
-        _ => None,
-    };
-
-    let end = match end_date {
-        Some(s) => Some(s.item),
-        _ => None,
-    };
-
-    let inc = match increment {
-        Some(i) => {
-            let clone = i.clone();
-            i.to_value(clone.tag)
-        }
-        _ => (1_i64).to_value_create_tag(),
-    };
-
-    let day_count: Option<Value> = match days {
-        Some(i) => Some(i.item.to_value(i.tag)),
-        _ => None,
-    };
-
-    let mut rev = false;
-    if reverse {
-        rev = reverse;
-    }
-
-    run_seq_dates(sep, outformat, informat, begin, end, inc, day_count, rev)
-}
-
-pub fn parse_date_string(s: &str, format: &str) -> Result<NaiveDate, &'static str> {
-    let d = match NaiveDate::parse_from_str(s, format) {
-        Ok(d) => d,
-        Err(_) => return Err("Failed to parse date."),
-    };
-    Ok(d)
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn run_seq_dates(
-    separator: String,
-    output_format: Option<Value>,
-    input_format: Option<Value>,
-    beginning_date: Option<String>,
-    ending_date: Option<String>,
-    increment: Value,
-    day_count: Option<Value>,
-    reverse: bool,
-) -> Result<ActionStream, ShellError> {
-    let today = Local::today().naive_local();
-    let mut step_size: i64 = increment
-        .as_i64()
-        .expect("unable to change increment to i64");
-
-    if step_size == 0 {
-        return Err(ShellError::labeled_error(
-            "increment cannot be 0",
-            "increment cannot be 0",
-            increment.tag,
-        ));
-    }
-
-    let in_format = match input_format {
-        Some(i) => i.as_string().map_err(|e| {
-            ShellError::labeled_error(
-                e.to_string(),
-                "error with input_format as_string",
-                i.tag.span,
-            )
-        })?,
-        None => "%Y-%m-%d".to_string(),
-    };
-
-    let out_format = match output_format {
-        Some(o) => o.as_string().map_err(|e| {
-            ShellError::labeled_error(
-                e.to_string(),
-                "error with output_format as_string",
-                o.tag.span,
-            )
-        })?,
-        None => "%Y-%m-%d".to_string(),
-    };
-
-    let start_date = match beginning_date {
-        Some(d) => match parse_date_string(&d, &in_format) {
-            Ok(nd) => nd,
-            Err(e) => {
-                return Err(ShellError::labeled_error(
-                    e,
-                    "Failed to parse date",
-                    Tag::unknown(),
-                ))
-            }
-        },
-        _ => today,
-    };
-
-    let mut end_date = match ending_date {
-        Some(d) => match parse_date_string(&d, &in_format) {
-            Ok(nd) => nd,
-            Err(e) => {
-                return Err(ShellError::labeled_error(
-                    e,
-                    "Failed to parse date",
-                    Tag::unknown(),
-                ))
-            }
-        },
-        _ => today,
-    };
-
-    let mut days_to_output = match day_count {
-        Some(d) => d.as_i64()?,
-        None => 0i64,
-    };
-
-    // Make the signs opposite if we're created dates in reverse direction
-    if reverse {
-        step_size *= -1;
-        days_to_output *= -1;
-    }
-
-    if days_to_output != 0 {
-        end_date = match start_date.checked_add_signed(Duration::days(days_to_output)) {
-            Some(date) => date,
-            None => {
-                return Err(ShellError::labeled_error(
-                    "integer value too large",
-                    "integer value too large",
-                    Tag::unknown(),
-                ));
-            }
-        }
-    }
-
-    // conceptually counting down with a positive step or counting up with a negative step
-    // makes no sense, attempt to do what one means by inverting the signs in those cases.
-    if (start_date > end_date) && (step_size > 0) || (start_date < end_date) && step_size < 0 {
-        step_size = -step_size;
-    }
-
-    let is_out_of_range =
-        |next| (step_size > 0 && next > end_date) || (step_size < 0 && next < end_date);
-
-    let mut next = start_date;
-    if is_out_of_range(next) {
-        return Err(ShellError::labeled_error(
-            "date is out of range",
-            "date is out of range",
-            Tag::unknown(),
-        ));
-    }
-
-    let mut ret_str = String::from("");
-    loop {
-        ret_str.push_str(&next.format(&out_format).to_string());
-        // TODO: check this value is good
-        next += Duration::days(step_size);
-
-        if is_out_of_range(next) {
-            break;
-        }
-
-        ret_str.push_str(&separator);
-    }
-
-    let rows: Vec<Value> = ret_str
-        .lines()
-        .map(|v| v.to_str_value_create_tag())
-        .collect();
-    Ok((rows.into_iter().map(ReturnSuccess::value)).into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::SeqDates;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SeqDates {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/abs.rs b/old_nushell/crates/nu-command/src/commands/math/abs.rs
deleted file mode 100644
index e257bca1f..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/abs.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math abs"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math abs")
-    }
-
-    fn usage(&self) -> &str {
-        "Returns absolute values of a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let mapped = args.input.map(move |val| match val.value {
-            UntaggedValue::Primitive(Primitive::Int(val)) => UntaggedValue::int(val.abs()).into(),
-            UntaggedValue::Primitive(Primitive::BigInt(val)) => {
-                UntaggedValue::big_int(val.magnitude().clone()).into()
-            }
-            UntaggedValue::Primitive(Primitive::Decimal(val)) => {
-                UntaggedValue::decimal(val.abs()).into()
-            }
-            UntaggedValue::Primitive(Primitive::Duration(val)) => {
-                UntaggedValue::duration(val).into()
-            }
-            other => abs_default(other),
-        });
-        Ok(mapped.into_output_stream())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get absolute of each value in a list of numbers",
-            example: "echo [-50 -100.0 25] | math abs",
-            result: Some(vec![
-                UntaggedValue::int(50).into(),
-                UntaggedValue::decimal_from_float(100.0, Span::default()).into(),
-                UntaggedValue::int(25).into(),
-            ]),
-        }]
-    }
-}
-
-fn abs_default(_: UntaggedValue) -> Value {
-    UntaggedValue::Error(ShellError::unexpected(
-        "Only numerical values are supported",
-    ))
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/avg.rs b/old_nushell/crates/nu-command/src/commands/math/avg.rs
deleted file mode 100644
index 5a93219ae..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/avg.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use crate::prelude::*;
-
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use nu_engine::WholeStreamCommand;
-
-use nu_errors::ShellError;
-use nu_protocol::{hir::Operator, Primitive, Signature, UntaggedValue, Value};
-
-use bigdecimal::FromPrimitive;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math avg"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math avg")
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the average of a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, average)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the average of a list of numbers",
-            example: "echo [-50 100.0 25] | math avg",
-            result: Some(vec![UntaggedValue::decimal_from_float(
-                25.0,
-                Span::unknown(),
-            )
-            .into()]),
-        }]
-    }
-}
-
-fn to_byte(value: &Value) -> Option<Value> {
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Int(num)) => {
-            Some(UntaggedValue::Primitive(Primitive::Filesize(*num as u64)).into_untagged_value())
-        }
-        _ => None,
-    }
-}
-
-pub fn average(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let sum = reducer_for(Reduce::Summation);
-
-    let number = BigDecimal::from_usize(values.len()).ok_or_else(|| {
-        ShellError::labeled_error("nothing to average", "nothing to average", &name.span)
-    })?;
-
-    let total_rows = UntaggedValue::decimal(number);
-
-    let are_bytes = values
-        .get(0)
-        .ok_or_else(|| {
-            ShellError::unexpected("Cannot perform aggregate math operation on empty data")
-        })?
-        .is_filesize();
-
-    let total = if are_bytes {
-        to_byte(&sum(
-            UntaggedValue::int(0).into_untagged_value(),
-            values
-                .to_vec()
-                .iter()
-                .map(|v| match v {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-                        ..
-                    } => UntaggedValue::int(*num as i64).into_untagged_value(),
-                    other => other.clone(),
-                })
-                .collect::<Vec<_>>(),
-        )?)
-        .ok_or_else(|| {
-            ShellError::labeled_error(
-                "could not convert to big decimal",
-                "could not convert to big decimal",
-                &name.span,
-            )
-        })
-    } else {
-        sum(UntaggedValue::int(0).into_untagged_value(), values.to_vec())
-    }?;
-
-    match total {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-            ..
-        } => {
-            let left = UntaggedValue::from(Primitive::Int(num as i64));
-            let result = nu_data::value::compute_values(Operator::Divide, &left, &total_rows);
-
-            match result {
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result))) => match result.to_u64() {
-                    Some(number) => Ok(UntaggedValue::filesize(number).into_value(name)),
-                    None => Err(ShellError::labeled_error(
-                        "could not calculate average of non-integer or unrelated types",
-                        "source",
-                        name,
-                    )),
-                },
-                Ok(_) => Err(ShellError::labeled_error(
-                    "could not calculate average of non-integer or unrelated types",
-                    "source",
-                    name,
-                )),
-                Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                )),
-            }
-        }
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Duration(duration)),
-            ..
-        } => {
-            let left = UntaggedValue::from(Primitive::Duration(duration));
-            let result = nu_data::value::compute_values(Operator::Divide, &left, &total_rows);
-
-            match result {
-                Ok(UntaggedValue::Primitive(Primitive::Duration(result))) => {
-                    Ok(UntaggedValue::duration(result).into_value(name))
-                }
-                Ok(_) => Err(ShellError::labeled_error(
-                    "could not calculate average of non-integer or unrelated types",
-                    "source",
-                    name,
-                )),
-                Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                )),
-            }
-        }
-        Value {
-            value: UntaggedValue::Primitive(other),
-            ..
-        } => {
-            let left = UntaggedValue::from(other);
-            let result = nu_data::value::compute_values(Operator::Divide, &left, &total_rows);
-
-            match result {
-                Ok(value) => Ok(value.into_value(name)),
-                Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                )),
-            }
-        }
-        _ => Err(ShellError::labeled_error(
-            "could not calculate average of non-integer or unrelated types",
-            "source",
-            name,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/ceil.rs b/old_nushell/crates/nu-command/src/commands/math/ceil.rs
deleted file mode 100644
index fe54c4434..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/ceil.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::commands::math::utils::run_with_numerical_functions_on_stream;
-use crate::prelude::*;
-use bigdecimal::One;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math ceil"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math ceil")
-    }
-
-    fn usage(&self) -> &str {
-        "Applies the ceil function to a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let input = args.input;
-
-        run_with_numerical_functions_on_stream(
-            input,
-            ceil_int,
-            ceil_big_int,
-            ceil_big_decimal,
-            ceil_default,
-        )
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Apply the ceil function to a list of numbers",
-            example: "echo [1.5 2.3 -3.1] | math ceil",
-            result: Some(vec![
-                UntaggedValue::int(2).into(),
-                UntaggedValue::int(3).into(),
-                UntaggedValue::int(-3).into(),
-            ]),
-        }]
-    }
-}
-
-fn ceil_int(val: i64) -> Value {
-    UntaggedValue::int(val).into()
-}
-
-fn ceil_big_int(val: BigInt) -> Value {
-    UntaggedValue::big_int(val).into()
-}
-
-fn ceil_big_decimal(val: BigDecimal) -> Value {
-    let mut maybe_ceiled = val.round(0);
-    if maybe_ceiled < val {
-        maybe_ceiled += BigDecimal::one();
-    }
-    let ceiling = maybe_ceiled.to_i64();
-
-    match ceiling {
-        Some(x) => UntaggedValue::int(x).into(),
-        None => UntaggedValue::Error(ShellError::untagged_runtime_error(
-            "Value too big to ceiling to an 64-bit integer",
-        ))
-        .into(),
-    }
-}
-
-fn ceil_default(_: UntaggedValue) -> Value {
-    UntaggedValue::Error(ShellError::unexpected(
-        "Only numerical values are supported",
-    ))
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/command.rs b/old_nushell/crates/nu-command/src/commands/math/command.rs
deleted file mode 100644
index 84604745f..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/command.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "math"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math")
-    }
-
-    fn usage(&self) -> &str {
-        "Use mathematical functions as aggregate functions on a list of numbers or tables."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::commands::math::{
-        avg::average, max::maximum, median::median, min::minimum, mode::mode, stddev::stddev,
-        sum::summation, utils::calculate, utils::MathFunction, variance::variance,
-    };
-    use nu_protocol::{row, Value};
-    use nu_test_support::value::{decimal, decimal_from_float, int, table};
-    use std::str::FromStr;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-
-    #[test]
-    fn test_math_functions() {
-        struct TestCase {
-            description: &'static str,
-            values: Vec<Value>,
-            expected_err: Option<ShellError>,
-            // Order is: average, minimum, maximum, median, summation
-            expected_res: Vec<Result<Value, ShellError>>,
-        }
-        let tt: Vec<TestCase> = vec![
-            TestCase {
-                description: "Empty data should throw an error",
-                values: Vec::new(),
-                expected_err: Some(ShellError::unexpected("Expected data")),
-                expected_res: Vec::new(),
-            },
-            TestCase {
-                description: "Single value",
-                values: vec![int(10)],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(decimal_from_float(10.0)),
-                    Ok(int(10)),
-                    Ok(int(10)),
-                    Ok(int(10)),
-                    Ok(table(&[int(10)])),
-                    Ok(decimal_from_float(0.0)),
-                    Ok(int(10)),
-                    Ok(decimal_from_float(0.0)),
-                ],
-            },
-            TestCase {
-                description: "Multiple Values",
-                values: vec![int(10), int(20), int(30)],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(decimal_from_float(20.0)),
-                    Ok(int(10)),
-                    Ok(int(30)),
-                    Ok(int(20)),
-                    Ok(table(&[int(10), int(20), int(30)])),
-                    Ok(decimal(BigDecimal::from_str("8.164965809277260327324280249019637973219824935522233761442308557503201258191050088466198110348800783").expect("Could not convert to decimal from string"))),
-                    Ok(int(60)),
-                    Ok(decimal(BigDecimal::from_str("66.66666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666667").expect("Could not convert to decimal from string"))),
-                ],
-            },
-            TestCase {
-                description: "Mixed Values",
-                values: vec![int(10), decimal_from_float(26.5), decimal_from_float(26.5)],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(decimal_from_float(21.0)),
-                    Ok(int(10)),
-                    Ok(decimal_from_float(26.5)),
-                    Ok(decimal_from_float(26.5)),
-                    Ok(table(&[decimal_from_float(26.5)])),
-                    Ok(decimal(BigDecimal::from_str("7.77817459305202276840928798315333943213319531457321440247173855894902863154158871367713143880202865").expect("Could not convert to decimal from string"))),
-                    Ok(decimal_from_float(63.0)),
-                    Ok(decimal_from_float(60.5)),
-                ],
-            },
-            TestCase {
-                description: "Negative Values",
-                values: vec![int(-14), int(-11), int(10)],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(decimal_from_float(-5.0)),
-                    Ok(int(-14)),
-                    Ok(int(10)),
-                    Ok(int(-11)),
-                    Ok(table(&[int(-14), int(-11), int(10)])),
-                    Ok(decimal(BigDecimal::from_str("10.67707825203131121081152396559571062628228776946058011397810604284900898365140801704064843595778374").expect("Could not convert to decimal from string"))),
-                    Ok(int(-15)),
-                    Ok(decimal_from_float(114.0)),
-                ],
-            },
-            TestCase {
-                description: "Mixed Negative Values",
-                values: vec![decimal_from_float(-13.5), decimal_from_float(-11.5), int(10)],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(decimal_from_float(-5.0)),
-                    Ok(decimal_from_float(-13.5)),
-                    Ok(int(10)),
-                    Ok(decimal_from_float(-11.5)),
-                    Ok(table(&[decimal_from_float(-13.5), decimal_from_float(-11.5), int(10)])),
-                    Ok(decimal(BigDecimal::from_str("10.63798226482196513098036125801342585449179971588207816421068645273754903468375890632981926875247027").expect("Could not convert to decimal from string"))),
-                    Ok(decimal_from_float(-15.0)),
-                    Ok(decimal(BigDecimal::from_str("113.1666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666667").expect("Could not convert to decimal from string"))),
-                ],
-            },
-            TestCase {
-                description: "Tables Or Rows",
-                values: vec![
-                    row!["col1".to_owned() => int(1), "col2".to_owned() => int(5)],
-                    row!["col1".to_owned() => int(2), "col2".to_owned() => int(6)],
-                    row!["col1".to_owned() => int(3), "col2".to_owned() => int(7)],
-                    row!["col1".to_owned() => int(4), "col2".to_owned() => int(8)],
-                ],
-                expected_err: None,
-                expected_res: vec![
-                    Ok(row!["col1".to_owned() => decimal_from_float(2.5), "col2".to_owned() => decimal_from_float(6.5)]),
-                    Ok(row!["col1".to_owned() => int(1), "col2".to_owned() => int(5)]),
-                    Ok(row!["col1".to_owned() => int(4), "col2".to_owned() => int(8)]),
-                    Ok(row!["col1".to_owned() => decimal_from_float(2.5), "col2".to_owned() => decimal_from_float(6.5)]),
-                    Ok(row![
-                        "col1".to_owned() => table(&[int(1), int(2), int(3), int(4)]),
-                        "col2".to_owned() => table(&[int(5), int(6), int(7), int(8)])
-                        ]),
-                    Ok(row![
-                        "col1".to_owned() => decimal(BigDecimal::from_str("1.118033988749894848204586834365638117720309179805762862135448622705260462818902449707207204189391137").expect("Could not convert to decimal from string")),
-                        "col2".to_owned() => decimal(BigDecimal::from_str("1.118033988749894848204586834365638117720309179805762862135448622705260462818902449707207204189391137").expect("Could not convert to decimal from string"))
-                    ]),
-                    Ok(row!["col1".to_owned() => int(10), "col2".to_owned() => int(26)]),
-                    Ok(row!["col1".to_owned() => decimal_from_float(1.25), "col2".to_owned() => decimal_from_float(1.25)]),
-                ],
-            },
-            // TODO-Uncomment once Issue: https://github.com/nushell/nushell/issues/1883 is resolved
-            // TestCase {
-            //     description: "Invalid Mixed Values",
-            //     values: vec![int(10), decimal(26.5), decimal(26.5), string("math")],
-            //     expected_err: Some(ShellError::unimplemented("something")),
-            //     expected_res: vec![],
-            // },
-        ];
-        let test_tag = Tag::unknown();
-        for tc in &tt {
-            let tc: &TestCase = tc; // Just for type annotations
-            let math_functions: Vec<MathFunction> = vec![
-                average, minimum, maximum, median, mode, stddev, summation, variance,
-            ];
-            let results = math_functions
-                .into_iter()
-                .map(|mf| calculate(&tc.values, &test_tag, mf))
-                .collect_vec();
-
-            if tc.expected_err.is_some() {
-                assert!(
-                    results.iter().all(|r| r.is_err()),
-                    "Expected all functions to error for test-case: {}",
-                    tc.description,
-                );
-            } else {
-                for (i, res) in results.into_iter().enumerate() {
-                    assert_eq!(
-                        res, tc.expected_res[i],
-                        "math function {} failed on test-case {}",
-                        i, tc.description
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/eval.rs b/old_nushell/crates/nu-command/src/commands/math/eval.rs
deleted file mode 100644
index 679358fa1..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/eval.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math eval"
-    }
-
-    fn usage(&self) -> &str {
-        "Evaluate a math expression into a number"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math eval").desc(self.usage()).optional(
-            "math expression",
-            SyntaxShape::String,
-            "the math expression to evaluate",
-        )
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        eval(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Evalulate math in the pipeline",
-            example: "echo '10 / 4' | math eval",
-            result: Some(vec![UntaggedValue::decimal_from_float(
-                2.5,
-                Span::unknown(),
-            )
-            .into()]),
-        }]
-    }
-}
-
-pub fn eval(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let expression: Option<Tagged<String>> = args.opt(0)?;
-    let name = args.call_info.name_tag.clone();
-    let input = args.input;
-
-    if let Some(string) = expression {
-        match parse(&string, &string.tag) {
-            Ok(value) => Ok(OutputStream::one(value)),
-            Err(err) => Err(ShellError::labeled_error(
-                "Math evaluation error",
-                err,
-                &string.tag.span,
-            )),
-        }
-    } else {
-        let mapped: Result<Vec<_>, _> = input
-            .map(move |x| {
-                if let Some(Tagged {
-                    tag,
-                    item: expression,
-                }) = &expression
-                {
-                    UntaggedValue::string(expression).into_value(tag)
-                } else {
-                    x
-                }
-            })
-            .map(move |input| {
-                if let Ok(string) = input.as_string() {
-                    match parse(&string, &input.tag) {
-                        Ok(value) => Ok(value),
-                        Err(err) => Err(ShellError::labeled_error(
-                            "Math evaluation error",
-                            err,
-                            &input.tag.span,
-                        )),
-                    }
-                } else {
-                    Err(ShellError::labeled_error(
-                        "Expected a string from pipeline",
-                        "requires string input",
-                        name.clone(),
-                    ))
-                }
-            })
-            .collect();
-        match mapped {
-            Ok(values) => Ok(OutputStream::from(values)),
-            Err(e) => Err(e),
-        }
-    }
-}
-
-pub fn parse<T: Into<Tag>>(math_expression: &str, tag: T) -> Result<Value, String> {
-    let mut ctx = meval::Context::new();
-    ctx.var("tau", std::f64::consts::TAU);
-    match meval::eval_str_with_context(math_expression, &ctx) {
-        Ok(num) if num.is_infinite() || num.is_nan() => Err("cannot represent result".to_string()),
-        Ok(num) => Ok(UntaggedValue::from(Primitive::from(num)).into_value(tag)),
-        Err(error) => Err(error.to_string().to_lowercase()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/floor.rs b/old_nushell/crates/nu-command/src/commands/math/floor.rs
deleted file mode 100644
index 3ec9ebf21..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/floor.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::commands::math::utils::run_with_numerical_functions_on_stream;
-use crate::prelude::*;
-use bigdecimal::One;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math floor"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math floor")
-    }
-
-    fn usage(&self) -> &str {
-        "Applies the floor function to a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let input = args.input;
-
-        run_with_numerical_functions_on_stream(
-            input,
-            floor_int,
-            floor_big_int,
-            floor_big_decimal,
-            floor_default,
-        )
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Apply the floor function to a list of numbers",
-            example: "echo [1.5 2.3 -3.1] | math floor",
-            result: Some(vec![
-                UntaggedValue::big_int(1).into(),
-                UntaggedValue::big_int(2).into(),
-                UntaggedValue::big_int(-4).into(),
-            ]),
-        }]
-    }
-}
-
-fn floor_int(val: i64) -> Value {
-    UntaggedValue::int(val).into()
-}
-
-fn floor_big_int(val: BigInt) -> Value {
-    UntaggedValue::big_int(val).into()
-}
-
-fn floor_big_decimal(val: BigDecimal) -> Value {
-    let mut maybe_floored = val.round(0);
-    if maybe_floored > val {
-        maybe_floored -= BigDecimal::one();
-    }
-    let (floored, _) = maybe_floored.into_bigint_and_exponent();
-    UntaggedValue::big_int(floored).into()
-}
-
-fn floor_default(_: UntaggedValue) -> Value {
-    UntaggedValue::Error(ShellError::unexpected(
-        "Only numerical values are supported",
-    ))
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/max.rs b/old_nushell/crates/nu-command/src/commands/math/max.rs
deleted file mode 100644
index 0facfafcc..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/max.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math max"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math max")
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the maximum within a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, maximum)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Find the maximum of list of numbers",
-            example: "echo [-50 100 25] | math max",
-            result: Some(vec![UntaggedValue::int(100).into()]),
-        }]
-    }
-}
-
-pub fn maximum(values: &[Value], _name: &Tag) -> Result<Value, ShellError> {
-    let max_func = reducer_for(Reduce::Maximum);
-    max_func(Value::nothing(), values.to_vec())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/median.rs b/old_nushell/crates/nu-command/src/commands/math/median.rs
deleted file mode 100644
index 9cc735a7d..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/median.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use bigdecimal::FromPrimitive;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{hir::Operator, Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math median"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math median")
-    }
-
-    fn usage(&self) -> &str {
-        "Gets the median of a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, median)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the median of a list of numbers",
-            example: "echo [3 8 9 12 12 15] | math median",
-            result: Some(vec![UntaggedValue::decimal_from_float(
-                10.5,
-                Span::unknown(),
-            )
-            .into()]),
-        }]
-    }
-}
-
-enum Pick {
-    MedianAverage,
-    Median,
-}
-
-pub fn median(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let take = if values.len() % 2 == 0 {
-        Pick::MedianAverage
-    } else {
-        Pick::Median
-    };
-
-    let mut sorted = vec![];
-
-    for item in values {
-        sorted.push(item.clone());
-    }
-
-    crate::commands::filters::sort_by::sort(&mut sorted, &[], name, false)?;
-
-    match take {
-        Pick::Median => {
-            let idx = (values.len() as f64 / 2.0).floor() as usize;
-            let out = sorted.get(idx).ok_or_else(|| {
-                ShellError::labeled_error(
-                    "could not extract value",
-                    "could not extract value",
-                    &name.span,
-                )
-            })?;
-            Ok(out.clone())
-        }
-        Pick::MedianAverage => {
-            let idx_end = (values.len() / 2) as usize;
-            let idx_start = idx_end - 1;
-
-            let left = sorted
-                .get(idx_start)
-                .ok_or_else(|| {
-                    ShellError::labeled_error(
-                        "could not extract value",
-                        "could not extract value",
-                        &name.span,
-                    )
-                })?
-                .clone();
-
-            let right = sorted
-                .get(idx_end)
-                .ok_or_else(|| {
-                    ShellError::labeled_error(
-                        "could not extract value",
-                        "could not extract value",
-                        &name.span,
-                    )
-                })?
-                .clone();
-
-            compute_average(&[left, right], name)
-        }
-    }
-}
-
-fn compute_average(values: &[Value], name: impl Into<Tag>) -> Result<Value, ShellError> {
-    let name = name.into();
-
-    let sum = reducer_for(Reduce::Summation);
-    let number = BigDecimal::from_usize(2).ok_or_else(|| {
-        ShellError::labeled_error(
-            "could not convert to big decimal",
-            "could not convert to big decimal",
-            &name,
-        )
-    })?;
-
-    let total_rows = UntaggedValue::decimal(number);
-    let total = sum(Value::nothing(), values.to_vec())?;
-
-    match total {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-            ..
-        } => {
-            let left = UntaggedValue::from(Primitive::Int(num as i64));
-            let result = nu_data::value::compute_values(Operator::Divide, &left, &total_rows);
-
-            match result {
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result))) => {
-                    let (bi, _) = result.as_bigint_and_exponent();
-                    let number = bi.to_u64();
-                    match number {
-                        Some(number) => Ok(UntaggedValue::filesize(number).into_value(name)),
-                        None => Err(ShellError::labeled_error(
-                            "Can't convert to filesize",
-                            "can't convert to filesize",
-                            name,
-                        )),
-                    }
-                }
-                Ok(_) => Err(ShellError::labeled_error(
-                    "could not calculate median of non-numeric or unrelated types",
-                    "source",
-                    name,
-                )),
-                Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                )),
-            }
-        }
-        Value {
-            value: UntaggedValue::Primitive(other),
-            ..
-        } => {
-            let left = UntaggedValue::from(other);
-            let result = nu_data::value::compute_values(Operator::Divide, &left, &total_rows);
-
-            match result {
-                Ok(value) => Ok(value.into_value(name)),
-                Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                )),
-            }
-        }
-        _ => Err(ShellError::labeled_error(
-            "could not calculate median of non-numeric or unrelated types",
-            "source",
-            name,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/min.rs b/old_nushell/crates/nu-command/src/commands/math/min.rs
deleted file mode 100644
index 2ed64a0c4..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/min.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math min"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math min")
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the minimum within a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, minimum)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the minimum of a list of numbers",
-            example: "echo [-50 100 25] | math min",
-            result: Some(vec![UntaggedValue::int(-50).into()]),
-        }]
-    }
-}
-
-pub fn minimum(values: &[Value], _name: &Tag) -> Result<Value, ShellError> {
-    let min_func = reducer_for(Reduce::Minimum);
-    min_func(Value::nothing(), values.to_vec())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/mod.rs b/old_nushell/crates/nu-command/src/commands/math/mod.rs
deleted file mode 100644
index 66ca5f1e1..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-pub mod abs;
-pub mod avg;
-pub mod ceil;
-pub mod command;
-pub mod eval;
-pub mod floor;
-pub mod max;
-pub mod median;
-pub mod min;
-pub mod mode;
-pub mod product;
-pub mod round;
-pub mod sqrt;
-pub mod stddev;
-pub mod sum;
-pub mod variance;
-
-mod reducers;
-mod utils;
-
-pub use abs::SubCommand as MathAbs;
-pub use avg::SubCommand as MathAverage;
-pub use ceil::SubCommand as MathCeil;
-pub use command::Command as Math;
-pub use eval::SubCommand as MathEval;
-pub use floor::SubCommand as MathFloor;
-pub use max::SubCommand as MathMaximum;
-pub use median::SubCommand as MathMedian;
-pub use min::SubCommand as MathMinimum;
-pub use mode::SubCommand as MathMode;
-pub use product::SubCommand as MathProduct;
-pub use round::SubCommand as MathRound;
-pub use sqrt::SubCommand as MathSqrt;
-pub use stddev::SubCommand as MathStddev;
-pub use sum::SubCommand as MathSummation;
-pub use variance::SubCommand as MathVariance;
diff --git a/old_nushell/crates/nu-command/src/commands/math/mode.rs b/old_nushell/crates/nu-command/src/commands/math/mode.rs
deleted file mode 100644
index 61c7ea50c..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/mode.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue, Value};
-use std::cmp::Ordering;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math mode"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math mode")
-    }
-
-    fn usage(&self) -> &str {
-        "Gets the most frequent element(s) from a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, mode)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the mode(s) of a list of numbers",
-            example: "echo [3 3 9 12 12 15] | math mode",
-            result: Some(vec![
-                UntaggedValue::int(3).into_untagged_value(),
-                UntaggedValue::int(12).into_untagged_value(),
-            ]),
-        }]
-    }
-}
-
-pub fn mode(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let mut frequency_map = std::collections::HashMap::new();
-    for v in values {
-        let counter = frequency_map.entry(v.value.clone()).or_insert(0);
-        *counter += 1;
-    }
-
-    let mut max_freq = -1;
-    let mut modes = Vec::<Value>::new();
-    for (value, frequency) in &frequency_map {
-        match max_freq.cmp(frequency) {
-            Ordering::Less => {
-                max_freq = *frequency;
-                modes.clear();
-                modes.push(value.clone().into_value(name));
-            }
-            Ordering::Equal => {
-                modes.push(value.clone().into_value(name));
-            }
-            Ordering::Greater => (),
-        }
-    }
-
-    crate::commands::filters::sort_by::sort(&mut modes, &[], name, false)?;
-    Ok(UntaggedValue::Table(modes).into_value(name))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/product.rs b/old_nushell/crates/nu-command/src/commands/math/product.rs
deleted file mode 100644
index 880eb2920..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/product.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math product"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math product")
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the product of a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, product)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get the product of a list of numbers",
-            example: "echo [2 3 3 4] | math product",
-            result: Some(vec![UntaggedValue::int(72).into()]),
-        }]
-    }
-}
-
-fn to_byte(value: &Value) -> Option<Value> {
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Int(num)) => {
-            Some(UntaggedValue::Primitive(Primitive::Filesize(*num as u64)).into_untagged_value())
-        }
-        _ => None,
-    }
-}
-
-/// Calculate product of given values
-pub fn product(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let prod = reducer_for(Reduce::Product);
-
-    let first = values.get(0).ok_or_else(|| {
-        ShellError::unexpected("Cannot perform aggregate math operation on empty data")
-    })?;
-
-    match first {
-        v if v.is_filesize() => to_byte(&prod(
-            UntaggedValue::int(1).into_untagged_value(),
-            values
-                .iter()
-                .map(|v| match v {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-                        ..
-                    } => UntaggedValue::int(*num as i64).into_untagged_value(),
-                    other => other.clone(),
-                })
-                .collect::<Vec<_>>(),
-        )?)
-        .ok_or_else(|| {
-            ShellError::labeled_error(
-                "could not convert to decimal",
-                "could not convert to decimal",
-                &name.span,
-            )
-        }),
-
-        v if v.is_none() => prod(
-            UntaggedValue::int(1).into_untagged_value(),
-            values
-                .iter()
-                .map(|v| match v {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        ..
-                    } => UntaggedValue::int(1).into_untagged_value(),
-                    other => other.clone(),
-                })
-                .collect::<Vec<_>>(),
-        ),
-        _ => prod(UntaggedValue::int(1).into_untagged_value(), values.to_vec()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/reducers.rs b/old_nushell/crates/nu-command/src/commands/math/reducers.rs
deleted file mode 100644
index fdf183172..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/reducers.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-use nu_data::value::{compare_values, compute_values};
-use nu_errors::ShellError;
-use nu_protocol::hir::Operator;
-use nu_protocol::{UntaggedValue, Value};
-use nu_source::{SpannedItem, Tag};
-
-// Re-usable error messages
-const ERR_EMPTY_DATA: &str = "Cannot perform aggregate math operation on empty data";
-
-fn formula(
-    acc_begin: Value,
-    calculator: Box<dyn Fn(Vec<Value>) -> Result<Value, ShellError> + Send + Sync + 'static>,
-) -> Box<dyn Fn(Value, Vec<Value>) -> Result<Value, ShellError> + Send + Sync + 'static> {
-    Box::new(move |acc, datax| -> Result<Value, ShellError> {
-        let result = match compute_values(Operator::Multiply, &acc, &acc_begin) {
-            Ok(v) => v.into_untagged_value(),
-            Err((left_type, right_type)) => {
-                return Err(ShellError::coerce_error(
-                    left_type.spanned_unknown(),
-                    right_type.spanned_unknown(),
-                ))
-            }
-        };
-
-        match calculator(datax) {
-            Ok(total) => Ok(match compute_values(Operator::Plus, &result, &total) {
-                Ok(v) => v.into_untagged_value(),
-                Err((left_type, right_type)) => {
-                    return Err(ShellError::coerce_error(
-                        left_type.spanned_unknown(),
-                        right_type.spanned_unknown(),
-                    ))
-                }
-            }),
-            Err(reason) => Err(reason),
-        }
-    })
-}
-
-pub fn reducer_for(
-    command: Reduce,
-) -> Box<dyn Fn(Value, Vec<Value>) -> Result<Value, ShellError> + Send + Sync + 'static> {
-    match command {
-        Reduce::Default => Box::new(formula(
-            UntaggedValue::int(0).into_untagged_value(),
-            Box::new(sum),
-        )),
-        Reduce::Summation => Box::new(|_, values| sum(values)),
-        Reduce::Minimum => Box::new(|_, values| min(values)),
-        Reduce::Maximum => Box::new(|_, values| max(values)),
-        Reduce::Product => Box::new(|_, values| product(values)),
-    }
-}
-
-#[allow(dead_code)]
-pub enum Reduce {
-    Summation,
-    Minimum,
-    Maximum,
-    Product,
-    Default,
-}
-
-pub fn sum(data: Vec<Value>) -> Result<Value, ShellError> {
-    let first_value = data
-        .get(0)
-        .ok_or_else(|| ShellError::unexpected(ERR_EMPTY_DATA))?;
-
-    // Generate the initial accumulator value, of the correct type for
-    // the incoming data, this will be used in conjunction with the
-    // sum aggregator. Currently this is only handling, filesize,
-    // and other types are defaulting to an integer.
-    let mut acc = if first_value.is_filesize() {
-        UntaggedValue::filesize(0u64).into_untagged_value()
-    } else {
-        UntaggedValue::int(0).into_untagged_value()
-    };
-
-    for value in data {
-        match value.value {
-            UntaggedValue::Primitive(_) => {
-                acc = match compute_values(Operator::Plus, &acc, &value) {
-                    Ok(v) => v.into_untagged_value(),
-                    Err((left_type, right_type)) => {
-                        return Err(ShellError::coerce_error(
-                            left_type.spanned_unknown(),
-                            right_type.spanned_unknown(),
-                        ))
-                    }
-                };
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute the sum of a value that cannot be summed.",
-                    "value appears here",
-                    value.tag.span,
-                ))
-            }
-        }
-    }
-    Ok(acc)
-}
-
-pub fn max(data: Vec<Value>) -> Result<Value, ShellError> {
-    let mut biggest = data
-        .first()
-        .ok_or_else(|| ShellError::unexpected(ERR_EMPTY_DATA))?
-        .value
-        .clone();
-
-    for value in &data {
-        if let Ok(greater_than) = compare_values(Operator::GreaterThan, &value.value, &biggest) {
-            if greater_than {
-                biggest = value.value.clone();
-            }
-        } else {
-            return Err(ShellError::unexpected(format!(
-                "Could not compare\nleft: {:?}\nright: {:?}",
-                biggest, value.value
-            )));
-        }
-    }
-    Ok(Value {
-        value: biggest,
-        tag: Tag::unknown(),
-    })
-}
-
-pub fn min(data: Vec<Value>) -> Result<Value, ShellError> {
-    let mut smallest = data
-        .first()
-        .ok_or_else(|| ShellError::unexpected(ERR_EMPTY_DATA))?
-        .value
-        .clone();
-
-    for value in &data {
-        if let Ok(greater_than) = compare_values(Operator::LessThan, &value.value, &smallest) {
-            if greater_than {
-                smallest = value.value.clone();
-            }
-        } else {
-            return Err(ShellError::unexpected(format!(
-                "Could not compare\nleft: {:?}\nright: {:?}",
-                smallest, value.value
-            )));
-        }
-    }
-    Ok(Value {
-        value: smallest,
-        tag: Tag::unknown(),
-    })
-}
-
-pub fn product(data: Vec<Value>) -> Result<Value, ShellError> {
-    if data.is_empty() {
-        return Err(ShellError::unexpected(ERR_EMPTY_DATA));
-    }
-
-    let mut prod = UntaggedValue::int(1).into_untagged_value();
-    for value in data {
-        match value.value {
-            UntaggedValue::Primitive(_) => {
-                prod = match compute_values(Operator::Multiply, &prod, &value) {
-                    Ok(v) => v.into_untagged_value(),
-                    Err((left_type, right_type)) => {
-                        return Err(ShellError::coerce_error(
-                            left_type.spanned_unknown(),
-                            right_type.spanned_unknown(),
-                        ))
-                    }
-                };
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute the product of a value that cannot be multiplied.",
-                    "value appears here",
-                    value.tag.span,
-                ))
-            }
-        }
-    }
-    Ok(prod)
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/round.rs b/old_nushell/crates/nu-command/src/commands/math/round.rs
deleted file mode 100644
index 79eb92234..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/round.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math round"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math round").named(
-            "precision",
-            SyntaxShape::Number,
-            "digits of precision",
-            Some('p'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Applies the round function to a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Apply the round function to a list of numbers",
-                example: "echo [1.5 2.3 -3.1] | math round",
-                result: Some(vec![
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(2).into(),
-                    UntaggedValue::int(-3).into(),
-                ]),
-            },
-            Example {
-                description: "Apply the round function with precision specified",
-                example: "echo [1.555 2.333 -3.111] | math round -p 2",
-                result: Some(vec![
-                    UntaggedValue::decimal_from_float(1.56, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(2.33, Span::default()).into(),
-                    UntaggedValue::decimal_from_float(-3.11, Span::default()).into(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let precision: Option<Tagged<i16>> = args.get_flag("precision")?;
-    let input = args.input;
-    let precision = if let Some(precision) = precision {
-        precision.item
-    } else {
-        0
-    };
-    let mapped = input.map(move |val| match val.value {
-        UntaggedValue::Primitive(Primitive::BigInt(val)) => round_big_int(val),
-        UntaggedValue::Primitive(Primitive::Decimal(val)) => {
-            round_big_decimal(val, precision.into())
-        }
-        UntaggedValue::Primitive(Primitive::Int(val)) => UntaggedValue::int(val).into(),
-        other => round_default(other),
-    });
-    Ok(mapped.into_output_stream())
-}
-
-fn round_big_int(val: BigInt) -> Value {
-    UntaggedValue::big_int(val).into()
-}
-
-fn round_big_decimal(val: BigDecimal, precision: i64) -> Value {
-    if precision > 0 {
-        UntaggedValue::decimal(val.with_scale(precision + 1).round(precision)).into()
-    } else {
-        let rounded = val.with_scale(precision + 1).round(precision).to_i64();
-
-        match rounded {
-            Some(x) => UntaggedValue::int(x).into(),
-            None => UntaggedValue::Error(ShellError::untagged_runtime_error(
-                "Number too larger to round to 64-bit int",
-            ))
-            .into(),
-        }
-    }
-}
-
-fn round_default(_: UntaggedValue) -> Value {
-    UntaggedValue::Error(ShellError::unexpected(
-        "Only numerical values are supported",
-    ))
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/sqrt.rs b/old_nushell/crates/nu-command/src/commands/math/sqrt.rs
deleted file mode 100644
index ef0815d43..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/sqrt.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math sqrt"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math sqrt")
-    }
-
-    fn usage(&self) -> &str {
-        "Applies the square root function to a list of numbers"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(operate(args))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Apply the square root function to a list of numbers",
-            example: "echo [9 16] | math sqrt",
-            result: Some(vec![
-                UntaggedValue::int(3).into(),
-                UntaggedValue::int(4).into(),
-            ]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> OutputStream {
-    let mapped = args.input.map(move |val| match val.value {
-        UntaggedValue::Primitive(Primitive::Int(val)) => sqrt_big_decimal(BigDecimal::from(val)),
-        UntaggedValue::Primitive(Primitive::Decimal(val)) => sqrt_big_decimal(val),
-        other => sqrt_default(other),
-    });
-    mapped.into_output_stream()
-}
-
-fn sqrt_big_decimal(val: BigDecimal) -> Value {
-    let squared = val.sqrt();
-    match squared {
-        None => UntaggedValue::Error(ShellError::untagged_runtime_error(
-            "Can't square root a negative number",
-        ))
-        .into(),
-        Some(val) if !val.is_integer() => UntaggedValue::decimal(val.normalized()).into(),
-        Some(val) => match val.to_i64() {
-            Some(x) => UntaggedValue::int(x).into(),
-            None => UntaggedValue::Error(ShellError::untagged_runtime_error(
-                "Value too large to convert to 64-bit integer",
-            ))
-            .into(),
-        },
-    }
-}
-
-fn sqrt_default(_: UntaggedValue) -> Value {
-    UntaggedValue::Error(ShellError::unexpected(
-        "Only numerical values are supported",
-    ))
-    .into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/stddev.rs b/old_nushell/crates/nu-command/src/commands/math/stddev.rs
deleted file mode 100644
index 02f0ce824..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/stddev.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use super::variance::compute_variance as variance;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, Signature, UntaggedValue, Value};
-use std::str::FromStr;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math stddev"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math stddev").switch(
-            "sample",
-            "calculate sample standard deviation",
-            Some('s'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the stddev of a list of numbers or tables"
-    }
-
-    fn run(&self, mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let sample: bool = args.has_flag("sample");
-        let values: Vec<Value> = args.input.drain_vec();
-        let name = args.call_info.name_tag;
-
-        let n = if sample {
-            values.len() - 1
-        } else {
-            values.len()
-        };
-
-        let res = if values.iter().all(|v| v.is_primitive()) {
-            compute_stddev(&values, n, &name)
-        } else {
-            // If we are not dealing with Primitives, then perhaps we are dealing with a table
-            // Create a key for each column name
-            let mut column_values = IndexMap::new();
-            for value in values {
-                if let UntaggedValue::Row(row_dict) = &value.value {
-                    for (key, value) in &row_dict.entries {
-                        column_values
-                            .entry(key.clone())
-                            .and_modify(|v: &mut Vec<Value>| v.push(value.clone()))
-                            .or_insert(vec![value.clone()]);
-                    }
-                }
-            }
-            // The mathematical function operates over the columns of the table
-            let mut column_totals = IndexMap::new();
-            for (col_name, col_vals) in column_values {
-                if let Ok(out) = compute_stddev(&col_vals, n, &name) {
-                    column_totals.insert(col_name, out);
-                }
-            }
-
-            if column_totals.keys().len() == 0 {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute values that can't be operated on",
-                    "value appears here",
-                    name.span,
-                ));
-            }
-
-            Ok(UntaggedValue::Row(Dictionary {
-                entries: column_totals,
-            })
-            .into_untagged_value())
-        }?;
-
-        if res.value.is_table() {
-            Ok(OutputStream::from(
-                res.table_entries().cloned().collect::<Vec<_>>(),
-            ))
-        } else {
-            Ok(OutputStream::one(res))
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get the stddev of a list of numbers",
-                example: "echo [1 2 3 4 5] | math stddev",
-                result: Some(vec![UntaggedValue::decimal(BigDecimal::from_str("1.414213562373095048801688724209698078569671875376948073176679737990732478462107038850387534327641573").expect("Could not convert to decimal from string")).into()]),
-            },
-            Example {
-                description: "Get the sample stddev of a list of numbers",
-                example: "echo [1 2 3 4 5] | math stddev -s",
-                result: Some(vec![UntaggedValue::decimal(BigDecimal::from_str("1.581138830084189665999446772216359266859777569662608413428752426396297219319619110672124054189650148").expect("Could not convert to decimal from string")).into()]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-pub fn stddev(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    compute_stddev(values, values.len(), name)
-}
-
-pub fn compute_stddev(values: &[Value], n: usize, name: &Tag) -> Result<Value, ShellError> {
-    let variance = variance(values, n, name)?.as_primitive()?;
-    let sqrt_var = match variance {
-        Primitive::Decimal(var) => var.sqrt(),
-        _ => {
-            return Err(ShellError::labeled_error(
-                "Could not take square root of variance",
-                "error occurred here",
-                name.span,
-            ))
-        }
-    };
-    match sqrt_var {
-        Some(stddev) => Ok(UntaggedValue::from(Primitive::Decimal(stddev)).into_value(name)),
-        None => Err(ShellError::labeled_error(
-            "Could not calculate stddev",
-            "error occurred here",
-            name.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/sum.rs b/old_nushell/crates/nu-command/src/commands/math/sum.rs
deleted file mode 100644
index 30ba8c22a..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/sum.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::commands::math::reducers::{reducer_for, Reduce};
-use crate::commands::math::utils::run_with_function;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math sum"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math sum")
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the sum of a list of numbers or tables"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_with_function(args, summation)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sum a list of numbers",
-                example: "echo [1 2 3] | math sum",
-                result: Some(vec![UntaggedValue::int(6).into()]),
-            },
-            Example {
-                description: "Get the disk usage for the current directory",
-                example: "ls --all --du | get size | math sum",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn to_byte(value: &Value) -> Option<Value> {
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::Int(num)) => {
-            Some(UntaggedValue::Primitive(Primitive::Filesize(*num as u64)).into_untagged_value())
-        }
-        _ => None,
-    }
-}
-
-pub fn summation(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let sum = reducer_for(Reduce::Summation);
-
-    let first = values.get(0).ok_or_else(|| {
-        ShellError::labeled_error(
-            "Cannot perform aggregate math operation on empty data",
-            "expected input",
-            name.span,
-        )
-    })?;
-
-    match first {
-        v if v.is_filesize() => to_byte(&sum(
-            UntaggedValue::int(0).into_untagged_value(),
-            values
-                .to_vec()
-                .iter()
-                .map(|v| match v {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-                        ..
-                    } => UntaggedValue::int(*num as i64).into_untagged_value(),
-                    other => other.clone(),
-                })
-                .collect::<Vec<_>>(),
-        )?)
-        .ok_or_else(|| {
-            ShellError::labeled_error(
-                "could not convert to big decimal",
-                "could not convert to big decimal",
-                &name.span,
-            )
-        }),
-        v if v.is_duration() => sum(UntaggedValue::int(0).into_untagged_value(), values.to_vec()),
-        // v is nothing primitive
-        v if v.is_none() => sum(
-            UntaggedValue::int(0).into_untagged_value(),
-            values
-                .to_vec()
-                .iter()
-                .map(|v| match v {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        ..
-                    } => UntaggedValue::int(0).into_untagged_value(),
-                    other => other.clone(),
-                })
-                .collect::<Vec<_>>(),
-        ),
-        _ => sum(UntaggedValue::int(0).into_untagged_value(), values.to_vec()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/utils.rs b/old_nushell/crates/nu-command/src/commands/math/utils.rs
deleted file mode 100644
index 19ee44b84..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/utils.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, UntaggedValue, Value};
-
-use indexmap::map::IndexMap;
-
-pub type MathFunction = fn(values: &[Value], tag: &Tag) -> Result<Value, ShellError>;
-
-pub fn run_with_function(
-    args: impl Into<RunnableContext>,
-    mf: MathFunction,
-) -> Result<OutputStream, ShellError> {
-    let RunnableContext {
-        mut input,
-        call_info,
-        ..
-    } = args.into();
-    let name = call_info.name_tag;
-
-    let values: Vec<Value> = input.drain_vec();
-
-    let res = calculate(&values, &name, mf);
-    match res {
-        Ok(v) => {
-            if v.value.is_table() {
-                Ok(OutputStream::from(
-                    v.table_entries().cloned().collect::<Vec<_>>(),
-                ))
-            } else {
-                Ok(OutputStream::one(v))
-            }
-        }
-        Err(e) => Err(e),
-    }
-}
-
-pub type BigIntFunction = fn(val: BigInt) -> Value;
-
-pub type IntFunction = fn(val: i64) -> Value;
-
-pub type DecimalFunction = fn(val: BigDecimal) -> Value;
-
-pub type DefaultFunction = fn(val: UntaggedValue) -> Value;
-
-pub fn run_with_numerical_functions_on_stream(
-    input: InputStream,
-    int_function: IntFunction,
-    big_int_function: BigIntFunction,
-    decimal_function: DecimalFunction,
-    default_function: DefaultFunction,
-) -> Result<OutputStream, ShellError> {
-    let mapped = input.map(move |val| match val.value {
-        UntaggedValue::Primitive(Primitive::Int(val)) => int_function(val),
-        UntaggedValue::Primitive(Primitive::BigInt(val)) => big_int_function(val),
-        UntaggedValue::Primitive(Primitive::Decimal(val)) => decimal_function(val),
-        other => default_function(other),
-    });
-    Ok(mapped.into_output_stream())
-}
-
-pub fn calculate(values: &[Value], name: &Tag, mf: MathFunction) -> Result<Value, ShellError> {
-    if values.iter().all(|v| v.is_primitive()) {
-        mf(values, name)
-    } else {
-        // If we are not dealing with Primitives, then perhaps we are dealing with a table
-        // Create a key for each column name
-        let mut column_values = IndexMap::new();
-        for value in values {
-            if let UntaggedValue::Row(row_dict) = &value.value {
-                for (key, value) in &row_dict.entries {
-                    column_values
-                        .entry(key.clone())
-                        .and_modify(|v: &mut Vec<Value>| v.push(value.clone()))
-                        .or_insert(vec![value.clone()]);
-                }
-            }
-        }
-        // The mathematical function operates over the columns of the table
-        let mut column_totals = IndexMap::new();
-        for (col_name, col_vals) in column_values {
-            if let Ok(out) = mf(&col_vals, name) {
-                column_totals.insert(col_name, out);
-            }
-        }
-
-        if column_totals.keys().len() == 0 {
-            return Err(ShellError::labeled_error(
-                "Attempted to compute values that can't be operated on",
-                "value appears here",
-                name.span,
-            ));
-        }
-
-        Ok(UntaggedValue::Row(Dictionary {
-            entries: column_totals,
-        })
-        .into_untagged_value())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/math/variance.rs b/old_nushell/crates/nu-command/src/commands/math/variance.rs
deleted file mode 100644
index a73b4e60f..000000000
--- a/old_nushell/crates/nu-command/src/commands/math/variance.rs
+++ /dev/null
@@ -1,236 +0,0 @@
-use crate::prelude::*;
-use bigdecimal::FromPrimitive;
-use nu_data::value::compute_values;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{hir::Operator, Dictionary, Primitive, Signature, UntaggedValue, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "math variance"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("math variance").switch("sample", "calculate sample variance", Some('s'))
-    }
-
-    fn usage(&self) -> &str {
-        "Finds the variance of a list of numbers or tables"
-    }
-
-    fn run(&self, mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let sample: bool = args.has_flag("sample");
-        let values: Vec<Value> = args.input.drain_vec();
-        let name = args.call_info.name_tag;
-
-        let n = if sample {
-            values.len() - 1
-        } else {
-            values.len()
-        };
-
-        let res = if values.iter().all(|v| v.is_primitive()) {
-            compute_variance(&values, n, &name)
-        } else {
-            // If we are not dealing with Primitives, then perhaps we are dealing with a table
-            // Create a key for each column name
-            let mut column_values = IndexMap::new();
-            for value in values {
-                if let UntaggedValue::Row(row_dict) = &value.value {
-                    for (key, value) in &row_dict.entries {
-                        column_values
-                            .entry(key.clone())
-                            .and_modify(|v: &mut Vec<Value>| v.push(value.clone()))
-                            .or_insert(vec![value.clone()]);
-                    }
-                }
-            }
-            // The mathematical function operates over the columns of the table
-            let mut column_totals = IndexMap::new();
-            for (col_name, col_vals) in column_values {
-                if let Ok(out) = compute_variance(&col_vals, n, &name) {
-                    column_totals.insert(col_name, out);
-                }
-            }
-
-            if column_totals.keys().len() == 0 {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute values that can't be operated on",
-                    "value appears here",
-                    name.span,
-                ));
-            }
-
-            Ok(UntaggedValue::Row(Dictionary {
-                entries: column_totals,
-            })
-            .into_untagged_value())
-        }?;
-
-        if res.value.is_table() {
-            Ok(OutputStream::from(
-                res.table_entries().cloned().collect::<Vec<_>>(),
-            ))
-        } else {
-            Ok(OutputStream::one(res))
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get the variance of a list of numbers",
-                example: "echo [1 2 3 4 5] | math variance",
-                result: Some(vec![UntaggedValue::decimal_from_float(
-                    2.0,
-                    Span::unknown(),
-                )
-                .into()]),
-            },
-            Example {
-                description: "Get the sample variance of a list of numbers",
-                example: "echo [1 2 3 4 5] | math variance -s",
-                result: Some(vec![UntaggedValue::decimal_from_float(
-                    2.5,
-                    Span::unknown(),
-                )
-                .into()]),
-            },
-        ]
-    }
-}
-
-fn sum_of_squares(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    let n = BigDecimal::from_usize(values.len()).ok_or_else(|| {
-        ShellError::labeled_error(
-            "could not convert to big decimal",
-            "could not convert to big decimal",
-            &name.span,
-        )
-    })?;
-    let mut sum_x = UntaggedValue::int(0).into_untagged_value();
-    let mut sum_x2 = UntaggedValue::int(0).into_untagged_value();
-    for value in values {
-        let v = match value {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Filesize(num)),
-                ..
-            } => {
-                UntaggedValue::from(Primitive::Int(*num as i64))
-            },
-            Value {
-                value: UntaggedValue::Primitive(num),
-                ..
-            } => {
-                UntaggedValue::from(num.clone())
-            },
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute the sum of squared values of a value that cannot be summed or squared.",
-                    "value appears here",
-                    value.tag.span,
-                ))
-            }
-        };
-        let v_squared = compute_values(Operator::Multiply, &v, &v);
-        match v_squared {
-            // X^2
-            Ok(x2) => {
-                sum_x2 = match compute_values(Operator::Plus, &sum_x2, &x2) {
-                    Ok(v) => v.into_untagged_value(),
-                    Err((left_type, right_type)) => {
-                        return Err(ShellError::coerce_error(
-                            left_type.spanned(name.span),
-                            right_type.spanned(name.span),
-                        ))
-                    }
-                };
-            }
-            Err((left_type, right_type)) => {
-                return Err(ShellError::coerce_error(
-                    left_type.spanned(value.tag.span),
-                    right_type.spanned(value.tag.span),
-                ))
-            }
-        };
-        sum_x = match compute_values(Operator::Plus, &sum_x, &v) {
-            Ok(v) => v.into_untagged_value(),
-            Err((left_type, right_type)) => {
-                return Err(ShellError::coerce_error(
-                    left_type.spanned(name.span),
-                    right_type.spanned(name.span),
-                ))
-            }
-        };
-    }
-
-    let sum_x_squared = match compute_values(Operator::Multiply, &sum_x, &sum_x) {
-        Ok(v) => v.into_untagged_value(),
-        Err((left_type, right_type)) => {
-            return Err(ShellError::coerce_error(
-                left_type.spanned(name.span),
-                right_type.spanned(name.span),
-            ))
-        }
-    };
-    let sum_x_squared_div_n = match compute_values(Operator::Divide, &sum_x_squared, &n.into()) {
-        Ok(v) => v.into_untagged_value(),
-        Err((left_type, right_type)) => {
-            return Err(ShellError::coerce_error(
-                left_type.spanned(name.span),
-                right_type.spanned(name.span),
-            ))
-        }
-    };
-    let ss = match compute_values(Operator::Minus, &sum_x2, &sum_x_squared_div_n) {
-        Ok(v) => v.into_untagged_value(),
-        Err((left_type, right_type)) => {
-            return Err(ShellError::coerce_error(
-                left_type.spanned(name.span),
-                right_type.spanned(name.span),
-            ))
-        }
-    };
-
-    Ok(ss)
-}
-
-#[cfg(test)]
-pub fn variance(values: &[Value], name: &Tag) -> Result<Value, ShellError> {
-    compute_variance(values, values.len(), name)
-}
-
-pub fn compute_variance(values: &[Value], n: usize, name: &Tag) -> Result<Value, ShellError> {
-    let ss = sum_of_squares(values, name)?;
-    let n = BigDecimal::from_usize(n).ok_or_else(|| {
-        ShellError::labeled_error(
-            "could not convert to big decimal",
-            "could not convert to big decimal",
-            &name.span,
-        )
-    })?;
-    let variance = compute_values(Operator::Divide, &ss, &n.into());
-    match variance {
-        Ok(value) => Ok(value.into_value(name)),
-        Err((_, _)) => Err(ShellError::labeled_error(
-            "could not calculate variance of non-integer or unrelated types",
-            "source",
-            name,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/mod.rs b/old_nushell/crates/nu-command/src/commands/mod.rs
deleted file mode 100644
index b6f6cae59..000000000
--- a/old_nushell/crates/nu-command/src/commands/mod.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-mod charting;
-mod config;
-mod conversions;
-mod core_commands;
-#[cfg(feature = "dataframe")]
-mod dataframe;
-mod env;
-mod filesystem;
-mod filters;
-mod formats;
-mod generators;
-mod math;
-mod network;
-mod path;
-mod pathvar;
-mod platform;
-mod random;
-mod shells;
-mod strings;
-mod system;
-mod viewers;
-
-pub use charting::*;
-pub use config::*;
-pub use conversions::*;
-pub use core_commands::*;
-#[cfg(feature = "dataframe")]
-pub use dataframe::{
-    DataFrame, DataFrameAggregate, DataFrameAllFalse, DataFrameAllTrue, DataFrameAppend,
-    DataFrameArgMax, DataFrameArgMin, DataFrameArgSort, DataFrameArgTrue, DataFrameArgUnique,
-    DataFrameColumn, DataFrameConcatenate, DataFrameContains, DataFrameCumulative, DataFrameDTypes,
-    DataFrameDescribe, DataFrameDrop, DataFrameDropDuplicates, DataFrameDropNulls,
-    DataFrameDummies, DataFrameFilter, DataFrameFirst, DataFrameGet, DataFrameGetDay,
-    DataFrameGetHour, DataFrameGetMinute, DataFrameGetMonth, DataFrameGetNanoSecond,
-    DataFrameGetOrdinal, DataFrameGetSecond, DataFrameGetWeek, DataFrameGetWeekDay,
-    DataFrameGetYear, DataFrameGroupBy, DataFrameIsDuplicated, DataFrameIsIn, DataFrameIsNotNull,
-    DataFrameIsNull, DataFrameIsUnique, DataFrameJoin, DataFrameLast, DataFrameList, DataFrameMelt,
-    DataFrameNNull, DataFrameNUnique, DataFrameNot, DataFrameOpen, DataFramePivot, DataFrameRename,
-    DataFrameReplace, DataFrameReplaceAll, DataFrameRolling, DataFrameSample, DataFrameSelect,
-    DataFrameSeriesRename, DataFrameSet, DataFrameSetWithIdx, DataFrameShape, DataFrameShift,
-    DataFrameShow, DataFrameSlice, DataFrameSort, DataFrameStrFTime, DataFrameStringLengths,
-    DataFrameStringSlice, DataFrameTake, DataFrameToCsv, DataFrameToDF, DataFrameToLowercase,
-    DataFrameToParquet, DataFrameToUppercase, DataFrameUnique, DataFrameValueCounts,
-    DataFrameWhere, DataFrameWithColumn,
-};
-pub use env::*;
-pub use filesystem::*;
-pub use filters::*;
-pub use formats::*;
-pub use generators::*;
-pub use math::*;
-pub use network::*;
-pub use path::*;
-pub use pathvar::*;
-pub use platform::*;
-pub use random::*;
-pub use shells::*;
-pub use strings::*;
-pub use system::*;
-pub use viewers::*;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::examples::{test_anchors, test_examples};
-    use nu_engine::{whole_stream_command, Command};
-    use nu_errors::ShellError;
-
-    fn full_tests() -> Vec<Command> {
-        vec![
-            whole_stream_command(ErrorMake),
-            whole_stream_command(Drop),
-            whole_stream_command(DropNth),
-            whole_stream_command(DropColumn),
-            whole_stream_command(Append),
-            whole_stream_command(GroupBy),
-            whole_stream_command(Insert),
-            whole_stream_command(MoveColumn),
-            whole_stream_command(Update),
-            whole_stream_command(Empty),
-            whole_stream_command(Nth),
-            // whole_stream_command(Select),
-            // whole_stream_command(Get),
-            // Str Command Suite
-            whole_stream_command(Str),
-            whole_stream_command(StrToDecimal),
-            whole_stream_command(StrToInteger),
-            whole_stream_command(StrDowncase),
-            whole_stream_command(StrUpcase),
-            whole_stream_command(StrCapitalize),
-            whole_stream_command(StrFindReplace),
-            whole_stream_command(StrSubstring),
-            whole_stream_command(StrToDatetime),
-            whole_stream_command(StrContains),
-            whole_stream_command(StrIndexOf),
-            whole_stream_command(StrTrim),
-            whole_stream_command(StrStartsWith),
-            whole_stream_command(StrEndsWith),
-            //whole_stream_command(StrCollect),
-            whole_stream_command(StrLength),
-            whole_stream_command(StrLPad),
-            whole_stream_command(StrReverse),
-            whole_stream_command(StrRPad),
-            whole_stream_command(StrCamelCase),
-            whole_stream_command(StrPascalCase),
-            whole_stream_command(StrKebabCase),
-            whole_stream_command(StrSnakeCase),
-            whole_stream_command(StrScreamingSnakeCase),
-            whole_stream_command(ToMarkdown),
-        ]
-    }
-
-    fn only_examples() -> Vec<Command> {
-        let mut commands = full_tests();
-        commands.extend([
-            whole_stream_command(UpdateCells),
-            whole_stream_command(Zip),
-            whole_stream_command(Flatten),
-        ]);
-        commands
-    }
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        for cmd in only_examples() {
-            println!("cmd: {}", cmd.name());
-            test_examples(cmd)?;
-        }
-
-        Ok(())
-    }
-
-    #[test]
-    fn tracks_metadata() -> Result<(), ShellError> {
-        for cmd in full_tests() {
-            test_anchors(cmd)?;
-        }
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/fetch.rs b/old_nushell/crates/nu-command/src/commands/network/fetch.rs
deleted file mode 100644
index 82b5df989..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/fetch.rs
+++ /dev/null
@@ -1,377 +0,0 @@
-use crate::prelude::*;
-use base64::encode;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{CommandAction, ReturnSuccess, ReturnValue, Value};
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::{AnchorLocation, Span, Tag};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "fetch"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("fetch")
-            .desc("Load from a URL into a cell, convert to table if possible (avoid by appending '--raw').")
-            .required(
-                "URL",
-                SyntaxShape::String,
-                "the URL to fetch the contents from",
-            )
-            .named(
-                "user",
-                SyntaxShape::Any,
-                "the username when authenticating",
-                Some('u'),
-            )
-            .named(
-                "password",
-                SyntaxShape::Any,
-                "the password when authenticating",
-                Some('p'),
-            )
-            .switch("raw", "fetch contents as text rather than a table", Some('r'))
-            .switch("insecure", "allow insecure server connections when using SSL", Some('k'))
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Fetch the contents from a URL (HTTP GET operation)."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        run_fetch(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Fetch content from url.com",
-                example: "fetch url.com",
-                result: None,
-            },
-            Example {
-                description: "Fetch content from url.com, with username and password",
-                example: "fetch -u myuser -p mypass url.com",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn run_fetch(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let mut fetch_helper = Fetch::new();
-
-    fetch_helper.setup(args)?;
-
-    let runtime = tokio::runtime::Runtime::new()?;
-    Ok(vec![runtime.block_on(fetch(
-        &fetch_helper.path.clone().ok_or_else(|| {
-            ShellError::labeled_error(
-                "internal error: path not set",
-                "path not set",
-                &fetch_helper.tag,
-            )
-        })?,
-        fetch_helper.has_raw,
-        fetch_helper.has_insecure,
-        fetch_helper.user.clone(),
-        fetch_helper.password,
-    ))]
-    .into_iter()
-    .into_action_stream())
-
-    //fetch.setup(callinfo)?;
-}
-
-#[derive(Default)]
-pub struct Fetch {
-    pub path: Option<Value>,
-    pub tag: Tag,
-    pub has_raw: bool,
-    pub has_insecure: bool,
-    pub user: Option<String>,
-    pub password: Option<String>,
-}
-
-impl Fetch {
-    pub fn new() -> Fetch {
-        Fetch {
-            path: None,
-            tag: Tag::unknown(),
-            has_raw: false,
-            has_insecure: false,
-            user: None,
-            password: None,
-        }
-    }
-
-    pub fn setup(&mut self, args: CommandArgs) -> Result<(), ShellError> {
-        self.path = Some({
-            args.req(0).map_err(|_| {
-                ShellError::labeled_error(
-                    "No file or directory specified",
-                    "for command",
-                    &args.name_tag(),
-                )
-            })?
-        });
-        self.tag = args.name_tag();
-
-        self.has_raw = args.has_flag("raw");
-
-        self.has_insecure = args.has_flag("insecure");
-
-        self.user = args.get_flag("user")?;
-
-        self.password = args.get_flag("password")?;
-
-        Ok(())
-    }
-}
-
-pub async fn fetch(
-    path: &Value,
-    has_raw: bool,
-    has_insecure: bool,
-    user: Option<String>,
-    password: Option<String>,
-) -> ReturnValue {
-    let path_str = path.as_string()?;
-    let path_span = path.tag.span;
-
-    let result = helper(&path_str, path_span, has_raw, has_insecure, user, password).await;
-
-    if let Err(e) = result {
-        return Err(e);
-    }
-    let (file_extension, value) = result?;
-
-    let file_extension = if has_raw {
-        None
-    } else {
-        // If the extension could not be determined via mimetype, try to use the path
-        // extension. Some file types do not declare their mimetypes (such as bson files).
-        file_extension.or_else(|| path_str.split('.').last().map(String::from))
-    };
-
-    if let Some(extension) = file_extension {
-        Ok(ReturnSuccess::Action(CommandAction::AutoConvert(
-            value, extension,
-        )))
-    } else {
-        ReturnSuccess::value(value)
-    }
-}
-
-// Helper function that actually goes to retrieve the resource from the url given
-// The Option<String> return a possible file extension which can be used in AutoConvert commands
-async fn helper(
-    location: &str,
-    span: Span,
-    has_raw: bool,
-    has_insecure: bool,
-    user: Option<String>,
-    password: Option<String>,
-) -> std::result::Result<(Option<String>, Value), ShellError> {
-    let url = match url::Url::parse(location) {
-        Ok(u) => u,
-        Err(e) => {
-            return Err(ShellError::labeled_error(
-                format!("Incomplete or incorrect url:\n{:?}", e),
-                "expected a full url",
-                span,
-            ));
-        }
-    };
-
-    let login = match (user, password) {
-        (Some(user), Some(password)) => Some(encode(&format!("{}:{}", user, password))),
-        (Some(user), _) => Some(encode(&format!("{}:", user))),
-        _ => None,
-    };
-
-    let client = http_client(has_insecure);
-    let mut request = client.get(url);
-
-    if let Some(login) = login {
-        request = request.header("Authorization", format!("Basic {}", login));
-    }
-
-    let generate_error = |t: &str, e: reqwest::Error, span: &Span| {
-        ShellError::labeled_error(
-            format!("Could not load {} from remote url: {:?}", t, e),
-            "could not load",
-            span,
-        )
-    };
-    let tag = Tag {
-        span,
-        anchor: Some(AnchorLocation::Url(location.to_string())),
-    };
-
-    match request.send().await {
-        Ok(r) => match r.headers().get("content-type") {
-            Some(content_type) => {
-                let content_type = content_type.to_str().map_err(|e| {
-                    ShellError::labeled_error(e.to_string(), "MIME type were invalid", &tag)
-                })?;
-                let content_type = mime::Mime::from_str(content_type).map_err(|_| {
-                    ShellError::labeled_error(
-                        format!("MIME type unknown: {}", content_type),
-                        "given unknown MIME type",
-                        span,
-                    )
-                })?;
-                match (content_type.type_(), content_type.subtype()) {
-                    (mime::APPLICATION, mime::XML) => Ok((
-                        Some("xml".to_string()),
-                        UntaggedValue::string(
-                            r.text()
-                                .await
-                                .map_err(|e| generate_error("text", e, &span))?,
-                        )
-                        .into_value(tag),
-                    )),
-                    (mime::APPLICATION, mime::JSON) => Ok((
-                        Some("json".to_string()),
-                        UntaggedValue::string(
-                            r.text()
-                                .await
-                                .map_err(|e| generate_error("text", e, &span))?,
-                        )
-                        .into_value(tag),
-                    )),
-                    (mime::APPLICATION, mime::OCTET_STREAM) => {
-                        let buf: Vec<u8> = r
-                            .bytes()
-                            .await
-                            .map_err(|e| generate_error("binary", e, &span))?
-                            .to_vec();
-                        Ok((None, UntaggedValue::binary(buf).into_value(tag)))
-                    }
-                    (mime::IMAGE, mime::SVG) => Ok((
-                        Some("svg".to_string()),
-                        UntaggedValue::string(
-                            r.text()
-                                .await
-                                .map_err(|e| generate_error("svg", e, &span))?,
-                        )
-                        .into_value(tag),
-                    )),
-                    (mime::IMAGE, image_ty) => {
-                        let buf: Vec<u8> = r
-                            .bytes()
-                            .await
-                            .map_err(|e| generate_error("image", e, &span))?
-                            .to_vec();
-                        Ok((
-                            Some(image_ty.to_string()),
-                            UntaggedValue::binary(buf).into_value(tag),
-                        ))
-                    }
-                    (mime::TEXT, mime::HTML) => Ok((
-                        Some("html".to_string()),
-                        UntaggedValue::string(
-                            r.text()
-                                .await
-                                .map_err(|e| generate_error("text", e, &span))?,
-                        )
-                        .into_value(tag),
-                    )),
-                    (mime::TEXT, mime::CSV) => Ok((
-                        Some("csv".to_string()),
-                        UntaggedValue::string(
-                            r.text()
-                                .await
-                                .map_err(|e| generate_error("text", e, &span))?,
-                        )
-                        .into_value(tag),
-                    )),
-                    (mime::TEXT, mime::PLAIN) => {
-                        let path_extension = url::Url::parse(location)
-                            .map_err(|_| {
-                                ShellError::labeled_error(
-                                    format!("Cannot parse URL: {}", location),
-                                    "cannot parse",
-                                    span,
-                                )
-                            })?
-                            .path_segments()
-                            .and_then(|segments| segments.last())
-                            .and_then(|name| if name.is_empty() { None } else { Some(name) })
-                            .and_then(|name| {
-                                PathBuf::from(name)
-                                    .extension()
-                                    .map(|name| name.to_string_lossy().to_string())
-                            });
-
-                        Ok((
-                            path_extension,
-                            UntaggedValue::string(
-                                r.text()
-                                    .await
-                                    .map_err(|e| generate_error("text", e, &span))?,
-                            )
-                            .into_value(tag),
-                        ))
-                    }
-                    (_ty, _sub_ty) if has_raw => {
-                        let raw_bytes = r.bytes().await;
-                        let raw_bytes = match raw_bytes {
-                            Ok(r) => r,
-                            Err(e) => {
-                                return Err(ShellError::labeled_error(
-                                    "error with raw_bytes",
-                                    e.to_string(),
-                                    &span,
-                                ));
-                            }
-                        };
-
-                        // For unsupported MIME types, we do not know if the data is UTF-8,
-                        // so we get the raw body bytes and try to convert to UTF-8 if possible.
-                        match std::str::from_utf8(&raw_bytes) {
-                            Ok(response_str) => {
-                                Ok((None, UntaggedValue::string(response_str).into_value(tag)))
-                            }
-                            Err(_) => Ok((
-                                None,
-                                UntaggedValue::binary(raw_bytes.to_vec()).into_value(tag),
-                            )),
-                        }
-                    }
-                    (ty, sub_ty) => Err(ShellError::unimplemented(format!(
-                        "Not yet supported MIME type: {} {}",
-                        ty, sub_ty
-                    ))),
-                }
-            }
-            // TODO: Should this return "nothing" or Err?
-            None => Ok((
-                None,
-                UntaggedValue::string("No content type found".to_owned()).into_value(tag),
-            )),
-        },
-        Err(e) => Err(ShellError::labeled_error(
-            "url could not be opened",
-            e.to_string(),
-            span,
-        )),
-    }
-}
-
-// Only panics if the user agent is invalid but we define it statically so either
-// it always or never fails
-fn http_client(allow_insecure: bool) -> reqwest::Client {
-    reqwest::Client::builder()
-        .user_agent("nushell")
-        .danger_accept_invalid_certs(allow_insecure)
-        .build()
-        .expect("Failed to build reqwest client")
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/mod.rs b/old_nushell/crates/nu-command/src/commands/network/mod.rs
deleted file mode 100644
index d6e32be4b..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#[cfg(feature = "fetch")]
-mod fetch;
-#[cfg(feature = "fetch")]
-pub use fetch::Command as Fetch;
-
-#[cfg(feature = "post")]
-mod post;
-#[cfg(feature = "post")]
-pub use post::Command as Post;
-
-mod url_;
-pub use url_::*;
diff --git a/old_nushell/crates/nu-command/src/commands/network/post.rs b/old_nushell/crates/nu-command/src/commands/network/post.rs
deleted file mode 100644
index be472d4ba..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/post.rs
+++ /dev/null
@@ -1,646 +0,0 @@
-use crate::prelude::*;
-use base64::encode;
-use mime::Mime;
-use nu_engine::WholeStreamCommand;
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{
-    CommandAction, Primitive, ReturnSuccess, ReturnValue, UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::{AnchorLocation, Tag, TaggedItem};
-use num_traits::cast::ToPrimitive;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "post"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("post")
-            .desc("Post content to a URL and retrieve data as a table if possible.")
-            .required("path", SyntaxShape::Any, "the URL to post to")
-            .required("body", SyntaxShape::Any, "the contents of the post body")
-            .named(
-                "user",
-                SyntaxShape::Any,
-                "the username when authenticating",
-                Some('u'),
-            )
-            .named(
-                "password",
-                SyntaxShape::Any,
-                "the password when authenticating",
-                Some('p'),
-            )
-            .named(
-                "content-type",
-                SyntaxShape::Any,
-                "the MIME type of content to post",
-                Some('t'),
-            )
-            .named(
-                "content-length",
-                SyntaxShape::Any,
-                "the length of the content being posted",
-                Some('l'),
-            )
-            .switch(
-                "raw",
-                "return values as a string instead of a table",
-                Some('r'),
-            )
-            .switch(
-                "insecure",
-                "allow insecure server connections when using SSL",
-                Some('k'),
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "Post a body to a URL (HTTP POST operation)."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        run_post(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Post content to url.com",
-                example: "post url.com 'body'",
-                result: None,
-            },
-            Example {
-                description: "Post content to url.com, with username and password",
-                example: "post -u myuser -p mypass url.com 'body'",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn run_post(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let mut helper = Post::new();
-
-    helper.setup(args)?;
-
-    let runtime = tokio::runtime::Runtime::new()?;
-    Ok(vec![runtime.block_on(post_helper(
-        &helper.path.clone().ok_or_else(|| {
-            ShellError::labeled_error("expected a 'path'", "expected a 'path'", &helper.tag)
-        })?,
-        helper.has_raw,
-        helper.has_insecure,
-        &helper.body.clone().ok_or_else(|| {
-            ShellError::labeled_error("expected a 'body'", "expected a 'body'", &helper.tag)
-        })?,
-        helper.user.clone(),
-        helper.password.clone(),
-        &helper.headers,
-    ))]
-    .into_iter()
-    .into_action_stream())
-
-    //fetch.setup(callinfo)?;
-}
-
-#[derive(Clone)]
-pub enum HeaderKind {
-    ContentType(String),
-    ContentLength(String),
-}
-
-#[derive(Default)]
-pub struct Post {
-    pub path: Option<Value>,
-    pub has_raw: bool,
-    pub has_insecure: bool,
-    pub body: Option<Value>,
-    pub user: Option<String>,
-    pub password: Option<String>,
-    pub headers: Vec<HeaderKind>,
-    pub tag: Tag,
-}
-
-impl Post {
-    pub fn new() -> Post {
-        Post {
-            path: None,
-            has_raw: false,
-            has_insecure: false,
-            body: None,
-            user: None,
-            password: None,
-            headers: vec![],
-            tag: Tag::default(),
-        }
-    }
-
-    pub fn setup(&mut self, args: CommandArgs) -> Result<(), ShellError> {
-        self.path = Some({
-            args.req(0).map_err(|_| {
-                ShellError::labeled_error(
-                    "No file or directory specified",
-                    "for command",
-                    &args.name_tag(),
-                )
-            })?
-        });
-
-        self.body = {
-            let file = args.req(1).map_err(|_| {
-                ShellError::labeled_error("No body specified", "for command", &args.name_tag())
-            })?;
-            Some(file)
-        };
-
-        self.tag = args.name_tag();
-
-        self.has_raw = args.has_flag("raw");
-
-        self.has_insecure = args.has_flag("insecure");
-
-        self.user = args.get_flag("user")?;
-
-        self.password = args.get_flag("password")?;
-
-        self.headers = get_headers(&args)?;
-
-        Ok(())
-    }
-}
-
-pub async fn post_helper(
-    path: &Value,
-    has_raw: bool,
-    has_insecure: bool,
-    body: &Value,
-    user: Option<String>,
-    password: Option<String>,
-    headers: &[HeaderKind],
-) -> ReturnValue {
-    let path_tag = path.tag.clone();
-    let path_str = path.as_string()?;
-
-    let (file_extension, contents, contents_tag) = post(
-        &path_str,
-        has_insecure,
-        body,
-        user,
-        password,
-        headers,
-        path_tag.clone(),
-    )
-    .await?;
-
-    let file_extension = if has_raw {
-        None
-    } else {
-        // If the extension could not be determined via mimetype, try to use the path
-        // extension. Some file types do not declare their mimetypes (such as bson files).
-        file_extension.or_else(|| path_str.split('.').last().map(String::from))
-    };
-
-    let tagged_contents = contents.into_value(&contents_tag);
-
-    if let Some(extension) = file_extension {
-        Ok(ReturnSuccess::Action(CommandAction::AutoConvert(
-            tagged_contents,
-            extension,
-        )))
-    } else {
-        ReturnSuccess::value(tagged_contents)
-    }
-}
-
-pub async fn post(
-    location: &str,
-    allow_insecure: bool,
-    body: &Value,
-    user: Option<String>,
-    password: Option<String>,
-    headers: &[HeaderKind],
-    tag: Tag,
-) -> Result<(Option<String>, UntaggedValue, Tag), ShellError> {
-    if location.starts_with("http:") || location.starts_with("https:") {
-        let login = match (user, password) {
-            (Some(user), Some(password)) => Some(encode(&format!("{}:{}", user, password))),
-            (Some(user), _) => Some(encode(&format!("{}:", user))),
-            _ => None,
-        };
-        let response = match body {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(body_str)),
-                ..
-            } => {
-                let mut s = http_client(allow_insecure)
-                    .post(location)
-                    .body(body_str.to_string());
-                if let Some(login) = login {
-                    s = s.header("Authorization", format!("Basic {}", login));
-                }
-
-                for h in headers {
-                    s = match h {
-                        HeaderKind::ContentType(ct) => s.header("Content-Type", ct),
-                        HeaderKind::ContentLength(cl) => s.header("Content-Length", cl),
-                    };
-                }
-
-                s.send().await
-            }
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                ..
-            } => {
-                let mut s = http_client(allow_insecure)
-                    .post(location)
-                    .body(Vec::from(&b[..]));
-                if let Some(login) = login {
-                    s = s.header("Authorization", format!("Basic {}", login));
-                }
-                s.send().await
-            }
-            Value { value, tag } => {
-                match value_to_json_value(&value.clone().into_untagged_value()) {
-                    Ok(json_value) => match serde_json::to_string(&json_value) {
-                        Ok(result_string) => {
-                            let mut s = http_client(allow_insecure)
-                                .post(location)
-                                .body(result_string);
-
-                            if let Some(login) = login {
-                                s = s.header("Authorization", format!("Basic {}", login));
-                            }
-                            s.send().await
-                        }
-                        _ => {
-                            return Err(ShellError::labeled_error(
-                                "Could not automatically convert table",
-                                "needs manual conversion",
-                                tag,
-                            ));
-                        }
-                    },
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            "Could not automatically convert table",
-                            "needs manual conversion",
-                            tag,
-                        ));
-                    }
-                }
-            }
-        };
-        match response {
-            Ok(r) => match r.headers().get("content-type") {
-                Some(content_type) => {
-                    let content_type = content_type.to_str().map_err(|e| {
-                        ShellError::labeled_error(e.to_string(), "MIME type were invalid", &tag)
-                    })?;
-                    let content_type = Mime::from_str(content_type).map_err(|_| {
-                        ShellError::labeled_error(
-                            format!("Unknown MIME type: {}", content_type),
-                            "unknown MIME type",
-                            &tag,
-                        )
-                    })?;
-                    match (content_type.type_(), content_type.subtype()) {
-                        (mime::APPLICATION, mime::XML) => Ok((
-                            Some("xml".to_string()),
-                            UntaggedValue::string(r.text().await.map_err(|_| {
-                                ShellError::labeled_error(
-                                    "Could not load text from remote url",
-                                    "could not load",
-                                    &tag,
-                                )
-                            })?),
-                            Tag {
-                                anchor: Some(AnchorLocation::Url(location.to_string())),
-                                span: tag.span,
-                            },
-                        )),
-                        (mime::APPLICATION, mime::JSON) => Ok((
-                            Some("json".to_string()),
-                            UntaggedValue::string(r.text().await.map_err(|_| {
-                                ShellError::labeled_error(
-                                    "Could not load text from remote url",
-                                    "could not load",
-                                    &tag,
-                                )
-                            })?),
-                            Tag {
-                                anchor: Some(AnchorLocation::Url(location.to_string())),
-                                span: tag.span,
-                            },
-                        )),
-                        (mime::APPLICATION, mime::OCTET_STREAM) => {
-                            let buf: Vec<u8> = r
-                                .bytes()
-                                .await
-                                .map_err(|_| {
-                                    ShellError::labeled_error(
-                                        "Could not load binary file",
-                                        "could not load",
-                                        &tag,
-                                    )
-                                })?
-                                .to_vec();
-                            Ok((
-                                None,
-                                UntaggedValue::binary(buf),
-                                Tag {
-                                    anchor: Some(AnchorLocation::Url(location.to_string())),
-                                    span: tag.span,
-                                },
-                            ))
-                        }
-                        (mime::IMAGE, image_ty) => {
-                            let buf: Vec<u8> = r
-                                .bytes()
-                                .await
-                                .map_err(|_| {
-                                    ShellError::labeled_error(
-                                        "Could not load image file",
-                                        "could not load",
-                                        &tag,
-                                    )
-                                })?
-                                .to_vec();
-                            Ok((
-                                Some(image_ty.to_string()),
-                                UntaggedValue::binary(buf),
-                                Tag {
-                                    anchor: Some(AnchorLocation::Url(location.to_string())),
-                                    span: tag.span,
-                                },
-                            ))
-                        }
-                        (mime::TEXT, mime::HTML) => Ok((
-                            Some("html".to_string()),
-                            UntaggedValue::string(r.text().await.map_err(|_| {
-                                ShellError::labeled_error(
-                                    "Could not load text from remote url",
-                                    "could not load",
-                                    &tag,
-                                )
-                            })?),
-                            Tag {
-                                anchor: Some(AnchorLocation::Url(location.to_string())),
-                                span: tag.span,
-                            },
-                        )),
-                        (mime::TEXT, mime::PLAIN) => {
-                            let path_extension = url::Url::parse(location)
-                                .map_err(|_| {
-                                    ShellError::labeled_error(
-                                        format!("could not parse URL: {}", location),
-                                        "could not parse URL",
-                                        &tag,
-                                    )
-                                })?
-                                .path_segments()
-                                .and_then(|segments| segments.last())
-                                .and_then(|name| if name.is_empty() { None } else { Some(name) })
-                                .and_then(|name| {
-                                    PathBuf::from(name)
-                                        .extension()
-                                        .map(|name| name.to_string_lossy().to_string())
-                                });
-
-                            Ok((
-                                path_extension,
-                                UntaggedValue::string(r.text().await.map_err(|_| {
-                                    ShellError::labeled_error(
-                                        "Could not load text from remote url",
-                                        "could not load",
-                                        &tag,
-                                    )
-                                })?),
-                                Tag {
-                                    anchor: Some(AnchorLocation::Url(location.to_string())),
-                                    span: tag.span,
-                                },
-                            ))
-                        }
-                        (ty, sub_ty) => Ok((
-                            None,
-                            UntaggedValue::string(format!(
-                                "Not yet supported MIME type: {} {}",
-                                ty, sub_ty
-                            )),
-                            Tag {
-                                anchor: Some(AnchorLocation::Url(location.to_string())),
-                                span: tag.span,
-                            },
-                        )),
-                    }
-                }
-                None => Ok((
-                    None,
-                    UntaggedValue::string("No content type found".to_owned()),
-                    Tag {
-                        anchor: Some(AnchorLocation::Url(location.to_string())),
-                        span: tag.span,
-                    },
-                )),
-            },
-            Err(_) => Err(ShellError::labeled_error(
-                "URL could not be opened",
-                "url not found",
-                tag,
-            )),
-        }
-    } else {
-        Err(ShellError::labeled_error(
-            "Expected a url",
-            "needs a url",
-            tag,
-        ))
-    }
-}
-
-// FIXME FIXME FIXME
-// Ultimately, we don't want to duplicate to-json here, but we need to because there isn't an easy way to call into it, yet
-pub fn value_to_json_value(v: &Value) -> Result<serde_json::Value, ShellError> {
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => serde_json::Value::Bool(*b),
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => serde_json::Value::Number(
-            serde_json::Number::from(b.to_u64().expect("What about really big numbers")),
-        ),
-        UntaggedValue::Primitive(Primitive::Duration(i)) => serde_json::Value::Number(
-            serde_json::Number::from_f64(
-                i.to_f64().expect("TODO: What about really big decimals?"),
-            )
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Can not convert big decimal to f64",
-                    "cannot convert big decimal to f64",
-                    &v.tag,
-                )
-            })?,
-        ),
-        UntaggedValue::Primitive(Primitive::Date(d)) => serde_json::Value::String(d.to_string()),
-        UntaggedValue::Primitive(Primitive::EndOfStream) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => serde_json::Value::Number(
-            serde_json::Number::from_f64(
-                f.to_f64().expect("TODO: What about really big decimals?"),
-            )
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Can not convert big decimal to f64",
-                    "cannot convert big decimal to f64",
-                    &v.tag,
-                )
-            })?,
-        ),
-        UntaggedValue::Primitive(Primitive::Int(i)) => {
-            serde_json::Value::Number(serde_json::Number::from(*i))
-        }
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            serde_json::Value::Number(serde_json::Number::from(CoerceInto::<i64>::coerce_into(
-                i.tagged(&v.tag),
-                "converting to JSON number",
-            )?))
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => serde_json::Value::Null,
-        UntaggedValue::Primitive(Primitive::GlobPattern(s)) => serde_json::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::String(s)) => serde_json::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => serde_json::Value::Array(
-            path.iter()
-                .map(|x| match &x.unspanned {
-                    UnspannedPathMember::String(string) => {
-                        Ok(serde_json::Value::String(string.clone()))
-                    }
-                    UnspannedPathMember::Int(int) => {
-                        Ok(serde_json::Value::Number(serde_json::Number::from(*int)))
-                    }
-                })
-                .collect::<Result<Vec<serde_json::Value>, ShellError>>()?,
-        ),
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => {
-            serde_json::Value::String(s.display().to_string())
-        }
-
-        UntaggedValue::Table(l) => serde_json::Value::Array(json_list(l)?),
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-            return Err(ShellError::labeled_error(
-                "Cannot convert data struct",
-                "Cannot convert data struct",
-                &v.tag,
-            ))
-        }
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Block(_) | UntaggedValue::Primitive(Primitive::Range(_)) => {
-            serde_json::Value::Null
-        }
-        UntaggedValue::Primitive(Primitive::Binary(b)) => {
-            let mut output = vec![];
-
-            for item in b {
-                output.push(serde_json::Value::Number(
-                    serde_json::Number::from_f64(*item as f64).ok_or_else(|| {
-                        ShellError::labeled_error(
-                            "Cannot create number from from f64",
-                            "cannot created number from f64",
-                            &v.tag,
-                        )
-                    })?,
-                ));
-            }
-            serde_json::Value::Array(output)
-        }
-        UntaggedValue::Row(o) => {
-            let mut m = serde_json::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), value_to_json_value(v)?);
-            }
-            serde_json::Value::Object(m)
-        }
-    })
-}
-
-fn json_list(input: &[Value]) -> Result<Vec<serde_json::Value>, ShellError> {
-    let mut out = vec![];
-
-    for value in input {
-        out.push(value_to_json_value(value)?);
-    }
-
-    Ok(out)
-}
-
-fn get_headers(args: &CommandArgs) -> Result<Vec<HeaderKind>, ShellError> {
-    let mut headers = vec![];
-
-    match extract_header_value(args, "content-type") {
-        Ok(h) => {
-            if let Some(ct) = h {
-                headers.push(HeaderKind::ContentType(ct))
-            }
-        }
-        Err(e) => {
-            return Err(e);
-        }
-    };
-
-    match extract_header_value(args, "content-length") {
-        Ok(h) => {
-            if let Some(cl) = h {
-                headers.push(HeaderKind::ContentLength(cl))
-            }
-        }
-        Err(e) => {
-            return Err(e);
-        }
-    };
-
-    Ok(headers)
-}
-
-fn extract_header_value(args: &CommandArgs, key: &str) -> Result<Option<String>, ShellError> {
-    if args.has_flag(key) {
-        let tagged = args.get_flag(key)?;
-        let val = match tagged {
-            Some(Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            }) => s,
-            Some(Value { tag, .. }) => {
-                return Err(ShellError::labeled_error(
-                    format!("{} not in expected format.  Expected string.", key),
-                    "post error",
-                    tag,
-                ));
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    format!("{} not in expected format.  Expected string.", key),
-                    "post error",
-                    Tag::unknown(),
-                ));
-            }
-        };
-        return Ok(Some(val));
-    }
-
-    Ok(None)
-}
-
-// Only panics if the user agent is invalid but we define it statically so either
-// it always or never fails
-fn http_client(allow_insecure: bool) -> reqwest::Client {
-    reqwest::Client::builder()
-        .user_agent("nushell")
-        .danger_accept_invalid_certs(allow_insecure)
-        .build()
-        .expect("Failed to build reqwest client")
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/command.rs b/old_nushell/crates/nu-command/src/commands/network/url_/command.rs
deleted file mode 100644
index e541912cf..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/command.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Url;
-
-impl WholeStreamCommand for Url {
-    fn name(&self) -> &str {
-        "url"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("url")
-    }
-
-    fn usage(&self) -> &str {
-        "Apply url function."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Url, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Url;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Url {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/host.rs b/old_nushell/crates/nu-command/src/commands/network/url_/host.rs
deleted file mode 100644
index 0571f20ae..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/host.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use url::Url;
-
-use super::operate;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, Value};
-
-pub struct UrlHost;
-
-impl WholeStreamCommand for UrlHost {
-    fn name(&self) -> &str {
-        "url host"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("url host").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally operate by column path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "gets the host of a url"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let rest: Vec<ColumnPath> = args.rest(0)?;
-        let input = args.input;
-
-        Ok(operate(input, rest, &host))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Get host of a url",
-            example: "echo 'http://www.example.com/foo/bar' | url host",
-            result: Some(vec![Value::from("www.example.com")]),
-        }]
-    }
-}
-
-fn host(url: &Url) -> &str {
-    url.host_str().unwrap_or("")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::UrlHost;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(UrlHost {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/mod.rs b/old_nushell/crates/nu-command/src/commands/network/url_/mod.rs
deleted file mode 100644
index 082552dd1..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/mod.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-mod command;
-mod host;
-mod path;
-mod query;
-mod scheme;
-
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive, ShellTypeName, UntaggedValue, Value};
-use url::Url;
-
-pub use command::Url as UrlCommand;
-pub use host::UrlHost;
-pub use path::UrlPath;
-pub use query::UrlQuery;
-pub use scheme::UrlScheme;
-
-fn handle_value<F>(action: &F, v: &Value) -> Result<Value, ShellError>
-where
-    F: Fn(&Url) -> &str + Send + 'static,
-{
-    let a = |url| UntaggedValue::string(action(url));
-    let v = match &v.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => match Url::parse(s) {
-            Ok(url) => a(&url).into_value(v.tag()),
-            Err(_) => UntaggedValue::string("").into_value(v.tag()),
-        },
-        other => {
-            let got = format!("got {}", other.type_name());
-            return Err(ShellError::labeled_error(
-                "value is not a string",
-                got,
-                v.tag().span,
-            ));
-        }
-    };
-    Ok(v)
-}
-
-fn operate<F>(input: crate::InputStream, paths: Vec<ColumnPath>, action: &'static F) -> OutputStream
-where
-    F: Fn(&Url) -> &str + Send + Sync + 'static,
-{
-    input
-        .map(move |v| {
-            if paths.is_empty() {
-                handle_value(&action, &v)
-            } else {
-                let mut ret = v;
-
-                for path in &paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| handle_value(&action, old)),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream()
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/path.rs b/old_nushell/crates/nu-command/src/commands/network/url_/path.rs
deleted file mode 100644
index 75525ad53..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/path.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use url::Url;
-
-use super::operate;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, Value};
-
-pub struct UrlPath;
-
-impl WholeStreamCommand for UrlPath {
-    fn name(&self) -> &str {
-        "url path"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("url path").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally operate by column path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "gets the path of a url"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let rest: Vec<ColumnPath> = args.rest(0)?;
-        let input = args.input;
-
-        Ok(operate(input, rest, &Url::path))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get path of a url",
-                example: "echo 'http://www.example.com/foo/bar' | url path",
-                result: Some(vec![Value::from("/foo/bar")]),
-            },
-            Example {
-                description: "A trailing slash will be reflected in the path",
-                example: "echo 'http://www.example.com' | url path",
-                result: Some(vec![Value::from("/")]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::UrlPath;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(UrlPath {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/query.rs b/old_nushell/crates/nu-command/src/commands/network/url_/query.rs
deleted file mode 100644
index ce6a5cf47..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/query.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use url::Url;
-
-use super::operate;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, Value};
-
-pub struct UrlQuery;
-
-impl WholeStreamCommand for UrlQuery {
-    fn name(&self) -> &str {
-        "url query"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("url query").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally operate by column path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "gets the query of a url"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let rest: Vec<ColumnPath> = args.rest(0)?;
-        let input = args.input;
-        Ok(operate(input, rest, &query))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get query of a url",
-                example: "echo 'http://www.example.com/?foo=bar&baz=quux' | url query",
-                result: Some(vec![Value::from("foo=bar&baz=quux")]),
-            },
-            Example {
-                description: "No query gives the empty string",
-                example: "echo 'http://www.example.com/' | url query",
-                result: Some(vec![Value::from("")]),
-            },
-        ]
-    }
-}
-
-fn query(url: &Url) -> &str {
-    url.query().unwrap_or("")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::UrlQuery;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(UrlQuery {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/network/url_/scheme.rs b/old_nushell/crates/nu-command/src/commands/network/url_/scheme.rs
deleted file mode 100644
index 643883bc5..000000000
--- a/old_nushell/crates/nu-command/src/commands/network/url_/scheme.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use url::Url;
-
-use super::operate;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, Value};
-
-pub struct UrlScheme;
-
-impl WholeStreamCommand for UrlScheme {
-    fn name(&self) -> &str {
-        "url scheme"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("url scheme").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally operate by path",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "gets the scheme (eg http, file) of a url"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let rest: Vec<ColumnPath> = args.rest(0)?;
-        Ok(operate(args.input, rest, &Url::scheme))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get scheme of a url",
-                example: "echo 'http://www.example.com' | url scheme",
-                result: Some(vec![Value::from("http")]),
-            },
-            Example {
-                description: "You get an empty string if there is no scheme",
-                example: "echo 'test' | url scheme",
-                result: Some(vec![Value::from("")]),
-            },
-        ]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::UrlScheme;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(UrlScheme {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/basename.rs b/old_nushell/crates/nu-command/src/commands/path/basename.rs
deleted file mode 100644
index 21a1901b8..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/basename.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::path::Path;
-
-pub struct PathBasename;
-
-struct PathBasenameArguments {
-    columns: Vec<ColumnPath>,
-    replace: Option<Tagged<String>>,
-}
-
-impl PathSubcommandArguments for PathBasenameArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathBasename {
-    fn name(&self) -> &str {
-        "path basename"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path basename")
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-            .named(
-                "replace",
-                SyntaxShape::String,
-                "Return original path with basename replaced by this string",
-                Some('r'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Get the final component of a path"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathBasenameArguments {
-            columns: column_paths_from_args(&args)?,
-            replace: args.get_flag("replace")?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get basename of a path",
-                example: "'C:\\Users\\joe\\test.txt' | path basename",
-                result: Some(vec![Value::from("test.txt")]),
-            },
-            Example {
-                description: "Get basename of a path in a column",
-                example: "ls .. | path basename -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Replace basename of a path",
-                example: "'C:\\Users\\joe\\test.txt' | path basename -r 'spam.png'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    "C:\\Users\\joe\\spam.png",
-                ))]),
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get basename of a path",
-                example: "'/home/joe/test.txt' | path basename",
-                result: Some(vec![Value::from("test.txt")]),
-            },
-            Example {
-                description: "Get basename of a path in a column",
-                example: "ls .. | path basename -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Replace basename of a path",
-                example: "'/home/joe/test.txt' | path basename -r 'spam.png'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    "/home/joe/spam.png",
-                ))]),
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathBasenameArguments) -> Value {
-    let untagged = match args.replace {
-        Some(ref basename) => UntaggedValue::filepath(path.with_file_name(&basename.item)),
-        None => UntaggedValue::string(match path.file_name() {
-            Some(filename) => filename.to_string_lossy(),
-            None => "".into(),
-        }),
-    };
-
-    untagged.into_value(tag)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathBasename;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathBasename {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/command.rs b/old_nushell/crates/nu-command/src/commands/path/command.rs
deleted file mode 100644
index 22a0d30eb..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/command.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Path;
-
-impl WholeStreamCommand for Path {
-    fn name(&self) -> &str {
-        "path"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path")
-    }
-
-    fn usage(&self) -> &str {
-        "Explore and manipulate paths."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"There are three ways to represent a path:
-
-* As a path literal, e.g., '/home/viking/spam.txt'
-* As a structured path: a table with 'parent', 'stem', and 'extension' (and
-* 'prefix' on Windows) columns. This format is produced by the 'path parse'
-  subcommand.
-* As an inner list of path parts, e.g., '[[ / home viking spam.txt ]]'.
-  Splitting into parts is done by the `path split` command.
-
-All subcommands accept all three variants as an input. Furthermore, the 'path
-join' subcommand can be used to join the structured path or path parts back into
-the path literal."#
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(
-            UntaggedValue::string(get_full_help(&Path, args.scope())).into_value(Tag::unknown()),
-        ))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Path;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Path {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/dirname.rs b/old_nushell/crates/nu-command/src/commands/path/dirname.rs
deleted file mode 100644
index 7e000629d..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/dirname.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::path::Path;
-
-pub struct PathDirname;
-
-struct PathDirnameArguments {
-    columns: Vec<ColumnPath>,
-    replace: Option<Tagged<String>>,
-    num_levels: Option<Tagged<u32>>,
-}
-
-impl PathSubcommandArguments for PathDirnameArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathDirname {
-    fn name(&self) -> &str {
-        "path dirname"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path dirname")
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-            .named(
-                "replace",
-                SyntaxShape::String,
-                "Return original path with dirname replaced by this string",
-                Some('r'),
-            )
-            .named(
-                "num-levels",
-                SyntaxShape::Int,
-                "Number of directories to walk up",
-                Some('n'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Get the parent directory of a path"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathDirnameArguments {
-            columns: column_paths_from_args(&args)?,
-            replace: args.get_flag("replace")?,
-            num_levels: args.get_flag("num-levels")?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get dirname of a path",
-                example: "'C:\\Users\\joe\\code\\test.txt' | path dirname",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    "C:\\Users\\joe\\code",
-                ))]),
-            },
-            Example {
-                description: "Get dirname of a path in a column",
-                example: "ls ('.' | path expand) | path dirname -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Walk up two levels",
-                example: "'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2",
-                result: Some(vec![Value::from(UntaggedValue::filepath("C:\\Users\\joe"))]),
-            },
-            Example {
-                description: "Replace the part that would be returned with a custom path",
-                example:
-                    "'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2 -r C:\\Users\\viking",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    "C:\\Users\\viking\\code\\test.txt",
-                ))]),
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get dirname of a path",
-                example: "'/home/joe/code/test.txt' | path dirname",
-                result: Some(vec![Value::from(UntaggedValue::filepath("/home/joe/code"))]),
-            },
-            Example {
-                description: "Get dirname of a path in a column",
-                example: "ls ('.' | path expand) | path dirname -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Walk up two levels",
-                example: "'/home/joe/code/test.txt' | path dirname -n 2",
-                result: Some(vec![Value::from(UntaggedValue::filepath("/home/joe"))]),
-            },
-            Example {
-                description: "Replace the part that would be returned with a custom path",
-                example: "'/home/joe/code/test.txt' | path dirname -n 2 -r /home/viking",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    "/home/viking/code/test.txt",
-                ))]),
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathDirnameArguments) -> Value {
-    let num_levels = args.num_levels.as_ref().map_or(1, |tagged| tagged.item);
-
-    let mut dirname = path;
-    let mut reached_top = false; // end early if somebody passes -n 99999999
-    for _ in 0..num_levels {
-        dirname = dirname.parent().unwrap_or_else(|| {
-            reached_top = true;
-            dirname
-        });
-        if reached_top {
-            break;
-        }
-    }
-
-    let untagged = match args.replace {
-        Some(ref newdir) => {
-            let remainder = path.strip_prefix(dirname).unwrap_or(dirname);
-            if !remainder.as_os_str().is_empty() {
-                UntaggedValue::filepath(Path::new(&newdir.item).join(remainder))
-            } else {
-                UntaggedValue::filepath(Path::new(&newdir.item))
-            }
-        }
-        None => UntaggedValue::filepath(dirname),
-    };
-
-    untagged.into_value(tag)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathDirname;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathDirname {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/exists.rs b/old_nushell/crates/nu-command/src/commands/path/exists.rs
deleted file mode 100644
index e88b3b643..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/exists.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use std::path::Path;
-
-pub struct PathExists;
-
-struct PathExistsArguments {
-    columns: Vec<ColumnPath>,
-}
-
-impl PathSubcommandArguments for PathExistsArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathExists {
-    fn name(&self) -> &str {
-        "path exists"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path exists").named(
-            "columns",
-            SyntaxShape::Table,
-            "Optionally operate by column path",
-            Some('c'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Check whether a path exists"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathExistsArguments {
-            columns: column_paths_from_args(&args)?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Check if a file exists",
-                example: "'C:\\Users\\joe\\todo.txt' | path exists",
-                result: Some(vec![Value::from(UntaggedValue::boolean(false))]),
-            },
-            Example {
-                description: "Check if a file exists in a column",
-                example: "ls | path exists -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Check if a file exists",
-                example: "'/home/joe/todo.txt' | path exists",
-                result: Some(vec![Value::from(UntaggedValue::boolean(false))]),
-            },
-            Example {
-                description: "Check if a file exists in a column",
-                example: "ls | path exists -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, _args: &PathExistsArguments) -> Value {
-    UntaggedValue::boolean(path.exists()).into_value(tag)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathExists;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathExists {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/expand.rs b/old_nushell/crates/nu-command/src/commands/path/expand.rs
deleted file mode 100644
index e30504e9c..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/expand.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_path::{canonicalize, expand_path};
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Span;
-use std::path::Path;
-
-pub struct PathExpand;
-
-struct PathExpandArguments {
-    strict: bool,
-    columns: Vec<ColumnPath>,
-}
-
-impl PathSubcommandArguments for PathExpandArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathExpand {
-    fn name(&self) -> &str {
-        "path expand"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path expand")
-            .switch(
-                "strict",
-                "Throw an error if the path could not be expanded",
-                Some('s'),
-            )
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Try to expand a path to its absolute form"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathExpandArguments {
-            strict: args.has_flag("strict"),
-            columns: column_paths_from_args(&args)?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Expand an absolute path",
-                example: r"'C:\Users\joe\foo\..\bar' | path expand",
-                result: Some(vec![
-                    UntaggedValue::filepath(r"C:\Users\joe\bar").into_value(Span::new(0, 25))
-                ]),
-            },
-            Example {
-                description: "Expand a path in a column",
-                example: "ls | path expand -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Expand a relative path",
-                example: r"'foo\..\bar' | path expand",
-                result: Some(vec![
-                    UntaggedValue::filepath("bar").into_value(Span::new(0, 12))
-                ]),
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Expand an absolute path",
-                example: "'/home/joe/foo/../bar' | path expand",
-                result: Some(vec![
-                    UntaggedValue::filepath("/home/joe/bar").into_value(Span::new(0, 22))
-                ]),
-            },
-            Example {
-                description: "Expand a path in a column",
-                example: "ls | path expand -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Expand a relative path",
-                example: "'foo/../bar' | path expand",
-                result: Some(vec![
-                    UntaggedValue::filepath("bar").into_value(Span::new(0, 12))
-                ]),
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathExpandArguments) -> Value {
-    if let Ok(p) = canonicalize(path) {
-        UntaggedValue::filepath(p).into_value(tag)
-    } else if args.strict {
-        Value::error(ShellError::labeled_error(
-            "Could not expand path",
-            "could not be expanded (path might not exist, non-final \
-                    component is not a directory, or other cause)",
-            tag.span,
-        ))
-    } else {
-        UntaggedValue::filepath(expand_path(path)).into_value(tag)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathExpand;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathExpand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/join.rs b/old_nushell/crates/nu-command/src/commands/path/join.rs
deleted file mode 100644
index a81eaf300..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/join.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-use super::{
-    column_paths_from_args, handle_value, join_path, operate_column_paths, PathSubcommandArguments,
-};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::path::{Path, PathBuf};
-
-pub struct PathJoin;
-
-struct PathJoinArguments {
-    columns: Vec<ColumnPath>,
-    append: Option<Tagged<PathBuf>>,
-}
-
-impl PathSubcommandArguments for PathJoinArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathJoin {
-    fn name(&self) -> &str {
-        "path join"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path join")
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-            .optional(
-                "append",
-                SyntaxShape::FilePath,
-                "Path to append to the input",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Join a structured path or a list of path parts."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Optionally, append an additional path to the result. It is designed to accept
-the output of 'path parse' and 'path split' subcommands."#
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-
-        let cmd_args = Arc::new(PathJoinArguments {
-            columns: column_paths_from_args(&args)?,
-            append: args.opt(0)?,
-        });
-
-        Ok(operate_join(args.input, &action, tag, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Append a filename to a path",
-                example: r"'C:\Users\viking' | path join spam.txt",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"C:\Users\viking\spam.txt",
-                ))]),
-            },
-            Example {
-                description: "Append a filename to a path inside a column",
-                example: r"ls | path join spam.txt -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Join a list of parts into a path",
-                example: r"[ 'C:' '\' 'Users' 'viking' 'spam.txt' ] | path join",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"C:\Users\viking\spam.txt",
-                ))]),
-            },
-            Example {
-                description: "Join a structured path into a path",
-                example: r"[ [parent stem extension]; ['C:\Users\viking' 'spam' 'txt']] | path join",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"C:\Users\viking\spam.txt",
-                ))]),
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Append a filename to a path",
-                example: r"'/home/viking' | path join spam.txt",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"/home/viking/spam.txt",
-                ))]),
-            },
-            Example {
-                description: "Append a filename to a path inside a column",
-                example: r"ls | path join spam.txt -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Join a list of parts into a path",
-                example: r"[ '/' 'home' 'viking' 'spam.txt' ] | path join",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"/home/viking/spam.txt",
-                ))]),
-            },
-            Example {
-                description: "Join a structured path into a path",
-                example: r"[[ parent stem extension ]; [ '/home/viking' 'spam' 'txt' ]] | path join",
-                result: Some(vec![Value::from(UntaggedValue::filepath(
-                    r"/home/viking/spam.txt",
-                ))]),
-            },
-        ]
-    }
-}
-
-fn operate_join<F, T>(
-    input: crate::InputStream,
-    action: &'static F,
-    tag: Tag,
-    args: Arc<T>,
-) -> OutputStream
-where
-    T: PathSubcommandArguments + Send + Sync + 'static,
-    F: Fn(&Path, Tag, &T) -> Value + Send + Sync + 'static,
-{
-    let span = tag.span;
-
-    if args.get_column_paths().is_empty() {
-        let mut parts = input.peekable();
-        let has_rows = matches!(
-            parts.peek(),
-            Some(&Value {
-                value: UntaggedValue::Row(_),
-                ..
-            })
-        );
-
-        if has_rows {
-            // operate one-by-one like the other path subcommands
-            parts
-                .into_iter()
-                .map(
-                    move |v| match handle_value(&action, &v, span, Arc::clone(&args)) {
-                        Ok(v) => v,
-                        Err(e) => Value::error(e),
-                    },
-                )
-                .into_output_stream()
-        } else {
-            // join the whole input stream
-            match join_path(&parts.collect_vec(), &span) {
-                Ok(path_buf) => OutputStream::one(action(&path_buf, tag, &args)),
-                Err(e) => OutputStream::one(Value::error(e)),
-            }
-        }
-    } else {
-        operate_column_paths(input, action, span, args)
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathJoinArguments) -> Value {
-    if let Some(ref append) = args.append {
-        UntaggedValue::filepath(path.join(&append.item)).into_value(tag)
-    } else {
-        UntaggedValue::filepath(path).into_value(tag)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathJoin;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathJoin {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/mod.rs b/old_nushell/crates/nu-command/src/commands/path/mod.rs
deleted file mode 100644
index ffd2fba52..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/mod.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-mod basename;
-mod command;
-mod dirname;
-mod exists;
-mod expand;
-mod join;
-mod parse;
-mod relative_to;
-mod split;
-mod r#type;
-
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{
-    ColumnPath, Dictionary, MaybeOwned, Primitive, ShellTypeName, UntaggedValue, Value,
-};
-use nu_source::Span;
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-pub use basename::PathBasename;
-pub use command::Path as PathCommand;
-pub use dirname::PathDirname;
-pub use exists::PathExists;
-pub use expand::PathExpand;
-pub use join::PathJoin;
-pub use parse::PathParse;
-pub use r#type::PathType;
-pub use relative_to::PathRelativeTo;
-pub use split::PathSplit;
-
-#[cfg(windows)]
-const ALLOWED_COLUMNS: [&str; 4] = ["prefix", "parent", "stem", "extension"];
-#[cfg(not(windows))]
-const ALLOWED_COLUMNS: [&str; 3] = ["parent", "stem", "extension"];
-
-trait PathSubcommandArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath>;
-}
-
-fn encode_path(
-    entries: &Dictionary,
-    orig_span: Span,
-    new_span: Span,
-) -> Result<PathBuf, ShellError> {
-    if entries.length() == 0 {
-        return Err(ShellError::labeled_error_with_secondary(
-            "Empty table cannot be encoded as a path",
-            "got empty table",
-            new_span,
-            "originates from here",
-            orig_span,
-        ));
-    }
-
-    for col in entries.keys() {
-        if !ALLOWED_COLUMNS.contains(&col.as_str()) {
-            let msg = format!(
-                "Column '{}' is not valid for a structured path. Allowed columns are: {}",
-                col,
-                ALLOWED_COLUMNS.join(", ")
-            );
-            return Err(ShellError::labeled_error_with_secondary(
-                "Expected structured path table",
-                msg,
-                new_span,
-                "originates from here",
-                orig_span,
-            ));
-        }
-    }
-
-    // At this point, the row is known to have >0 columns, all of them allowed
-    let mut result = PathBuf::new();
-
-    #[cfg(windows)]
-    if let MaybeOwned::Borrowed(val) = entries.get_data("prefix") {
-        let s = val.as_string()?;
-        if !s.is_empty() {
-            result.push(&s);
-        }
-    };
-
-    if let MaybeOwned::Borrowed(val) = entries.get_data("parent") {
-        let p = val.as_string()?;
-        if !p.is_empty() {
-            result.push(p);
-        }
-    };
-
-    let mut basename = String::new();
-
-    if let MaybeOwned::Borrowed(val) = entries.get_data("stem") {
-        let s = val.as_string()?;
-        if !s.is_empty() {
-            basename.push_str(&s);
-        }
-    };
-
-    if let MaybeOwned::Borrowed(val) = entries.get_data("extension") {
-        let s = val.as_string()?;
-        if !s.is_empty() {
-            basename.push('.');
-            basename.push_str(&s);
-        }
-    };
-
-    if !basename.is_empty() {
-        result.push(basename);
-    }
-
-    Ok(result)
-}
-
-fn join_path(parts: &[Value], new_span: &Span) -> Result<PathBuf, ShellError> {
-    parts
-        .iter()
-        .map(|part| match &part.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => Ok(Path::new(s)),
-            UntaggedValue::Primitive(Primitive::FilePath(pb)) => Ok(pb.as_path()),
-            _ => {
-                let got = format!("got {}", part.type_name());
-                Err(ShellError::labeled_error_with_secondary(
-                    "Cannot join values that are not paths or strings.",
-                    got,
-                    new_span,
-                    "originates from here",
-                    part.tag.span,
-                ))
-            }
-        })
-        .collect()
-}
-
-fn handle_value<F, T>(action: &F, v: &Value, span: Span, args: Arc<T>) -> Result<Value, ShellError>
-where
-    T: PathSubcommandArguments,
-    F: Fn(&Path, Tag, &T) -> Value,
-{
-    match &v.value {
-        UntaggedValue::Primitive(Primitive::FilePath(buf)) => Ok(action(buf, v.tag(), &args)),
-        UntaggedValue::Primitive(Primitive::String(s)) => Ok(action(s.as_ref(), v.tag(), &args)),
-        UntaggedValue::Row(entries) => {
-            // implicit path join makes all subcommands understand the structured path
-            let path_buf = encode_path(entries, v.tag().span, span)?;
-            Ok(action(&path_buf, v.tag(), &args))
-        }
-        UntaggedValue::Table(parts) => {
-            // implicit path join makes all subcommands understand path split into parts
-            let path_buf = join_path(parts, &span)?;
-            Ok(action(&path_buf, v.tag(), &args))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error_with_secondary(
-                "Value is a not string, path, row, or table",
-                got,
-                span,
-                "originates from here",
-                v.tag().span,
-            ))
-        }
-    }
-}
-
-fn operate_column_paths<F, T>(
-    input: crate::InputStream,
-    action: &'static F,
-    span: Span,
-    args: Arc<T>,
-) -> OutputStream
-where
-    T: PathSubcommandArguments + Send + Sync + 'static,
-    F: Fn(&Path, Tag, &T) -> Value + Send + Sync + 'static,
-{
-    input
-        .map(move |v| {
-            let mut ret = v;
-
-            for path in args.get_column_paths() {
-                let cloned_args = Arc::clone(&args);
-                ret = match ret.swap_data_by_column_path(
-                    path,
-                    Box::new(move |old| handle_value(&action, old, span, cloned_args)),
-                ) {
-                    Ok(v) => v,
-                    Err(e) => Value::error(e),
-                };
-            }
-
-            ret
-        })
-        .into_output_stream()
-}
-
-fn operate<F, T>(
-    input: crate::InputStream,
-    action: &'static F,
-    span: Span,
-    args: Arc<T>,
-) -> OutputStream
-where
-    T: PathSubcommandArguments + Send + Sync + 'static,
-    F: Fn(&Path, Tag, &T) -> Value + Send + Sync + 'static,
-{
-    if args.get_column_paths().is_empty() {
-        input
-            .map(
-                move |v| match handle_value(&action, &v, span, Arc::clone(&args)) {
-                    Ok(v) => v,
-                    Err(e) => Value::error(e),
-                },
-            )
-            .into_output_stream()
-    } else {
-        operate_column_paths(input, action, span, args)
-    }
-}
-
-fn column_paths_from_args(args: &CommandArgs) -> Result<Vec<ColumnPath>, ShellError> {
-    let column_paths: Option<Vec<Value>> = args.get_flag("columns")?;
-    let has_columns = column_paths.is_some();
-    let column_paths = match column_paths {
-        Some(cols) => {
-            let mut c = Vec::new();
-            for col in cols {
-                let colpath = ColumnPath::build(&col.convert_to_string().spanned_unknown());
-                if !colpath.is_empty() {
-                    c.push(colpath)
-                }
-            }
-            c
-        }
-        None => Vec::new(),
-    };
-
-    if has_columns && column_paths.is_empty() {
-        let colval: Option<Value> = args.get_flag("columns")?;
-        let colspan = match colval {
-            Some(v) => v.tag.span,
-            None => Span::unknown(),
-        };
-        return Err(ShellError::labeled_error(
-            "Requires a list of columns",
-            "must be a list of columns",
-            colspan,
-        ));
-    }
-
-    Ok(column_paths)
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/parse.rs b/old_nushell/crates/nu-command/src/commands/path/parse.rs
deleted file mode 100644
index 81fd30ea4..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/parse.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tagged;
-#[cfg(windows)]
-use std::path::Component;
-use std::path::Path;
-
-pub struct PathParse;
-
-struct PathParseArguments {
-    columns: Vec<ColumnPath>,
-    extension: Option<Tagged<String>>,
-}
-
-impl PathSubcommandArguments for PathParseArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathParse {
-    fn name(&self) -> &str {
-        "path parse"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path parse")
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-            .named(
-                "extension",
-                SyntaxShape::String,
-                "Manually supply the extension (without the dot)",
-                Some('e'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Convert a path into structured data."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Each path is split into a table with 'parent', 'stem' and 'extension' fields.
-On Windows, an extra 'prefix' column is added."#
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathParseArguments {
-            columns: column_paths_from_args(&args)?,
-            extension: args.get_flag("extension")?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Parse a single path",
-                example: r"'C:\Users\viking\spam.txt' | path parse",
-                result: None,
-            },
-            Example {
-                description: "Replace a complex extension",
-                example: r"'C:\Users\viking\spam.tar.gz' | path parse -e tar.gz | update extension { 'txt' }",
-                result: None,
-            },
-            Example {
-                description: "Ignore the extension",
-                example: r"'C:\Users\viking.d' | path parse -e ''",
-                result: None,
-            },
-            Example {
-                description: "Parse all paths under the 'name' column",
-                example: r"ls | path parse -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Parse a path",
-                example: r"'/home/viking/spam.txt' | path parse",
-                result: None,
-            },
-            Example {
-                description: "Replace a complex extension",
-                example: r"'/home/viking/spam.tar.gz' | path parse -e tar.gz | update extension { 'txt' }",
-                result: None,
-            },
-            Example {
-                description: "Ignore the extension",
-                example: r"'/etc/conf.d' | path parse -e ''",
-                result: None,
-            },
-            Example {
-                description: "Parse all paths under the 'name' column",
-                example: r"ls | path parse -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathParseArguments) -> Value {
-    let mut dict = TaggedDictBuilder::new(&tag);
-
-    #[cfg(windows)]
-    {
-        // The prefix is only valid on Windows. On non-Windows, it's always empty.
-        let prefix = match path.components().next() {
-            Some(Component::Prefix(prefix_component)) => {
-                prefix_component.as_os_str().to_string_lossy()
-            }
-            _ => "".into(),
-        };
-        dict.insert_untagged("prefix", UntaggedValue::string(prefix));
-    }
-
-    let parent = path.parent().unwrap_or_else(|| "".as_ref());
-    dict.insert_untagged("parent", UntaggedValue::filepath(parent));
-
-    let basename = path
-        .file_name()
-        .unwrap_or_else(|| "".as_ref())
-        .to_string_lossy();
-
-    match &args.extension {
-        Some(Tagged { item: ext, .. }) => {
-            let ext_with_dot = [".", ext].concat();
-            if basename.ends_with(&ext_with_dot) && !ext.is_empty() {
-                let stem = basename.trim_end_matches(&ext_with_dot);
-                dict.insert_untagged("stem", UntaggedValue::string(stem));
-                dict.insert_untagged("extension", UntaggedValue::string(ext));
-            } else {
-                dict.insert_untagged("stem", UntaggedValue::string(basename));
-                dict.insert_untagged("extension", UntaggedValue::string(""));
-            }
-        }
-        None => {
-            let stem = path
-                .file_stem()
-                .unwrap_or_else(|| "".as_ref())
-                .to_string_lossy();
-            let extension = path
-                .extension()
-                .unwrap_or_else(|| "".as_ref())
-                .to_string_lossy();
-
-            dict.insert_untagged("stem", UntaggedValue::string(stem));
-            dict.insert_untagged("extension", UntaggedValue::string(extension));
-        }
-    }
-
-    dict.into_value()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathParse;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathParse {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/relative_to.rs b/old_nushell/crates/nu-command/src/commands/path/relative_to.rs
deleted file mode 100644
index d62b262db..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/relative_to.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::path::{Path, PathBuf};
-
-pub struct PathRelativeTo;
-
-struct PathRelativeToArguments {
-    path: Tagged<PathBuf>,
-    columns: Vec<ColumnPath>,
-}
-
-impl PathSubcommandArguments for PathRelativeToArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathRelativeTo {
-    fn name(&self) -> &str {
-        "path relative-to"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path relative-to")
-            .required(
-                "path",
-                SyntaxShape::FilePath,
-                "Parent shared with the input path",
-            )
-            .named(
-                "columns",
-                SyntaxShape::Table,
-                "Optionally operate by column path",
-                Some('c'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Get a path as relative to another path."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Can be used only when the input and the argument paths are either both
-absolute or both relative. The argument path needs to be a parent of the input
-path."#
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathRelativeToArguments {
-            path: args.req(0)?,
-            columns: column_paths_from_args(&args)?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Find a relative path from two absolute paths",
-                example: r"'C:\Users\viking' | path relative-to 'C:\Users'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(r"viking"))]),
-            },
-            Example {
-                description: "Find a relative path from two absolute paths in a column",
-                example: "ls ~ | path relative-to ~ -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Find a relative path from two relative paths",
-                example: r"'eggs\bacon\sausage\spam' | path relative-to 'eggs\bacon\sausage'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(r"spam"))]),
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Find a relative path from two absolute paths",
-                example: r"'/home/viking' | path relative-to '/home'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(r"viking"))]),
-            },
-            Example {
-                description: "Find a relative path from two absolute paths in a column",
-                example: "ls ~ | path relative-to ~ -c [ name ]",
-                result: None,
-            },
-            Example {
-                description: "Find a relative path from two relative paths",
-                example: r"'eggs/bacon/sausage/spam' | path relative-to 'eggs/bacon/sausage'",
-                result: Some(vec![Value::from(UntaggedValue::filepath(r"spam"))]),
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, args: &PathRelativeToArguments) -> Value {
-    match path.strip_prefix(&args.path.item) {
-        Ok(p) => UntaggedValue::filepath(p).into_value(tag),
-        Err(_) => Value::error(ShellError::labeled_error_with_secondary(
-            format!(
-                "'{}' is not a subpath of '{}'",
-                path.to_string_lossy(),
-                &args.path.item.to_string_lossy()
-            ),
-            "should be a parent of the input path",
-            args.path.tag.span,
-            "originates from here",
-            tag.span,
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathRelativeTo;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathRelativeTo {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/split.rs b/old_nushell/crates/nu-command/src/commands/path/split.rs
deleted file mode 100644
index d51505b2d..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/split.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-use super::{column_paths_from_args, handle_value, operate_column_paths, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use std::path::Path;
-
-pub struct PathSplit;
-
-struct PathSplitArguments {
-    columns: Vec<ColumnPath>,
-}
-
-impl PathSubcommandArguments for PathSplitArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathSplit {
-    fn name(&self) -> &str {
-        "path split"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path split").named(
-            "columns",
-            SyntaxShape::Table,
-            "Optionally operate by column path",
-            Some('c'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Split a path into parts by a separator."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathSplitArguments {
-            columns: column_paths_from_args(&args)?,
-        });
-
-        Ok(operate_split(args.input, &action, tag.span, cmd_args))
-    }
-
-    #[cfg(windows)]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Split a path into parts",
-                example: r"'C:\Users\viking\spam.txt' | path split",
-                result: Some(vec![
-                    Value::from(UntaggedValue::string("C:")),
-                    Value::from(UntaggedValue::string(r"\")),
-                    Value::from(UntaggedValue::string("Users")),
-                    Value::from(UntaggedValue::string("viking")),
-                    Value::from(UntaggedValue::string("spam.txt")),
-                ]),
-            },
-            Example {
-                description: "Split all paths under the 'name' column",
-                example: r"ls ('.' | path expand) | path split -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-
-    #[cfg(not(windows))]
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Split a path into parts",
-                example: r"'/home/viking/spam.txt' | path split",
-                result: Some(vec![
-                    Value::from(UntaggedValue::string("/")),
-                    Value::from(UntaggedValue::string("home")),
-                    Value::from(UntaggedValue::string("viking")),
-                    Value::from(UntaggedValue::string("spam.txt")),
-                ]),
-            },
-            Example {
-                description: "Split all paths under the 'name' column",
-                example: r"ls ('.' | path expand) | path split -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn operate_split<F, T>(
-    input: crate::InputStream,
-    action: &'static F,
-    span: Span,
-    args: Arc<T>,
-) -> OutputStream
-where
-    T: PathSubcommandArguments + Send + Sync + 'static,
-    F: Fn(&Path, Tag, &T) -> Value + Send + Sync + 'static,
-{
-    if args.get_column_paths().is_empty() {
-        // Do not wrap result into a table
-        input
-            .flat_map(move |v| {
-                let split_result = handle_value(&action, &v, span, Arc::clone(&args));
-
-                match split_result {
-                    Ok(Value {
-                        value: UntaggedValue::Table(parts),
-                        ..
-                    }) => parts.into_iter().into_output_stream(),
-                    Err(e) => OutputStream::one(Value::error(e)),
-                    _ => OutputStream::one(Value::error(ShellError::labeled_error(
-                        "Internal Error",
-                        "unexpected result from the split function",
-                        span,
-                    ))),
-                }
-            })
-            .into_output_stream()
-    } else {
-        operate_column_paths(input, action, span, args)
-    }
-}
-
-fn action(path: &Path, tag: Tag, _args: &PathSplitArguments) -> Value {
-    let parts: Vec<Value> = path
-        .components()
-        .map(|comp| {
-            let s = comp.as_os_str().to_string_lossy();
-            UntaggedValue::string(s).into_value(&tag)
-        })
-        .collect();
-
-    UntaggedValue::table(&parts).into_value(tag)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathSplit;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathSplit {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/path/type.rs b/old_nushell/crates/nu-command/src/commands/path/type.rs
deleted file mode 100644
index 041f9fbf0..000000000
--- a/old_nushell/crates/nu-command/src/commands/path/type.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use super::{column_paths_from_args, operate, PathSubcommandArguments};
-use crate::prelude::*;
-use nu_engine::filesystem::filesystem_shell::get_file_type;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Signature, SyntaxShape, UntaggedValue, Value};
-use std::path::Path;
-
-pub struct PathType;
-
-struct PathTypeArguments {
-    columns: Vec<ColumnPath>,
-}
-
-impl PathSubcommandArguments for PathTypeArguments {
-    fn get_column_paths(&self) -> &Vec<ColumnPath> {
-        &self.columns
-    }
-}
-
-impl WholeStreamCommand for PathType {
-    fn name(&self) -> &str {
-        "path type"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("path type").named(
-            "columns",
-            SyntaxShape::Table,
-            "Optionally operate by column path",
-            Some('c'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Get the type of the object a path refers to (e.g., file, dir, symlink)"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let cmd_args = Arc::new(PathTypeArguments {
-            columns: column_paths_from_args(&args)?,
-        });
-
-        Ok(operate(args.input, &action, tag.span, cmd_args))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Show type of a filepath",
-                example: "'.' | path type",
-                result: Some(vec![Value::from("Dir")]),
-            },
-            Example {
-                description: "Show type of a filepath in a column",
-                example: "ls | path type -c [ name ]",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn action(path: &Path, tag: Tag, _args: &PathTypeArguments) -> Value {
-    let meta = std::fs::symlink_metadata(path);
-    let untagged = UntaggedValue::string(match &meta {
-        Ok(md) => get_file_type(md),
-        Err(_) => "",
-    });
-
-    untagged.into_value(tag)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::PathType;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(PathType {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/add.rs b/old_nushell/crates/nu-command/src/commands/pathvar/add.rs
deleted file mode 100644
index 4605a626f..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/add.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-use std::path::PathBuf;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "pathvar add"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar add")
-            .required("path", SyntaxShape::FilePath, "path to add")
-            .named(
-                "var",
-                SyntaxShape::String,
-                "Use a different variable than PATH",
-                Some('v'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Add a filepath to the start of the pathvar"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        add(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Add /usr/local/bin to the pathvar",
-            example: "pathvar add /usr/local/bin",
-            result: None,
-        }]
-    }
-}
-
-pub fn add(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-
-    let var = get_var(&args)?;
-    let path_to_add: Tagged<PathBuf> = args.req(0)?;
-    let path = path_to_add.item.into_os_string().into_string();
-
-    if let Ok(mut path) = path {
-        path.push(NATIVE_PATH_ENV_SEPARATOR);
-        if let Some(old_pathvar) = ctx.scope.get_env(&var) {
-            path.push_str(&old_pathvar);
-            ctx.scope.add_env_var(&var.item, path);
-            Ok(OutputStream::empty())
-        } else {
-            Err(ShellError::unexpected(&format!(
-                "Variable {} not set",
-                &var.item
-            )))
-        }
-    } else {
-        Err(ShellError::labeled_error(
-            "Invalid path.",
-            "cannot convert to string",
-            path_to_add.tag,
-        ))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/append.rs b/old_nushell/crates/nu-command/src/commands/pathvar/append.rs
deleted file mode 100644
index 855cb179c..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/append.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-use std::path::PathBuf;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "pathvar append"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar append")
-            .required("path", SyntaxShape::FilePath, "path to append")
-            .named(
-                "var",
-                SyntaxShape::String,
-                "Use a different variable than PATH",
-                Some('v'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Add a path to the end of the pathvar"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        add(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Append /bin to the pathvar",
-            example: "pathvar append /bin",
-            result: None,
-        }]
-    }
-}
-
-pub fn add(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-
-    let var = get_var(&args)?;
-    let path_to_append_arg: Tagged<PathBuf> = args.req(0)?;
-    let path_to_append = path_to_append_arg.item.into_os_string().into_string();
-
-    if let Ok(path) = path_to_append {
-        if let Some(mut pathvar) = ctx.scope.get_env(&var) {
-            pathvar.push(NATIVE_PATH_ENV_SEPARATOR);
-            pathvar.push_str(&path);
-            ctx.scope.add_env_var(&var.item, pathvar);
-            Ok(OutputStream::empty())
-        } else {
-            Err(ShellError::unexpected(&format!(
-                "Variable {} not set",
-                &var.item
-            )))
-        }
-    } else {
-        Err(ShellError::labeled_error(
-            "Invalid path.",
-            "cannot convert to string",
-            path_to_append_arg.tag,
-        ))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/command.rs b/old_nushell/crates/nu-command/src/commands/pathvar/command.rs
deleted file mode 100644
index 74d84eff4..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/command.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "pathvar"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar").named(
-            "var",
-            SyntaxShape::String,
-            "Use a different variable than PATH",
-            Some('v'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        r#"Manipulate the PATH variable (pathvar) or a different variable following the
-same rules."#
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        get_pathvar(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Display the current session's pathvar",
-                example: "pathvar",
-                result: None,
-            },
-            Example {
-                description: "Display the current session's LD_LIBRARY_PATH",
-                example: "pathvar -v LD_LIBRARY_PATH",
-                result: None,
-            },
-            Example {
-                description: "Add /usr/bin to the pathvar",
-                example: "pathvar add /usr/bin",
-                result: None,
-            },
-            Example {
-                description: "Remove the 3rd path in the pathvar",
-                example: "pathvar remove 2",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn get_pathvar(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let var = get_var(&args)?;
-
-    if let Some(pathvar) = args.context.scope.get_env(&var) {
-        let pathvar: Vec<Value> = pathvar
-            .split(NATIVE_PATH_ENV_SEPARATOR)
-            .map(Value::from)
-            .collect();
-
-        Ok(OutputStream::from(pathvar))
-    } else {
-        Err(ShellError::unexpected(&format!(
-            "Variable {} not set",
-            &var.item
-        )))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/mod.rs b/old_nushell/crates/nu-command/src/commands/pathvar/mod.rs
deleted file mode 100644
index 9825ccefd..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/mod.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-pub mod add;
-pub mod append;
-pub mod command;
-pub mod remove;
-pub mod reset;
-pub mod save;
-
-pub use add::SubCommand as PathvarAdd;
-pub use append::SubCommand as PathvarAppend;
-pub use command::Command as Pathvar;
-pub use remove::SubCommand as PathvarRemove;
-pub use reset::SubCommand as PathvarReset;
-pub use save::SubCommand as PathvarSave;
-
-use nu_engine::CommandArgs;
-use nu_errors::ShellError;
-use nu_source::{Tagged, TaggedItem};
-use nu_test_support::NATIVE_PATH_ENV_VAR;
-
-fn get_var(args: &CommandArgs) -> Result<Tagged<String>, ShellError> {
-    Ok(args
-        .get_flag("var")?
-        .unwrap_or_else(|| String::from(NATIVE_PATH_ENV_VAR))
-        .tagged_unknown())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/remove.rs b/old_nushell/crates/nu-command/src/commands/pathvar/remove.rs
deleted file mode 100644
index 035004843..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/remove.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "pathvar remove"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar remove")
-            .required(
-                "index",
-                SyntaxShape::Int,
-                "index of the path to remove (starting at 0)",
-            )
-            .named(
-                "var",
-                SyntaxShape::String,
-                "Use a different variable than PATH",
-                Some('v'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Remove a path from the pathvar"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        remove(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Remove the second path from the pathvar",
-            example: "pathvar remove 1",
-            result: None,
-        }]
-    }
-}
-
-pub fn remove(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = &args.context;
-
-    let var = get_var(&args)?;
-    let index_to_remove_arg: Tagged<u64> = args.req(0)?;
-    let index_to_remove = index_to_remove_arg.item as usize;
-
-    if let Some(old_pathvar) = ctx.scope.get_env(&var) {
-        let mut paths: Vec<&str> = old_pathvar.split(NATIVE_PATH_ENV_SEPARATOR).collect();
-
-        if index_to_remove >= paths.len() {
-            return Err(ShellError::labeled_error(
-                "Index out of bounds",
-                format!("the index must be between 0 and {}", paths.len() - 1),
-                index_to_remove_arg.tag,
-            ));
-        }
-
-        paths.remove(index_to_remove);
-        ctx.scope.add_env_var(
-            &var.item,
-            paths.join(&NATIVE_PATH_ENV_SEPARATOR.to_string()),
-        );
-
-        Ok(OutputStream::empty())
-    } else {
-        Err(ShellError::unexpected(&format!(
-            "Variable {} not set",
-            &var.item
-        )))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/reset.rs b/old_nushell/crates/nu-command/src/commands/pathvar/reset.rs
deleted file mode 100644
index e8038e13f..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/reset.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "pathvar reset"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar reset").named(
-            "var",
-            SyntaxShape::String,
-            "Use a different variable than PATH",
-            Some('v'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Reset the pathvar to the one specified in the config"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        reset(args)
-    }
-}
-
-pub fn reset(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let var = get_var(&args)?;
-    let var_lower = var.clone().map(|s| s.to_lowercase());
-
-    if let Some(global_cfg) = &mut ctx.configs().lock().global_config {
-        let default_pathvar = global_cfg.vars.get(&var_lower.item);
-        if let Some(pathvar) = default_pathvar {
-            if let UntaggedValue::Table(paths) = &pathvar.value {
-                let pathvar_str = paths
-                    .iter()
-                    .map(|x| x.as_string().expect("Error converting path to string"))
-                    .join(&NATIVE_PATH_ENV_SEPARATOR.to_string());
-                ctx.scope.add_env_var(&var.item, pathvar_str);
-            }
-        } else {
-            return Err(ShellError::untagged_runtime_error(&format!(
-                "Default {} is not set in config file.",
-                &var_lower.item
-            )));
-        }
-        Ok(OutputStream::empty())
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/pathvar/save.rs b/old_nushell/crates/nu-command/src/commands/pathvar/save.rs
deleted file mode 100644
index 5684019a2..000000000
--- a/old_nushell/crates/nu-command/src/commands/pathvar/save.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use super::get_var;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_test_support::NATIVE_PATH_ENV_SEPARATOR;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "pathvar save"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pathvar save").named(
-            "var",
-            SyntaxShape::String,
-            "Use a different variable than PATH",
-            Some('v'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Save the current pathvar to the config file"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        save(args)
-    }
-}
-pub fn save(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let ctx = &args.context;
-
-    let var = get_var(&args)?;
-    let var_lower = var.clone().map(|s| s.to_lowercase());
-
-    if let Some(global_cfg) = &mut ctx.configs().lock().global_config {
-        if let Some(pathvar) = ctx.scope.get_env(&var) {
-            let paths: Vec<Value> = pathvar
-                .split(NATIVE_PATH_ENV_SEPARATOR)
-                .map(Value::from)
-                .collect();
-
-            let span_range = 0..paths.len();
-            let row = Value::new(
-                UntaggedValue::Table(paths),
-                Tag::from(Span::from(&span_range)),
-            );
-
-            global_cfg.vars.insert(var_lower.item, row);
-            global_cfg.write()?;
-            ctx.reload_config(global_cfg)?;
-
-            Ok(OutputStream::empty())
-        } else {
-            Err(ShellError::unexpected(&format!(
-                "Variable {} not set",
-                &var.item
-            )))
-        }
-    } else {
-        let value = UntaggedValue::Error(crate::commands::config::err_no_global_cfg_present())
-            .into_value(name);
-
-        Ok(OutputStream::one(value))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/ansi/command.rs b/old_nushell/crates/nu-command/src/commands/platform/ansi/command.rs
deleted file mode 100644
index 3c1e2ceef..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/ansi/command.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-use crate::prelude::*;
-use nu_ansi_term::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "ansi"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ansi")
-            .optional(
-                "code",
-                SyntaxShape::Any,
-                "the name of the code to use like 'green' or 'reset' to reset the color",
-            )
-            .named(
-                "escape", // \x1b[
-                SyntaxShape::Any,
-                "escape sequence without the escape character(s)",
-                Some('e'),
-            )
-            .named(
-                "osc", // \x1b]
-                SyntaxShape::Any,
-                "operating system command (ocs) escape sequence without the escape character(s)",
-                Some('o'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Output ANSI codes to change color."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"For escape sequences:
-Escape: '\x1b[' is not required for --escape parameter
-Format: #(;#)m
-Example: 1;31m for bold red or 2;37;41m for dimmed white fg with red bg
-There can be multiple text formatting sequence numbers
-separated by a ; and ending with an m where the # is of the
-following values:
-    attributes
-    0    reset / normal display
-    1    bold or increased intensity
-    2    faint or decreased intensity
-    3    italic on (non-mono font)
-    4    underline on
-    5    slow blink on
-    6    fast blink on
-    7    reverse video on
-    8    nondisplayed (invisible) on
-    9    strike-through on
-
-    foreground/bright colors    background/bright colors
-    30/90    black              40/100    black
-    31/91    red                41/101    red
-    32/92    green              42/102    green
-    33/93    yellow             43/103    yellow
-    34/94    blue               44/104    blue
-    35/95    magenta            45/105    magenta
-    36/96    cyan               46/106    cyan
-    37/97    white              47/107    white
-    https://en.wikipedia.org/wiki/ANSI_escape_code
-
-OSC: '\x1b]' is not required for --osc parameter
-Example: echo [(ansi -o '0') 'some title' (char bel)] | str collect
-Format: #
-    0 Set window title and icon name
-    1 Set icon name
-    2 Set window title
-    4 Set/read color palette
-    9 iTerm2 Grown notifications
-    10 Set foreground color (x11 color spec)
-    11 Set background color (x11 color spec)
-    ... others"#
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Change color to green",
-                example: r#"ansi green"#,
-                result: Some(vec![Value::from("\u{1b}[32m")]),
-            },
-            Example {
-                description: "Reset the color",
-                example: r#"ansi reset"#,
-                result: Some(vec![Value::from("\u{1b}[0m")]),
-            },
-            Example {
-                description:
-                    "Use ansi to color text (rb = red bold, gb = green bold, pb = purple bold)",
-                example: r#"echo [(ansi rb) Hello " " (ansi gb) Nu " " (ansi pb) World] | str collect"#,
-                result: Some(vec![Value::from(
-                    "\u{1b}[1;31mHello \u{1b}[1;32mNu \u{1b}[1;35mWorld",
-                )]),
-            },
-            Example {
-                description:
-                    "Use ansi to color text (rb = red bold, gb = green bold, pb = purple bold)",
-                example: r#"echo [(ansi -e '3;93;41m') Hello (ansi reset) " " (ansi gb) Nu " " (ansi pb) World] | str collect"#,
-                result: Some(vec![Value::from(
-                    "\u{1b}[3;93;41mHello\u{1b}[0m \u{1b}[1;32mNu \u{1b}[1;35mWorld",
-                )]),
-            },
-        ]
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let code: Option<Tagged<String>> = args.opt(0)?;
-        let escape: Option<Tagged<String>> = args.get_flag("escape")?;
-        let osc: Option<Tagged<String>> = args.get_flag("osc")?;
-
-        if let Some(e) = escape {
-            let esc_vec: Vec<char> = e.item.chars().collect();
-            if esc_vec[0] == '\\' {
-                return Err(ShellError::labeled_error(
-                    "no need for escape characters",
-                    "no need for escape characters",
-                    e.tag(),
-                ));
-            }
-            let output = format!("\x1b[{}", e.item);
-            return Ok(OutputStream::one(
-                UntaggedValue::string(output).into_value(e.tag()),
-            ));
-        }
-
-        if let Some(o) = osc {
-            let osc_vec: Vec<char> = o.item.chars().collect();
-            if osc_vec[0] == '\\' {
-                return Err(ShellError::labeled_error(
-                    "no need for escape characters",
-                    "no need for escape characters",
-                    o.tag(),
-                ));
-            }
-
-            //Operating system command aka osc  ESC ] <- note the right brace, not left brace for osc
-            // OCS's need to end with a bell '\x07' char
-            let output = format!("\x1b]{};", o.item);
-            return Ok(OutputStream::one(
-                UntaggedValue::string(output).into_value(o.tag()),
-            ));
-        }
-
-        if let Some(code) = code {
-            let ansi_code = str_to_ansi(&code.item);
-
-            if let Some(output) = ansi_code {
-                Ok(OutputStream::one(
-                    UntaggedValue::string(output).into_value(code.tag()),
-                ))
-            } else {
-                Err(ShellError::labeled_error(
-                    "Unknown ansi code",
-                    "unknown ansi code",
-                    code.tag(),
-                ))
-            }
-        } else {
-            Err(ShellError::labeled_error(
-                "Expected ansi code",
-                "expect ansi code",
-                &args.call_info.name_tag,
-            ))
-        }
-    }
-}
-
-pub fn str_to_ansi(s: &str) -> Option<String> {
-    match s {
-        "g" | "green" => Some(Color::Green.prefix().to_string()),
-        "gb" | "green_bold" => Some(Color::Green.bold().prefix().to_string()),
-        "gu" | "green_underline" => Some(Color::Green.underline().prefix().to_string()),
-        "gi" | "green_italic" => Some(Color::Green.italic().prefix().to_string()),
-        "gd" | "green_dimmed" => Some(Color::Green.dimmed().prefix().to_string()),
-        "gr" | "green_reverse" => Some(Color::Green.reverse().prefix().to_string()),
-
-        "lg" | "light_green" => Some(Color::LightGreen.prefix().to_string()),
-        "lgb" | "light_green_bold" => Some(Color::LightGreen.bold().prefix().to_string()),
-        "lgu" | "light_green_underline" => Some(Color::LightGreen.underline().prefix().to_string()),
-        "lgi" | "light_green_italic" => Some(Color::LightGreen.italic().prefix().to_string()),
-        "lgd" | "light_green_dimmed" => Some(Color::LightGreen.dimmed().prefix().to_string()),
-        "lgr" | "light_green_reverse" => Some(Color::LightGreen.reverse().prefix().to_string()),
-
-        "r" | "red" => Some(Color::Red.prefix().to_string()),
-        "rb" | "red_bold" => Some(Color::Red.bold().prefix().to_string()),
-        "ru" | "red_underline" => Some(Color::Red.underline().prefix().to_string()),
-        "ri" | "red_italic" => Some(Color::Red.italic().prefix().to_string()),
-        "rd" | "red_dimmed" => Some(Color::Red.dimmed().prefix().to_string()),
-        "rr" | "red_reverse" => Some(Color::Red.reverse().prefix().to_string()),
-
-        "lr" | "light_red" => Some(Color::LightRed.prefix().to_string()),
-        "lrb" | "light_red_bold" => Some(Color::LightRed.bold().prefix().to_string()),
-        "lru" | "light_red_underline" => Some(Color::LightRed.underline().prefix().to_string()),
-        "lri" | "light_red_italic" => Some(Color::LightRed.italic().prefix().to_string()),
-        "lrd" | "light_red_dimmed" => Some(Color::LightRed.dimmed().prefix().to_string()),
-        "lrr" | "light_red_reverse" => Some(Color::LightRed.reverse().prefix().to_string()),
-
-        "u" | "blue" => Some(Color::Blue.prefix().to_string()),
-        "ub" | "blue_bold" => Some(Color::Blue.bold().prefix().to_string()),
-        "uu" | "blue_underline" => Some(Color::Blue.underline().prefix().to_string()),
-        "ui" | "blue_italic" => Some(Color::Blue.italic().prefix().to_string()),
-        "ud" | "blue_dimmed" => Some(Color::Blue.dimmed().prefix().to_string()),
-        "ur" | "blue_reverse" => Some(Color::Blue.reverse().prefix().to_string()),
-
-        "lu" | "light_blue" => Some(Color::LightBlue.prefix().to_string()),
-        "lub" | "light_blue_bold" => Some(Color::LightBlue.bold().prefix().to_string()),
-        "luu" | "light_blue_underline" => Some(Color::LightBlue.underline().prefix().to_string()),
-        "lui" | "light_blue_italic" => Some(Color::LightBlue.italic().prefix().to_string()),
-        "lud" | "light_blue_dimmed" => Some(Color::LightBlue.dimmed().prefix().to_string()),
-        "lur" | "light_blue_reverse" => Some(Color::LightBlue.reverse().prefix().to_string()),
-
-        "b" | "black" => Some(Color::Black.prefix().to_string()),
-        "bb" | "black_bold" => Some(Color::Black.bold().prefix().to_string()),
-        "bu" | "black_underline" => Some(Color::Black.underline().prefix().to_string()),
-        "bi" | "black_italic" => Some(Color::Black.italic().prefix().to_string()),
-        "bd" | "black_dimmed" => Some(Color::Black.dimmed().prefix().to_string()),
-        "br" | "black_reverse" => Some(Color::Black.reverse().prefix().to_string()),
-
-        "ligr" | "light_gray" => Some(Color::LightGray.prefix().to_string()),
-        "ligrb" | "light_gray_bold" => Some(Color::LightGray.bold().prefix().to_string()),
-        "ligru" | "light_gray_underline" => Some(Color::LightGray.underline().prefix().to_string()),
-        "ligri" | "light_gray_italic" => Some(Color::LightGray.italic().prefix().to_string()),
-        "ligrd" | "light_gray_dimmed" => Some(Color::LightGray.dimmed().prefix().to_string()),
-        "ligrr" | "light_gray_reverse" => Some(Color::LightGray.reverse().prefix().to_string()),
-
-        "y" | "yellow" => Some(Color::Yellow.prefix().to_string()),
-        "yb" | "yellow_bold" => Some(Color::Yellow.bold().prefix().to_string()),
-        "yu" | "yellow_underline" => Some(Color::Yellow.underline().prefix().to_string()),
-        "yi" | "yellow_italic" => Some(Color::Yellow.italic().prefix().to_string()),
-        "yd" | "yellow_dimmed" => Some(Color::Yellow.dimmed().prefix().to_string()),
-        "yr" | "yellow_reverse" => Some(Color::Yellow.reverse().prefix().to_string()),
-
-        "ly" | "light_yellow" => Some(Color::LightYellow.prefix().to_string()),
-        "lyb" | "light_yellow_bold" => Some(Color::LightYellow.bold().prefix().to_string()),
-        "lyu" | "light_yellow_underline" => {
-            Some(Color::LightYellow.underline().prefix().to_string())
-        }
-        "lyi" | "light_yellow_italic" => Some(Color::LightYellow.italic().prefix().to_string()),
-        "lyd" | "light_yellow_dimmed" => Some(Color::LightYellow.dimmed().prefix().to_string()),
-        "lyr" | "light_yellow_reverse" => Some(Color::LightYellow.reverse().prefix().to_string()),
-
-        "p" | "purple" => Some(Color::Purple.prefix().to_string()),
-        "pb" | "purple_bold" => Some(Color::Purple.bold().prefix().to_string()),
-        "pu" | "purple_underline" => Some(Color::Purple.underline().prefix().to_string()),
-        "pi" | "purple_italic" => Some(Color::Purple.italic().prefix().to_string()),
-        "pd" | "purple_dimmed" => Some(Color::Purple.dimmed().prefix().to_string()),
-        "pr" | "purple_reverse" => Some(Color::Purple.reverse().prefix().to_string()),
-
-        "lp" | "light_purple" => Some(Color::LightPurple.prefix().to_string()),
-        "lpb" | "light_purple_bold" => Some(Color::LightPurple.bold().prefix().to_string()),
-        "lpu" | "light_purple_underline" => {
-            Some(Color::LightPurple.underline().prefix().to_string())
-        }
-        "lpi" | "light_purple_italic" => Some(Color::LightPurple.italic().prefix().to_string()),
-        "lpd" | "light_purple_dimmed" => Some(Color::LightPurple.dimmed().prefix().to_string()),
-        "lpr" | "light_purple_reverse" => Some(Color::LightPurple.reverse().prefix().to_string()),
-
-        "c" | "cyan" => Some(Color::Cyan.prefix().to_string()),
-        "cb" | "cyan_bold" => Some(Color::Cyan.bold().prefix().to_string()),
-        "cu" | "cyan_underline" => Some(Color::Cyan.underline().prefix().to_string()),
-        "ci" | "cyan_italic" => Some(Color::Cyan.italic().prefix().to_string()),
-        "cd" | "cyan_dimmed" => Some(Color::Cyan.dimmed().prefix().to_string()),
-        "cr" | "cyan_reverse" => Some(Color::Cyan.reverse().prefix().to_string()),
-
-        "lc" | "light_cyan" => Some(Color::LightCyan.prefix().to_string()),
-        "lcb" | "light_cyan_bold" => Some(Color::LightCyan.bold().prefix().to_string()),
-        "lcu" | "light_cyan_underline" => Some(Color::LightCyan.underline().prefix().to_string()),
-        "lci" | "light_cyan_italic" => Some(Color::LightCyan.italic().prefix().to_string()),
-        "lcd" | "light_cyan_dimmed" => Some(Color::LightCyan.dimmed().prefix().to_string()),
-        "lcr" | "light_cyan_reverse" => Some(Color::LightCyan.reverse().prefix().to_string()),
-
-        "w" | "white" => Some(Color::White.prefix().to_string()),
-        "wb" | "white_bold" => Some(Color::White.bold().prefix().to_string()),
-        "wu" | "white_underline" => Some(Color::White.underline().prefix().to_string()),
-        "wi" | "white_italic" => Some(Color::White.italic().prefix().to_string()),
-        "wd" | "white_dimmed" => Some(Color::White.dimmed().prefix().to_string()),
-        "wr" | "white_reverse" => Some(Color::White.reverse().prefix().to_string()),
-
-        "dgr" | "dark_gray" => Some(Color::DarkGray.prefix().to_string()),
-        "dgrb" | "dark_gray_bold" => Some(Color::DarkGray.bold().prefix().to_string()),
-        "dgru" | "dark_gray_underline" => Some(Color::DarkGray.underline().prefix().to_string()),
-        "dgri" | "dark_gray_italic" => Some(Color::DarkGray.italic().prefix().to_string()),
-        "dgrd" | "dark_gray_dimmed" => Some(Color::DarkGray.dimmed().prefix().to_string()),
-        "dgrr" | "dark_gray_reverse" => Some(Color::DarkGray.reverse().prefix().to_string()),
-
-        "reset" => Some("\x1b[0m".to_owned()),
-
-        // Reference for ansi codes https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
-        // Another good reference http://ascii-table.com/ansi-escape-sequences.php
-
-        // For setting title like `echo [(char title) (pwd) (char bel)] | str collect`
-        "title" => Some("\x1b]2;".to_string()), // ESC]2; xterm sets window title using OSC syntax escapes
-
-        // Ansi Erase Sequences
-        "clear_screen" => Some("\x1b[J".to_string()), // clears the screen
-        "clear_screen_from_cursor_to_end" => Some("\x1b[0J".to_string()), // clears from cursor until end of screen
-        "clear_screen_from_cursor_to_beginning" => Some("\x1b[1J".to_string()), // clears from cursor to beginning of screen
-        "cls" | "clear_entire_screen" => Some("\x1b[2J".to_string()), // clears the entire screen
-        "erase_line" => Some("\x1b[K".to_string()),                   // clears the current line
-        "erase_line_from_cursor_to_end" => Some("\x1b[0K".to_string()), // clears from cursor to end of line
-        "erase_line_from_cursor_to_beginning" => Some("\x1b[1K".to_string()), // clears from cursor to start of line
-        "erase_entire_line" => Some("\x1b[2K".to_string()),                   // clears entire line
-
-        // Turn on/off cursor
-        "cursor_off" => Some("\x1b[?25l".to_string()),
-        "cursor_on" => Some("\x1b[?25h".to_string()),
-
-        // Turn on/off blinking
-        "cursor_blink_off" => Some("\x1b[?12l".to_string()),
-        "cursor_blink_on" => Some("\x1b[?12h".to_string()),
-
-        // Cursor position in ESC [ <r>;<c>R where r = row and c = column
-        "cursor_position" => Some("\x1b[6n".to_string()),
-
-        // Report Terminal Identity
-        "identity" => Some("\x1b[0c".to_string()),
-
-        // Ansi escape only - CSI command
-        "csi" | "escape" | "escape_left" => Some("\x1b[".to_string()),
-        // OSC escape (Operating system command)
-        "osc" | "escape_right" => Some("\x1b]".to_string()),
-        // OSC string terminator
-        "string_terminator" | "st" | "str_term" => Some("\x1b\\".to_string()),
-
-        // Ansi Rgb - Needs to be 32;2;r;g;b or 48;2;r;g;b
-        // assuming the rgb will be passed via command and no here
-        "rgb_fg" => Some("\x1b[38;2;".to_string()),
-        "rgb_bg" => Some("\x1b[48;2;".to_string()),
-
-        // Ansi color index - Needs 38;5;idx or 48;5;idx where idx = 0 to 255
-        "idx_fg" | "color_idx_fg" => Some("\x1b[38;5;".to_string()),
-        "idx_bg" | "color_idx_bg" => Some("\x1b[48;5;".to_string()),
-
-        // Returns terminal size like "[<r>;<c>R" where r is rows and c is columns
-        // This should work assuming your terminal is not greater than 999x999
-        "size" => Some("\x1b[s\x1b[999;999H\x1b[6n\x1b[u".to_string()),
-
-        _ => None,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/ansi/gradient.rs b/old_nushell/crates/nu-command/src/commands/platform/ansi/gradient.rs
deleted file mode 100644
index d8433ca8f..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/ansi/gradient.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-use crate::prelude::*;
-use nu_ansi_term::{build_all_gradient_text, gradient::TargetGround, Gradient, Rgb};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tag;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "ansi gradient"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ansi gradient")
-            .named(
-                "fgstart",
-                SyntaxShape::String,
-                "foreground gradient start color in hex (0x123456)",
-                Some('a'),
-            )
-            .named(
-                "fgend",
-                SyntaxShape::String,
-                "foreground gradient end color in hex",
-                Some('b'),
-            )
-            .named(
-                "bgstart",
-                SyntaxShape::String,
-                "background gradient start color in hex",
-                Some('c'),
-            )
-            .named(
-                "bgend",
-                SyntaxShape::String,
-                "background gradient end color in hex",
-                Some('d'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally, draw gradients using text from column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "draw text with a provided start and end code making a gradient"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-            description: "draw text in a gradient with foreground start and end colors",
-            example:
-                "echo 'Hello, Nushell! This is a gradient.' | ansi gradient --fgstart 0x40c9ff --fgend 0xe81cff",
-            result: None,
-        },
-        Example {
-            description: "draw text in a gradient with foreground start and end colors and background start and end colors",
-            example:
-                "echo 'Hello, Nushell! This is a gradient.' | ansi gradient --fgstart 0x40c9ff --fgend 0xe81cff --bgstart 0xe81cff --bgend 0x40c9ff",
-            result: None,
-        },
-        Example {
-            description: "draw text in a gradient by specifying foreground start color - end color is assumed to be black",
-            example:
-                "echo 'Hello, Nushell! This is a gradient.' | ansi gradient --fgstart 0x40c9ff",
-            result: None,
-        },
-        Example {
-            description: "draw text in a gradient by specifying foreground end color - start color is assumed to be black",
-            example:
-                "echo 'Hello, Nushell! This is a gradient.' | ansi gradient --fgend 0xe81cff",
-            result: None,
-        },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let fgstart: Option<Value> = args.get_flag("fgstart")?;
-    let fgend: Option<Value> = args.get_flag("fgend")?;
-    let bgstart: Option<Value> = args.get_flag("bgstart")?;
-    let bgend: Option<Value> = args.get_flag("bgend")?;
-    let column_paths: Vec<_> = args.rest(0)?;
-
-    let fgs_hex = fgstart.map(|color| Rgb::from_hex_string(color.convert_to_string()));
-    let fge_hex = fgend.map(|color| Rgb::from_hex_string(color.convert_to_string()));
-    let bgs_hex = bgstart.map(|color| Rgb::from_hex_string(color.convert_to_string()));
-    let bge_hex = bgend.map(|color| Rgb::from_hex_string(color.convert_to_string()));
-
-    let result: Vec<Value> = args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag(), fgs_hex, fge_hex, bgs_hex, bge_hex)
-            } else {
-                let mut ret = v;
-
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| {
-                            action(old, old.tag(), fgs_hex, fge_hex, bgs_hex, bge_hex)
-                        }),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .collect::<Result<Vec<Value>, _>>()?;
-
-    Ok(OutputStream::from_stream(result.into_iter()))
-}
-
-fn action(
-    input: &Value,
-    tag: impl Into<Tag>,
-    fg_start: Option<Rgb>,
-    fg_end: Option<Rgb>,
-    bg_start: Option<Rgb>,
-    bg_end: Option<Rgb>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(astring)) => {
-            match (fg_start, fg_end, bg_start, bg_end) {
-                (None, None, None, None) => {
-                    // Error - no colors
-                    Err(ShellError::labeled_error(
-                        "please supply color parameters",
-                        "please supply foreground and/or background color parameters",
-                        Tag::unknown(),
-                    ))
-                }
-                (None, None, None, Some(bg_end)) => {
-                    // Error - missing bg_start, so assume black
-                    let bg_start = Rgb::new(0, 0, 0);
-                    let gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Background);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, None, Some(bg_start), None) => {
-                    // Error - missing bg_end, so assume black
-                    let bg_end = Rgb::new(0, 0, 0);
-                    let gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Background);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, None, Some(bg_start), Some(bg_end)) => {
-                    // Background Only
-                    let gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Background);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, Some(fg_end), None, None) => {
-                    // Error - missing fg_start, so assume black
-                    let fg_start = Rgb::new(0, 0, 0);
-                    let gradient = Gradient::new(fg_start, fg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Foreground);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, Some(fg_end), None, Some(bg_end)) => {
-                    // missing fg_start and bg_start, so assume black
-                    let fg_start = Rgb::new(0, 0, 0);
-                    let bg_start = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, Some(fg_end), Some(bg_start), None) => {
-                    // Error - missing fg_start and bg_end
-                    let fg_start = Rgb::new(0, 0, 0);
-                    let bg_end = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (None, Some(fg_end), Some(bg_start), Some(bg_end)) => {
-                    // Error - missing fg_start, so assume black
-                    let fg_start = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), None, None, None) => {
-                    // Error - missing fg_end, so assume black
-                    let fg_end = Rgb::new(0, 0, 0);
-                    let gradient = Gradient::new(fg_start, fg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Foreground);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), None, None, Some(bg_end)) => {
-                    // Error - missing fg_end, bg_start, so assume black
-                    let fg_end = Rgb::new(0, 0, 0);
-                    let bg_start = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), None, Some(bg_start), None) => {
-                    // Error - missing fg_end, bg_end, so assume black
-                    let fg_end = Rgb::new(0, 0, 0);
-                    let bg_end = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), None, Some(bg_start), Some(bg_end)) => {
-                    // Error - missing fg_end, so assume black
-                    let fg_end = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), Some(fg_end), None, None) => {
-                    // Foreground Only
-                    let gradient = Gradient::new(fg_start, fg_end);
-                    let gradient_string = gradient.build(astring, TargetGround::Foreground);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), Some(fg_end), None, Some(bg_end)) => {
-                    // Error - missing bg_start, so assume black
-                    let bg_start = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), Some(fg_end), Some(bg_start), None) => {
-                    // Error - missing bg_end, so assume black
-                    let bg_end = Rgb::new(0, 0, 0);
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-                (Some(fg_start), Some(fg_end), Some(bg_start), Some(bg_end)) => {
-                    // Foreground and Background Gradient
-                    let fg_gradient = Gradient::new(fg_start, fg_end);
-                    let bg_gradient = Gradient::new(bg_start, bg_end);
-                    let gradient_string =
-                        build_all_gradient_text(astring, fg_gradient, bg_gradient);
-                    Ok(UntaggedValue::string(gradient_string).into_value(tag))
-                }
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_ansi_term::Rgb;
-    use nu_protocol::UntaggedValue;
-    use nu_source::Tag;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    // #[test]
-    // fn test_stripping() {
-    //     let input_string =
-    //         UntaggedValue::string("\u{1b}[3;93;41mHello\u{1b}[0m \u{1b}[1;32mNu \u{1b}[1;35mWorld")
-    //             .into_untagged_value();
-    //     let expected = UntaggedValue::string("Hello Nu World").into_untagged_value();
-
-    //     let actual = action(&input_string, Tag::unknown()).unwrap();
-    //     assert_eq!(actual, expected);
-    // }
-
-    #[test]
-    fn test_fg_gradient() {
-        let input_string = UntaggedValue::string("Hello, World!").into_untagged_value();
-        let expected = UntaggedValue::string("\u{1b}[38;2;64;201;255mH\u{1b}[38;2;76;187;254me\u{1b}[38;2;89;174;254ml\u{1b}[38;2;102;160;254ml\u{1b}[38;2;115;147;254mo\u{1b}[38;2;128;133;254m,\u{1b}[38;2;141;120;254m \u{1b}[38;2;153;107;254mW\u{1b}[38;2;166;94;254mo\u{1b}[38;2;179;80;254mr\u{1b}[38;2;192;67;254ml\u{1b}[38;2;205;53;254md\u{1b}[38;2;218;40;254m!\u{1b}[0m").into_untagged_value();
-        let fg_start = Rgb::from_hex_string("0x40c9ff".to_string());
-        let fg_end = Rgb::from_hex_string("0xe81cff".to_string());
-        let actual = action(
-            &input_string,
-            Tag::unknown(),
-            Some(fg_start),
-            Some(fg_end),
-            None,
-            None,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/ansi/mod.rs b/old_nushell/crates/nu-command/src/commands/platform/ansi/mod.rs
deleted file mode 100644
index e7bbad5b7..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/ansi/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod command;
-mod gradient;
-mod strip;
-
-pub use command::Command as Ansi;
-pub use gradient::SubCommand as AnsiGradient;
-pub use strip::SubCommand as AnsiStrip;
diff --git a/old_nushell/crates/nu-command/src/commands/platform/ansi/strip.rs b/old_nushell/crates/nu-command/src/commands/platform/ansi/strip.rs
deleted file mode 100644
index 6e59c824e..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/ansi/strip.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tag;
-use strip_ansi_escapes::strip;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "ansi strip"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ansi strip").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally, remove ansi sequences by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "strip ansi escape sequences from string"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "strip ansi escape sequences from string",
-            example: "echo [(ansi gb) 'hello' (ansi reset)] | str collect | ansi strip",
-            result: None,
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let column_paths: Vec<_> = args.rest(0)?;
-
-    let result: Vec<Value> = args
-        .input
-        .map(move |v| {
-            if column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-
-                for path in &column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .collect::<Result<Vec<Value>, _>>()?;
-
-    Ok(OutputStream::from_stream(result.into_iter()))
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(astring)) => {
-            let stripped_string = {
-                if let Ok(bytes) = strip(&astring) {
-                    String::from_utf8_lossy(&bytes).to_string()
-                } else {
-                    astring.to_string()
-                }
-            };
-
-            Ok(UntaggedValue::string(stripped_string).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_protocol::UntaggedValue;
-    use nu_source::Tag;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn test_stripping() {
-        let input_string =
-            UntaggedValue::string("\u{1b}[3;93;41mHello\u{1b}[0m \u{1b}[1;32mNu \u{1b}[1;35mWorld")
-                .into_untagged_value();
-        let expected = UntaggedValue::string("Hello Nu World").into_untagged_value();
-
-        let actual = action(&input_string, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/benchmark.rs b/old_nushell/crates/nu-command/src/commands/platform/benchmark.rs
deleted file mode 100644
index a27586372..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/benchmark.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-use crate::prelude::*;
-// #[cfg(feature = "rich-benchmark")]
-// use heim::cpu::time;
-use nu_engine::run_block;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir::{
-        Block, CapturedBlock, ClassifiedCommand, ExternalRedirection, Group, InternalCommand,
-        Pipeline,
-    },
-    Dictionary, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use rand::{
-    distributions::{Alphanumeric, Distribution},
-    thread_rng, Rng,
-};
-use std::time::Instant;
-
-pub struct Benchmark;
-
-#[derive(Debug)]
-struct BenchmarkArgs {
-    block: CapturedBlock,
-    passthrough: Option<CapturedBlock>,
-}
-
-impl WholeStreamCommand for Benchmark {
-    fn name(&self) -> &str {
-        "benchmark"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("benchmark")
-            .required(
-                "block",
-                SyntaxShape::Block,
-                "the block to run and benchmark",
-            )
-            .named(
-                "passthrough",
-                SyntaxShape::Block,
-                "Display the benchmark results and pass through the block's output",
-                Some('p'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Runs a block and returns the time it took to execute it."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        benchmark(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Benchmarks a command within a block",
-                example: "benchmark { sleep 500ms }",
-                result: None,
-            },
-            Example {
-                description: "Benchmarks a command within a block and passes its output through",
-                example: "echo 45 | benchmark { sleep 500ms } --passthrough {}",
-                result: Some(vec![UntaggedValue::int(45).into()]),
-            },
-        ]
-    }
-}
-
-fn benchmark(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.args.span;
-    let mut context = args.context.clone();
-    let scope = args.scope().clone();
-
-    let cmd_args = BenchmarkArgs {
-        block: args.req(0)?,
-        passthrough: args.get_flag("passthrough")?,
-    };
-
-    let env = scope.get_env_vars();
-    let name = generate_free_name(&env);
-
-    scope.add_env_var(name, generate_random_env_value());
-
-    let start_time = Instant::now();
-
-    // #[cfg(feature = "rich-benchmark")]
-    // let start = time();
-
-    context.scope.enter_scope();
-    let result = run_block(
-        &cmd_args.block.block,
-        &context,
-        args.input,
-        ExternalRedirection::StdoutAndStderr,
-    );
-
-    context.scope.exit_scope();
-    let output = result?.into_vec();
-
-    // #[cfg(feature = "rich-benchmark")]
-    // let end = time();
-
-    let end_time = Instant::now();
-    context.clear_errors();
-
-    // return basic runtime
-    //#[cfg(not(feature = "rich-benchmark"))]
-    {
-        let mut indexmap = IndexMap::with_capacity(1);
-
-        let real_time = (end_time - start_time).as_nanos() as i64;
-        indexmap.insert("real time".to_string(), real_time);
-        benchmark_output(indexmap, output, cmd_args.passthrough, &tag, &mut context)
-    }
-    // return advanced stats
-    // #[cfg(feature = "rich-benchmark")]
-    // if let (Ok(start), Ok(end)) = (start, end) {
-    //     let mut indexmap = IndexMap::with_capacity(4);
-
-    //     let real_time = into_big_int(end_time - start_time);
-    //     indexmap.insert("real time".to_string(), real_time);
-
-    //     let user_time = into_big_int(end.user() - start.user());
-    //     indexmap.insert("user time".to_string(), user_time);
-
-    //     let system_time = into_big_int(end.system() - start.system());
-    //     indexmap.insert("system time".to_string(), system_time);
-
-    //     let idle_time = into_big_int(end.idle() - start.idle());
-    //     indexmap.insert("idle time".to_string(), idle_time);
-
-    //     benchmark_output(indexmap, output, passthrough, &tag, &mut context)
-    // } else {
-    //     Err(ShellError::untagged_runtime_error(
-    //         "Could not retrieve CPU time",
-    //     ))
-    // }
-}
-
-fn benchmark_output<T, Output>(
-    indexmap: IndexMap<String, i64>,
-    block_output: Output,
-    passthrough: Option<CapturedBlock>,
-    tag: T,
-    context: &mut EvaluationContext,
-) -> Result<OutputStream, ShellError>
-where
-    T: Into<Tag> + Copy,
-    Output: Into<OutputStream>,
-{
-    let value = UntaggedValue::Row(Dictionary::from(
-        indexmap
-            .into_iter()
-            .map(|(k, v)| (k, UntaggedValue::duration(v).into_value(tag)))
-            .collect::<IndexMap<String, Value>>(),
-    ))
-    .into_value(tag);
-
-    if let Some(time_block) = passthrough {
-        let benchmark_output = InputStream::one(value);
-
-        // add autoview for an empty block
-        let time_block = add_implicit_autoview(time_block.block);
-
-        context.scope.enter_scope();
-        let result = run_block(
-            &time_block,
-            context,
-            benchmark_output,
-            ExternalRedirection::StdoutAndStderr,
-        );
-        context.scope.exit_scope();
-        result?;
-        context.clear_errors();
-
-        Ok(block_output.into())
-    } else {
-        let benchmark_output = OutputStream::one(value);
-        Ok(benchmark_output)
-    }
-}
-
-fn add_implicit_autoview(mut block: Arc<Block>) -> Arc<Block> {
-    if let Some(block) = std::sync::Arc::<nu_protocol::hir::Block>::get_mut(&mut block) {
-        if block.block.is_empty() {
-            let group = Group::new(
-                vec![{
-                    let mut commands = Pipeline::new(block.span);
-                    commands.push(ClassifiedCommand::Internal(InternalCommand::new(
-                        "autoview".to_string(),
-                        block.span,
-                        block.span,
-                    )));
-                    commands
-                }],
-                block.span,
-            );
-            block.push(group);
-        }
-    }
-    block
-}
-
-fn generate_random_env_value() -> String {
-    let mut thread_rng = thread_rng();
-    let len = thread_rng.gen_range(1..16 * 1024);
-    Alphanumeric
-        .sample_iter(&mut thread_rng)
-        .take(len)
-        .map(char::from)
-        .collect()
-}
-
-fn generate_free_name(env: &indexmap::IndexMap<String, String>) -> String {
-    let mut thread_rng = thread_rng();
-    loop {
-        let candidate_name = format!("NU_RANDOM_VALUE_{}", thread_rng.gen::<usize>());
-        if !env.contains_key(&candidate_name) {
-            return candidate_name;
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/clear.rs b/old_nushell/crates/nu-command/src/commands/platform/clear.rs
deleted file mode 100644
index e5dde549d..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/clear.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-use std::process::Command;
-
-pub struct Clear;
-
-impl WholeStreamCommand for Clear {
-    fn name(&self) -> &str {
-        "clear"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("clear")
-    }
-
-    fn usage(&self) -> &str {
-        "Clears the terminal."
-    }
-
-    fn run(&self, _: CommandArgs) -> Result<InputStream, ShellError> {
-        if cfg!(windows) {
-            Command::new("cmd")
-                .args(["/C", "cls"])
-                .status()
-                .expect("failed to execute process");
-        } else if cfg!(unix) {
-            Command::new("/bin/sh")
-                .args(["-c", "clear"])
-                .status()
-                .expect("failed to execute process");
-        }
-        Ok(InputStream::empty())
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Clear the screen",
-            example: "clear",
-            result: None,
-        }]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/du.rs b/old_nushell/crates/nu-command/src/commands/platform/du.rs
deleted file mode 100644
index efc508bc6..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/du.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-use crate::prelude::*;
-use glob::*;
-use nu_engine::WholeStreamCommand;
-use nu_engine::{DirBuilder, DirInfo, FileInfo};
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape};
-use nu_source::Tagged;
-use std::path::PathBuf;
-
-const NAME: &str = "du";
-const GLOB_PARAMS: MatchOptions = MatchOptions {
-    case_sensitive: true,
-    require_literal_separator: true,
-    require_literal_leading_dot: false,
-};
-
-pub struct Du;
-
-#[derive(Deserialize, Clone)]
-pub struct DuArgs {
-    path: Option<Tagged<PathBuf>>,
-    all: bool,
-    deref: bool,
-    exclude: Option<Tagged<String>>,
-    #[serde(rename = "max-depth")]
-    max_depth: Option<Tagged<u64>>,
-    #[serde(rename = "min-size")]
-    min_size: Option<Tagged<u64>>,
-}
-
-impl WholeStreamCommand for Du {
-    fn name(&self) -> &str {
-        NAME
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(NAME)
-            .optional("path", SyntaxShape::GlobPattern, "starting directory")
-            .switch(
-                "all",
-                "Output file sizes as well as directory sizes",
-                Some('a'),
-            )
-            .switch(
-                "deref",
-                "Dereference symlinks to their targets for size",
-                Some('r'),
-            )
-            .named(
-                "exclude",
-                SyntaxShape::GlobPattern,
-                "Exclude these file names",
-                Some('x'),
-            )
-            .named(
-                "max-depth",
-                SyntaxShape::Int,
-                "Directory recursion limit",
-                Some('d'),
-            )
-            .named(
-                "min-size",
-                SyntaxShape::Int,
-                "Exclude files below this size",
-                Some('m'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Find disk usage sizes of specified items."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        du(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Disk usage of the current directory",
-            example: "du",
-            result: None,
-        }]
-    }
-}
-
-fn du(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-    let ctrl_c = args.ctrl_c();
-    let ctrl_c_copy = ctrl_c.clone();
-
-    let args = DuArgs {
-        path: args.opt(0)?,
-        all: args.has_flag("all"),
-        deref: args.has_flag("deref"),
-        exclude: args.get_flag("exclude")?,
-        max_depth: args.get_flag("max-depth")?,
-        min_size: args.get_flag("min_size")?,
-    };
-
-    let exclude = args.exclude.map_or(Ok(None), move |x| {
-        Pattern::new(&x.item)
-            .map(Some)
-            .map_err(|e| ShellError::labeled_error(e.msg, "glob error", x.tag.clone()))
-    })?;
-
-    let include_files = args.all;
-    let paths = match args.path {
-        Some(p) => {
-            let p = p.item.to_str().expect("Why isn't this encoded properly?");
-            glob::glob_with(p, GLOB_PARAMS)
-        }
-        None => glob::glob_with("*", GLOB_PARAMS),
-    }
-    .map_err(|e| ShellError::labeled_error(e.msg, "glob error", tag.clone()))?
-    .filter(move |p| {
-        if include_files {
-            true
-        } else {
-            match p {
-                Ok(f) if f.is_dir() => true,
-                Err(e) if e.path().is_dir() => true,
-                _ => false,
-            }
-        }
-    })
-    .map(|v| v.map_err(glob_err_into));
-
-    let all = args.all;
-    let deref = args.deref;
-    let max_depth = args.max_depth.map(|f| f.item);
-    let min_size = args.min_size.map(|f| f.item);
-
-    let params = DirBuilder {
-        tag: tag.clone(),
-        min: min_size,
-        deref,
-        exclude,
-        all,
-    };
-
-    let inp = paths;
-
-    Ok(inp
-        .flat_map(move |path| match path {
-            Ok(p) => {
-                let mut output = vec![];
-                if p.is_dir() {
-                    output.push(Ok(ReturnSuccess::Value(
-                        DirInfo::new(p, &params, max_depth, ctrl_c.clone()).into(),
-                    )));
-                } else if let Ok(v) = FileInfo::new(p, deref, tag.clone()) {
-                    output.push(Ok(ReturnSuccess::Value(v.into())));
-                }
-
-                output
-            }
-            Err(e) => vec![Err(e)],
-        })
-        .interruptible(ctrl_c_copy)
-        .into_action_stream())
-}
-
-fn glob_err_into(e: GlobError) -> ShellError {
-    let e = e.into_error();
-    ShellError::from(e)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Du;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Du {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/exec.rs b/old_nushell/crates/nu-command/src/commands/platform/exec.rs
deleted file mode 100644
index 429b5498c..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/exec.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-
-#[cfg(unix)]
-use nu_source::Tagged;
-#[cfg(unix)]
-use std::path::PathBuf;
-
-pub struct Exec;
-
-#[cfg(unix)]
-pub struct ExecArgs {
-    pub command: Tagged<PathBuf>,
-    pub rest: Vec<Tagged<String>>,
-}
-
-impl WholeStreamCommand for Exec {
-    fn name(&self) -> &str {
-        "exec"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("exec")
-            .required("command", SyntaxShape::FilePath, "the command to execute")
-            .rest(
-                "rest",
-                SyntaxShape::GlobPattern,
-                "any additional arguments for the command",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Execute a command, replacing the current process."
-    }
-
-    fn extra_usage(&self) -> &str {
-        "Currently supported only on Unix-based systems."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        exec(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Execute external 'ps aux' tool",
-                example: "exec ps aux",
-                result: None,
-            },
-            Example {
-                description: "Execute 'nautilus'",
-                example: "exec nautilus",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[cfg(unix)]
-fn exec(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    use std::os::unix::process::CommandExt;
-    use std::process::Command;
-
-    let name = args.call_info.name_tag.clone();
-
-    let args = ExecArgs {
-        command: args.req(0)?,
-        rest: args.rest(1)?,
-    };
-
-    let mut command = Command::new(args.command.item);
-    for tagged_arg in args.rest {
-        command.arg(tagged_arg.item);
-    }
-
-    let err = command.exec(); // this replaces our process, should not return
-
-    Err(ShellError::labeled_error(
-        "Error on exec",
-        err.to_string(),
-        &name,
-    ))
-}
-
-#[cfg(not(unix))]
-fn exec(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    Err(ShellError::labeled_error(
-        "Error on exec",
-        "exec is not supported on your platform",
-        &args.call_info.name_tag,
-    ))
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/kill.rs b/old_nushell/crates/nu-command/src/commands/platform/kill.rs
deleted file mode 100644
index 2f508a1a2..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/kill.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-use std::process::{Command, Stdio};
-
-pub struct Kill;
-
-impl WholeStreamCommand for Kill {
-    fn name(&self) -> &str {
-        "kill"
-    }
-
-    fn signature(&self) -> Signature {
-        let signature = Signature::build("kill")
-            .required(
-                "pid",
-                SyntaxShape::Int,
-                "process id of process that is to be killed",
-            )
-            .rest("rest", SyntaxShape::Int, "rest of processes to kill")
-            .switch("force", "forcefully kill the process", Some('f'))
-            .switch("quiet", "won't print anything to the console", Some('q'));
-
-        if cfg!(windows) {
-            return signature;
-        }
-
-        signature.named(
-            "signal",
-            SyntaxShape::Int,
-            "signal decimal number to be sent instead of the default 15 (unsupported on Windows)",
-            Some('s'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Kill a process using the process id."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        kill(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Kill the pid using the most memory",
-                example: "ps | sort-by mem | last | kill $it.pid",
-                result: None,
-            },
-            Example {
-                description: "Force kill a given pid",
-                example: "kill --force 12345",
-                result: None,
-            },
-            Example {
-                description: "Send INT signal",
-                example: "kill -s 2 12345",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn kill(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let pid: Tagged<u64> = args.req(0)?;
-    let rest: Vec<Tagged<u64>> = args.rest(1)?;
-    let force: Option<Tagged<bool>> = args.get_flag("force")?;
-    let quiet: bool = args.has_flag("quiet");
-    let signal: Option<Tagged<u32>> = args.get_flag("signal")?;
-
-    let mut cmd = if cfg!(windows) {
-        let mut cmd = Command::new("taskkill");
-
-        if matches!(force, Some(Tagged { item: true, .. })) {
-            cmd.arg("/F");
-        }
-
-        cmd.arg("/PID");
-        cmd.arg(pid.item().to_string());
-
-        // each pid must written as `/PID 0` otherwise
-        // taskkill will act as `killall` unix command
-        for id in &rest {
-            cmd.arg("/PID");
-            cmd.arg(id.item().to_string());
-        }
-
-        cmd
-    } else {
-        let mut cmd = Command::new("kill");
-
-        if matches!(force, Some(Tagged { item: true, .. })) {
-            if let Some(signal_value) = signal {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "mixing force and signal options is not supported",
-                    "signal option",
-                    signal_value.tag(),
-                    "force option",
-                    force.expect("internal error: expected value").tag(),
-                ));
-            }
-            cmd.arg("-9");
-        } else if let Some(signal_value) = signal {
-            cmd.arg(format!("-{}", signal_value.item()));
-        }
-
-        cmd.arg(pid.item().to_string());
-
-        cmd.args(rest.iter().map(move |id| id.item().to_string()));
-
-        cmd
-    };
-
-    // pipe everything to null
-    if quiet {
-        cmd.stdin(Stdio::null())
-            .stdout(Stdio::null())
-            .stderr(Stdio::null());
-    }
-
-    cmd.status().expect("failed to execute shell command");
-
-    Ok(ActionStream::empty())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Kill;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Kill {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/mod.rs b/old_nushell/crates/nu-command/src/commands/platform/mod.rs
deleted file mode 100644
index 03734919b..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/mod.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-mod ansi;
-mod benchmark;
-mod clear;
-mod du;
-mod exec;
-mod kill;
-mod pwd;
-mod run_external;
-mod sleep;
-mod termsize;
-mod which_;
-
-pub use ansi::*;
-pub use benchmark::Benchmark;
-pub use clear::Clear;
-pub use du::Du;
-pub use exec::Exec;
-pub use kill::Kill;
-pub use pwd::Pwd;
-pub use run_external::RunExternalCommand;
-pub use sleep::Sleep;
-pub use termsize::TermSize;
-pub use which_::Which;
diff --git a/old_nushell/crates/nu-command/src/commands/platform/pwd.rs b/old_nushell/crates/nu-command/src/commands/platform/pwd.rs
deleted file mode 100644
index a9965ec93..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/pwd.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-
-pub struct Pwd;
-
-impl WholeStreamCommand for Pwd {
-    fn name(&self) -> &str {
-        "pwd"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("pwd")
-    }
-
-    fn usage(&self) -> &str {
-        "Output the current working directory."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        pwd(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Print the current working directory",
-            example: "pwd",
-            result: None,
-        }]
-    }
-}
-
-pub fn pwd(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let shell_manager = args.shell_manager();
-
-    shell_manager.pwd(args)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Pwd;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Pwd {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/run_external.rs b/old_nushell/crates/nu-command/src/commands/platform/run_external.rs
deleted file mode 100644
index ce61f999b..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/run_external.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use crate::classified::external;
-use crate::prelude::*;
-
-use derive_new::new;
-use std::path::PathBuf;
-
-use nu_engine::WholeStreamCommand;
-use nu_engine::{evaluate_baseline_expr, shell::CdArgs};
-use nu_errors::ShellError;
-use nu_path::{canonicalize, trim_trailing_slash};
-use nu_protocol::{
-    hir::{ExternalArgs, ExternalCommand, SpannedExpression},
-    Primitive, UntaggedValue,
-};
-use nu_protocol::{Signature, SyntaxShape};
-use nu_source::Tagged;
-
-#[derive(new)]
-pub struct RunExternalCommand {
-    /// Whether or not nushell is being used in an interactive context
-    pub(crate) interactive: bool,
-}
-
-fn spanned_expression_to_string(
-    expr: SpannedExpression,
-    ctx: &EvaluationContext,
-) -> Result<String, ShellError> {
-    let value = evaluate_baseline_expr(&expr, ctx)?;
-
-    if let UntaggedValue::Primitive(Primitive::String(s)) = value.value {
-        Ok(s)
-    } else {
-        Err(ShellError::labeled_error(
-            "Expected string for command name",
-            "expected string",
-            expr.span,
-        ))
-    }
-}
-
-impl WholeStreamCommand for RunExternalCommand {
-    fn name(&self) -> &str {
-        "run_external"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build(self.name()).rest("rest", SyntaxShape::Any, "external command arguments")
-    }
-
-    fn usage(&self) -> &str {
-        "Runs external command (not a nushell builtin)"
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Run the external echo command",
-            example: "run_external echo 'nushell'",
-            result: None,
-        }]
-    }
-
-    fn is_private(&self) -> bool {
-        true
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let positionals = args.call_info.args.positional.clone().ok_or_else(|| {
-            ShellError::untagged_runtime_error("positional arguments unexpectedly empty")
-        })?;
-
-        let mut positionals = positionals.into_iter();
-
-        let external_redirection = args.call_info.args.external_redirection;
-
-        let expr = positionals.next().ok_or_else(|| {
-            ShellError::untagged_runtime_error("run_external called with no arguments")
-        })?;
-
-        let name = spanned_expression_to_string(expr, &args.context)?;
-
-        let mut external_context = args.context.clone();
-
-        let is_interactive = self.interactive;
-
-        let command = ExternalCommand {
-            name,
-            name_tag: args.call_info.name_tag.clone(),
-            args: ExternalArgs {
-                list: positionals.collect(),
-                span: args.call_info.args.span,
-            },
-        };
-
-        // If we're in interactive mode, we will "auto cd". That is, instead of interpreting
-        // this as an external command, we will see it as a path and `cd` into it.
-        if is_interactive {
-            if let Some(path) = maybe_autocd_dir(&command, &mut external_context) {
-                let cd_args = CdArgs {
-                    path: Some(Tagged {
-                        item: PathBuf::from(path),
-                        tag: args.call_info.name_tag.clone(),
-                    }),
-                };
-
-                let result = external_context
-                    .shell_manager()
-                    .cd(cd_args, args.call_info.name_tag);
-
-                return Ok(result?.into_action_stream());
-            }
-        }
-
-        let input = args.input;
-        let result = external::run_external_command(
-            command,
-            &mut external_context,
-            input,
-            external_redirection,
-        );
-
-        // When externals return, don't let them mess up the ansi escapes
-        #[cfg(windows)]
-        {
-            let _ = nu_ansi_term::enable_ansi_support();
-        }
-
-        Ok(result?.into_action_stream())
-    }
-}
-
-#[allow(unused_variables)]
-fn maybe_autocd_dir(cmd: &ExternalCommand, ctx: &mut EvaluationContext) -> Option<String> {
-    // We will "auto cd" if
-    //   - the command name ends in a path separator, or
-    //   - it's not a command on the path and no arguments were given.
-    let name = &cmd.name;
-    ctx.sync_path_to_env();
-    let path_name = if name.ends_with(std::path::is_separator)
-        || (cmd.args.is_empty()
-            && PathBuf::from(name).is_dir()
-            && canonicalize(name).is_ok()
-            && !ctx.host().lock().is_external_cmd(name))
-    {
-        Some(trim_trailing_slash(name))
-    } else {
-        None
-    };
-
-    path_name.map(|name| {
-        #[cfg(windows)]
-        {
-            if name.ends_with(':') {
-                // This looks like a drive shortcut. We need to a) switch drives and b) go back to the previous directory we were viewing on that drive
-                // But first, we need to save where we are now
-                let current_path = ctx.shell_manager().path();
-
-                let split_path: Vec<_> = current_path.split(':').collect();
-                if split_path.len() > 1 {
-                    ctx.windows_drives_previous_cwd()
-                        .lock()
-                        .insert(split_path[0].to_string(), current_path);
-                }
-
-                let name = name.to_uppercase();
-                let new_drive: Vec<_> = name.split(':').collect();
-
-                if let Some(val) = ctx.windows_drives_previous_cwd().lock().get(new_drive[0]) {
-                    val.to_string()
-                } else {
-                    name
-                }
-            } else {
-                name.to_string()
-            }
-        }
-        #[cfg(not(windows))]
-        {
-            name.to_string()
-        }
-    })
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/sleep.rs b/old_nushell/crates/nu-command/src/commands/platform/sleep.rs
deleted file mode 100644
index 9e86d1d72..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/sleep.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use std::{
-    sync::atomic::Ordering,
-    thread,
-    time::{Duration, Instant},
-};
-
-const CTRL_C_CHECK_INTERVAL: Duration = Duration::from_millis(100);
-
-pub struct Sleep;
-
-impl WholeStreamCommand for Sleep {
-    fn name(&self) -> &str {
-        "sleep"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("sleep")
-            .required("duration", SyntaxShape::Duration, "time to sleep")
-            .rest("rest", SyntaxShape::Duration, "additional time")
-    }
-
-    fn usage(&self) -> &str {
-        "Delay for a specified amount of time."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let ctrl_c = args.ctrl_c();
-
-        let duration: Tagged<i64> = args.req(0)?;
-        let rest: Vec<Tagged<i64>> = args.rest(1)?;
-
-        let total_dur = Duration::from_nanos(if duration.item > 0 {
-            duration.item as u64
-        } else {
-            0
-        }) + rest
-            .iter()
-            .map(|val| Duration::from_nanos(if val.item > 0 { val.item as u64 } else { 0 }))
-            .sum::<Duration>();
-
-        //SleepHandler::new(total_dur, ctrl_c);
-        // this is necessary because the following 2 commands gave different results:
-        // `echo | sleep 1sec` - nothing
-        // `sleep 1sec`        - table with 0 elements
-
-        Ok(SleepIterator::new(total_dur, ctrl_c).into_output_stream())
-
-        // if input.is_empty() {
-        //     Ok(OutputStream::empty())
-        // } else {
-        //     Ok(input.into())
-        // }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Sleep for 1sec",
-                example: "sleep 1sec",
-                result: None,
-            },
-            Example {
-                description: "Sleep for 3sec",
-                example: "sleep 1sec 1sec 1sec",
-                result: None,
-            },
-            Example {
-                description: "Send output after 1sec",
-                example: "sleep 1sec; echo done",
-                result: Some(vec![UntaggedValue::string("done").into()]),
-            },
-        ]
-    }
-}
-
-struct SleepIterator {
-    total_dur: Duration,
-    ctrl_c: Arc<AtomicBool>,
-}
-
-impl SleepIterator {
-    pub fn new(total_dur: Duration, ctrl_c: Arc<AtomicBool>) -> Self {
-        Self { total_dur, ctrl_c }
-    }
-}
-
-impl Iterator for SleepIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let start = Instant::now();
-        loop {
-            thread::sleep(CTRL_C_CHECK_INTERVAL);
-            if start.elapsed() >= self.total_dur {
-                break;
-            }
-
-            if self.ctrl_c.load(Ordering::SeqCst) {
-                break;
-            }
-        }
-
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Sleep;
-    use nu_errors::ShellError;
-    use std::time::Instant;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        let start = Instant::now();
-        let results = test_examples(Sleep {});
-        let elapsed = start.elapsed();
-        println!("{:?}", elapsed);
-        // only examples with actual output are run
-        assert!(elapsed >= std::time::Duration::from_secs(1));
-        assert!(elapsed < std::time::Duration::from_secs(2));
-
-        results
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/termsize.rs b/old_nushell/crates/nu-command/src/commands/platform/termsize.rs
deleted file mode 100644
index 482857bf3..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/termsize.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::prelude::*;
-use indexmap::IndexMap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Signature, UntaggedValue};
-
-pub struct TermSize;
-
-impl WholeStreamCommand for TermSize {
-    fn name(&self) -> &str {
-        "term size"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("term size")
-            .switch("wide", "Report only the width of the terminal", Some('w'))
-            .switch("tall", "Report only the height of the terminal", Some('t'))
-    }
-
-    fn usage(&self) -> &str {
-        "Returns the terminal size as W H"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-
-        let wide = args.has_flag("wide");
-        let tall = args.has_flag("tall");
-
-        let size = term_size::dimensions();
-        match size {
-            Some((w, h)) => {
-                if wide && !tall {
-                    Ok(ActionStream::one(
-                        UntaggedValue::int(w as i64).into_value(tag),
-                    ))
-                } else if !wide && tall {
-                    Ok(ActionStream::one(
-                        UntaggedValue::int(h as i64).into_value(tag),
-                    ))
-                } else {
-                    let mut indexmap = IndexMap::with_capacity(2);
-                    indexmap.insert(
-                        "width".to_string(),
-                        UntaggedValue::int(w as i64).into_value(&tag),
-                    );
-                    indexmap.insert(
-                        "height".to_string(),
-                        UntaggedValue::int(h as i64).into_value(&tag),
-                    );
-                    let value = UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag);
-                    Ok(ActionStream::one(value))
-                }
-            }
-            _ => Ok(ActionStream::one(
-                UntaggedValue::string("0 0".to_string()).into_value(tag),
-            )),
-        }
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Return the width height of the terminal",
-                example: "term size",
-                result: None,
-            },
-            Example {
-                description: "Return the width of the terminal",
-                example: "term size -w",
-                result: None,
-            },
-            Example {
-                description: "Return the height (t for tall) of the terminal",
-                example: "term size -t",
-                result: None,
-            },
-        ]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/platform/which_.rs b/old_nushell/crates/nu-command/src/commands/platform/which_.rs
deleted file mode 100644
index 45a0a3f9e..000000000
--- a/old_nushell/crates/nu-command/src/commands/platform/which_.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use crate::prelude::*;
-use indexmap::map::IndexMap;
-use log::trace;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct Which;
-
-impl WholeStreamCommand for Which {
-    fn name(&self) -> &str {
-        "which"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("which")
-            .required("application", SyntaxShape::String, "application")
-            .rest("rest", SyntaxShape::String, "additional applications")
-            .switch("all", "list all executables", Some('a'))
-    }
-
-    fn usage(&self) -> &str {
-        "Finds a program file, alias or custom command."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        which(args)
-    }
-}
-
-/// Shortcuts for creating an entry to the output table
-fn entry(arg: impl Into<String>, path: Value, builtin: bool, tag: Tag) -> Value {
-    let mut map = IndexMap::new();
-    map.insert(
-        "arg".to_string(),
-        UntaggedValue::Primitive(Primitive::String(arg.into())).into_value(tag.clone()),
-    );
-    map.insert("path".to_string(), path);
-    map.insert(
-        "builtin".to_string(),
-        UntaggedValue::boolean(builtin).into_value(tag.clone()),
-    );
-
-    UntaggedValue::row(map).into_value(tag)
-}
-
-macro_rules! create_entry {
-    ($arg:expr, $path:expr, $tag:expr, $is_builtin:expr) => {
-        entry(
-            $arg.clone(),
-            UntaggedValue::Primitive(Primitive::String($path.to_string())).into_value($tag.clone()),
-            $is_builtin,
-            $tag,
-        )
-    };
-}
-
-fn get_entries_in_aliases(scope: &Scope, name: &str, tag: Tag) -> Vec<Value> {
-    let aliases = scope
-        .get_aliases_with_name(name)
-        .unwrap_or_default()
-        .into_iter()
-        .map(|spans| {
-            spans
-                .into_iter()
-                .map(|span| span.item)
-                .collect::<Vec<String>>()
-                .join(" ")
-        })
-        .map(|alias| {
-            create_entry!(
-                name,
-                format!("Nushell alias: {}", alias),
-                tag.clone(),
-                false
-            )
-        })
-        .collect::<Vec<_>>();
-    trace!("Found {} aliases", aliases.len());
-    aliases
-}
-
-fn get_entries_in_custom_command(scope: &Scope, name: &str, tag: Tag) -> Vec<Value> {
-    scope
-        .get_custom_commands_with_name(name)
-        .unwrap_or_default()
-        .into_iter()
-        .map(|_| create_entry!(name, "Nushell custom command", tag.clone(), false))
-        .collect()
-}
-
-fn get_entry_in_commands(scope: &Scope, name: &str, tag: Tag) -> Option<Value> {
-    if scope.has_command(name) {
-        Some(create_entry!(name, "Nushell built-in command", tag, true))
-    } else {
-        None
-    }
-}
-
-fn get_entries_in_nu(
-    scope: &Scope,
-    name: &str,
-    tag: Tag,
-    skip_after_first_found: bool,
-) -> Vec<Value> {
-    let mut all_entries = vec![];
-
-    all_entries.extend(get_entries_in_aliases(scope, name, tag.clone()));
-    if !all_entries.is_empty() && skip_after_first_found {
-        return all_entries;
-    }
-
-    all_entries.extend(get_entries_in_custom_command(scope, name, tag.clone()));
-    if !all_entries.is_empty() && skip_after_first_found {
-        return all_entries;
-    }
-
-    if let Some(entry) = get_entry_in_commands(scope, name, tag) {
-        all_entries.push(entry);
-    }
-
-    all_entries
-}
-
-#[allow(unused)]
-macro_rules! entry_path {
-    ($arg:expr, $path:expr, $tag:expr) => {
-        entry(
-            $arg.clone(),
-            UntaggedValue::Primitive(Primitive::FilePath($path)).into_value($tag.clone()),
-            false,
-            $tag,
-        )
-    };
-}
-
-#[cfg(feature = "which")]
-fn get_first_entry_in_path(item: &str, tag: Tag) -> Option<Value> {
-    which::which(item)
-        .map(|path| entry_path!(item, path, tag))
-        .ok()
-}
-
-#[cfg(not(feature = "which"))]
-fn get_first_entry_in_path(_: &str, _: Tag) -> Option<Value> {
-    None
-}
-
-#[cfg(feature = "which")]
-fn get_all_entries_in_path(item: &str, tag: Tag) -> Vec<Value> {
-    which::which_all(&item)
-        .map(|iter| {
-            iter.map(|path| entry_path!(item, path, tag.clone()))
-                .collect()
-        })
-        .unwrap_or_default()
-}
-#[cfg(not(feature = "which"))]
-fn get_all_entries_in_path(_: &str, _: Tag) -> Vec<Value> {
-    vec![]
-}
-
-#[derive(Debug)]
-struct WhichArgs {
-    applications: Vec<Tagged<String>>,
-    all: bool,
-}
-
-fn which_single(application: Tagged<String>, all: bool, scope: &Scope) -> Vec<Value> {
-    let (external, prog_name) = if application.starts_with('^') {
-        (true, application.item[1..].to_string())
-    } else {
-        (false, application.item.clone())
-    };
-
-    //If prog_name is an external command, don't search for nu-specific programs
-    //If all is false, we can save some time by only searching for the first matching
-    //program
-    //This match handles all different cases
-    match (all, external) {
-        (true, true) => get_all_entries_in_path(&prog_name, application.tag),
-        (true, false) => {
-            let mut output: Vec<Value> = vec![];
-            output.extend(get_entries_in_nu(
-                scope,
-                &prog_name,
-                application.tag.clone(),
-                false,
-            ));
-            output.extend(get_all_entries_in_path(&prog_name, application.tag));
-            output
-        }
-        (false, true) => {
-            if let Some(entry) = get_first_entry_in_path(&prog_name, application.tag) {
-                return vec![entry];
-            }
-            vec![]
-        }
-        (false, false) => {
-            let nu_entries = get_entries_in_nu(scope, &prog_name, application.tag.clone(), true);
-            if !nu_entries.is_empty() {
-                return vec![nu_entries[0].clone()];
-            } else if let Some(entry) = get_first_entry_in_path(&prog_name, application.tag) {
-                return vec![entry];
-            }
-            vec![]
-        }
-    }
-}
-
-fn which(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let which_args = WhichArgs {
-        applications: args.rest_with_minimum(0, 1)?,
-        all: args.has_flag("all"),
-    };
-
-    let mut output = vec![];
-
-    for app in which_args.applications {
-        let values = which_single(app, which_args.all, args.scope());
-        output.extend(values);
-    }
-
-    Ok(output.into_iter().into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Which;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Which {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/bool.rs b/old_nushell/crates/nu-command/src/commands/random/bool.rs
deleted file mode 100644
index a7c8c3ed5..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/bool.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use rand::prelude::{thread_rng, Rng};
-
-pub struct SubCommand;
-
-pub struct BoolArgs {
-    bias: Option<Tagged<f64>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random bool"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random bool").named(
-            "bias",
-            SyntaxShape::Number,
-            "Adjusts the probability of a \"true\" outcome",
-            Some('b'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Generate a random boolean value"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        bool_command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Generate a random boolean value",
-                example: "random bool",
-                result: None,
-            },
-            Example {
-                description: "Generate a random boolean value with a 75% chance of \"true\"",
-                example: "random bool --bias 0.75",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn bool_command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let cmd_args = BoolArgs {
-        bias: args.get_flag("bias")?,
-    };
-
-    let mut probability = 0.5;
-
-    if let Some(prob) = cmd_args.bias {
-        probability = *prob as f64;
-
-        let probability_is_valid = (0.0..=1.0).contains(&probability);
-
-        if !probability_is_valid {
-            return Err(ShellError::labeled_error(
-                "The probability is invalid",
-                "invalid probability",
-                prob.span(),
-            ));
-        }
-    }
-
-    let mut rng = thread_rng();
-    let bool_result: bool = rng.gen_bool(probability);
-
-    Ok(OutputStream::one(UntaggedValue::boolean(bool_result)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/chars.rs b/old_nushell/crates/nu-command/src/commands/random/chars.rs
deleted file mode 100644
index 986c8256b..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/chars.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use rand::distributions::{Alphanumeric, Distribution};
-use rand::thread_rng;
-
-pub struct SubCommand;
-
-pub struct CharsArgs {
-    length: Option<Tagged<u32>>,
-}
-
-const DEFAULT_CHARS_LENGTH: u32 = 25;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random chars"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random chars").named(
-            "length",
-            SyntaxShape::Int,
-            "Number of chars",
-            Some('l'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Generate random chars"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        chars(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Generate random chars",
-                example: "random chars",
-                result: None,
-            },
-            Example {
-                description: "Generate random chars with specified length",
-                example: "random chars -l 20",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn chars(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let cmd_args = CharsArgs {
-        length: args.get_flag("length")?,
-    };
-
-    let chars_length = cmd_args.length.map_or(DEFAULT_CHARS_LENGTH, |l| l.item);
-    let mut rng = thread_rng();
-
-    let random_string: String = Alphanumeric
-        .sample_iter(&mut rng)
-        .take(chars_length as usize)
-        .map(char::from)
-        .collect();
-
-    Ok(OutputStream::one(UntaggedValue::string(random_string)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/command.rs b/old_nushell/crates/nu-command/src/commands/random/command.rs
deleted file mode 100644
index af4f70922..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/command.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "random"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random")
-    }
-
-    fn usage(&self) -> &str {
-        "Generate random values."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        Ok(OutputStream::one(UntaggedValue::string(get_full_help(
-            &Command,
-            args.scope(),
-        ))))
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/decimal.rs b/old_nushell/crates/nu-command/src/commands/random/decimal.rs
deleted file mode 100644
index fbef27800..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/decimal.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Range, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use rand::prelude::{thread_rng, Rng};
-use std::cmp::Ordering;
-
-pub struct SubCommand;
-
-pub struct DecimalArgs {
-    range: Option<Tagged<Range>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random decimal"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random decimal").optional("range", SyntaxShape::Range, "Range of values")
-    }
-
-    fn usage(&self) -> &str {
-        "Generate a random decimal within a range [min..max]"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        decimal(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Generate a default decimal value between 0 and 1",
-                example: "random decimal",
-                result: None,
-            },
-            Example {
-                description: "Generate a random decimal less than or equal to 500",
-                example: "random decimal ..500",
-                result: None,
-            },
-            Example {
-                description: "Generate a random decimal greater than or equal to 100000",
-                example: "random decimal 100000..",
-                result: None,
-            },
-            Example {
-                description: "Generate a random decimal between 1.0 and 1.1",
-                example: "random decimal 1.0..1.1",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn decimal(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let cmd_args = DecimalArgs {
-        range: args.opt(0)?,
-    };
-
-    let (min, max) = if let Some(range) = &cmd_args.range {
-        (range.item.min_f64()?, range.item.max_f64()?)
-    } else {
-        (0.0, 1.0)
-    };
-
-    match min.partial_cmp(&max) {
-        Some(Ordering::Greater) => Err(ShellError::labeled_error(
-            format!("Invalid range {}..{}", min, max),
-            "expected a valid range",
-            cmd_args
-                .range
-                .expect("Unexpected ordering error in random decimal")
-                .span(),
-        )),
-        Some(Ordering::Equal) => Ok(OutputStream::one(UntaggedValue::decimal_from_float(
-            min,
-            Span::new(64, 64),
-        ))),
-        _ => {
-            let mut thread_rng = thread_rng();
-            let result: f64 = thread_rng.gen_range(min..max);
-
-            Ok(OutputStream::one(UntaggedValue::decimal_from_float(
-                result,
-                Span::new(64, 64),
-            )))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/dice.rs b/old_nushell/crates/nu-command/src/commands/random/dice.rs
deleted file mode 100644
index 1b13d2f29..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/dice.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use rand::prelude::{thread_rng, Rng};
-
-pub struct SubCommand;
-
-pub struct DiceArgs {
-    dice: Option<Tagged<u32>>,
-    sides: Option<Tagged<u32>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random dice"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random dice")
-            .named(
-                "dice",
-                SyntaxShape::Int,
-                "The amount of dice being rolled",
-                Some('d'),
-            )
-            .named(
-                "sides",
-                SyntaxShape::Int,
-                "The amount of sides a die has",
-                Some('s'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Generate a random dice roll"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        dice(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Roll 1 dice with 6 sides each",
-                example: "random dice",
-                result: None,
-            },
-            Example {
-                description: "Roll 10 dice with 12 sides each",
-                example: "random dice -d 10 -s 12",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn dice(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let cmd_args = DiceArgs {
-        dice: args.get_flag("dice")?,
-        sides: args.get_flag("sides")?,
-    };
-
-    let dice = if let Some(dice_tagged) = cmd_args.dice {
-        *dice_tagged
-    } else {
-        1
-    };
-
-    let sides = if let Some(sides_tagged) = cmd_args.sides {
-        *sides_tagged
-    } else {
-        6
-    };
-
-    let iter = (0..dice).map(move |_| {
-        let mut thread_rng = thread_rng();
-        UntaggedValue::int(thread_rng.gen_range(1..sides + 1)).into_value(tag.clone())
-    });
-
-    Ok(iter.into_output_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/integer.rs b/old_nushell/crates/nu-command/src/commands/random/integer.rs
deleted file mode 100644
index 39569472b..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/integer.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Range, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use rand::prelude::{thread_rng, Rng};
-use std::cmp::Ordering;
-
-pub struct SubCommand;
-
-pub struct IntegerArgs {
-    range: Option<Tagged<Range>>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random integer"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random integer").optional("range", SyntaxShape::Range, "Range of values")
-    }
-
-    fn usage(&self) -> &str {
-        "Generate a random integer [min..max]"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        integer(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Generate an unconstrained random integer",
-                example: "random integer",
-                result: None,
-            },
-            Example {
-                description: "Generate a random integer less than or equal to 500",
-                example: "random integer ..500",
-                result: None,
-            },
-            Example {
-                description: "Generate a random integer greater than or equal to 100000",
-                example: "random integer 100000..",
-                result: None,
-            },
-            Example {
-                description: "Generate a random integer between 1 and 10",
-                example: "random integer 1..10",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn integer(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let cmd_args = IntegerArgs {
-        range: args.opt(0)?,
-    };
-
-    let (min, max) = if let Some(range) = &cmd_args.range {
-        (range.min_i64()?, range.max_i64()?)
-    } else {
-        (0, i64::MAX)
-    };
-
-    match min.cmp(&max) {
-        Ordering::Greater => Err(ShellError::labeled_error(
-            format!("Invalid range {}..{}", min, max),
-            "expected a valid range",
-            cmd_args
-                .range
-                .expect("Unexpected ordering error in random integer")
-                .span(),
-        )),
-        Ordering::Equal => Ok(OutputStream::one(
-            UntaggedValue::int(min).into_value(Tag::unknown()),
-        )),
-        _ => {
-            let mut thread_rng = thread_rng();
-            // add 1 to max, because gen_range is right-exclusive
-            let max = max.saturating_add(1);
-            let result: i64 = thread_rng.gen_range(min..max);
-
-            Ok(OutputStream::one(
-                UntaggedValue::int(result).into_value(Tag::unknown()),
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/random/mod.rs b/old_nushell/crates/nu-command/src/commands/random/mod.rs
deleted file mode 100644
index 5decd9475..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod command;
-
-pub mod bool;
-pub mod chars;
-pub mod decimal;
-pub mod dice;
-pub mod integer;
-#[cfg(feature = "uuid_crate")]
-pub mod uuid;
-
-pub use command::Command as Random;
-
-pub use self::bool::SubCommand as RandomBool;
-pub use chars::SubCommand as RandomChars;
-pub use decimal::SubCommand as RandomDecimal;
-pub use dice::SubCommand as RandomDice;
-pub use integer::SubCommand as RandomInteger;
-#[cfg(feature = "uuid_crate")]
-pub use uuid::SubCommand as RandomUUID;
diff --git a/old_nushell/crates/nu-command/src/commands/random/uuid.rs b/old_nushell/crates/nu-command/src/commands/random/uuid.rs
deleted file mode 100644
index 47d01a3ed..000000000
--- a/old_nushell/crates/nu-command/src/commands/random/uuid.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::Signature;
-use uuid_crate::Uuid;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "random uuid"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("random uuid")
-    }
-
-    fn usage(&self) -> &str {
-        "Generate a random uuid4 string"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        uuid(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Generate a random uuid4 string",
-            example: "random uuid",
-            result: None,
-        }]
-    }
-}
-
-pub fn uuid(_args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let uuid_4 = Uuid::new_v4().to_hyphenated().to_string();
-
-    Ok(OutputStream::one(uuid_4))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/command.rs b/old_nushell/crates/nu-command/src/commands/shells/command.rs
deleted file mode 100644
index 8f44416f0..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/command.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, TaggedDictBuilder};
-use std::sync::atomic::Ordering;
-
-pub struct Shells;
-
-impl WholeStreamCommand for Shells {
-    fn name(&self) -> &str {
-        "shells"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("shells")
-    }
-
-    fn usage(&self) -> &str {
-        "Display the list of current shells."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(shells(args))
-    }
-}
-
-fn shells(args: CommandArgs) -> ActionStream {
-    let mut shells_out = VecDeque::new();
-    let shell_manager = args.shell_manager();
-    let tag = args.call_info.name_tag;
-    let active_index = shell_manager.current_shell.load(Ordering::SeqCst);
-
-    for (index, shell) in shell_manager.shells.lock().iter().enumerate() {
-        let mut dict = TaggedDictBuilder::new(&tag);
-
-        if index == active_index {
-            dict.insert_untagged("active", true);
-        } else {
-            dict.insert_untagged("active", false);
-        }
-        dict.insert_untagged("name", shell.name());
-        dict.insert_untagged("path", shell.path());
-
-        shells_out.push_back(dict.into_value());
-    }
-
-    shells_out.into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Shells;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Shells {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/enter.rs b/old_nushell/crates/nu-command/src/commands/shells/enter.rs
deleted file mode 100644
index 9736a666c..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/enter.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use crate::prelude::*;
-use nu_engine::UnevaluatedCallInfo;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::hir::ExternalRedirection;
-use nu_protocol::{
-    CommandAction, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tagged;
-use std::path::PathBuf;
-
-pub struct Enter;
-
-impl WholeStreamCommand for Enter {
-    fn name(&self) -> &str {
-        "enter"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("enter")
-            .required(
-                "location",
-                SyntaxShape::FilePath,
-                "the location to create a new shell from",
-            )
-            .named(
-                "encoding",
-                SyntaxShape::String,
-                "encoding to use to open file",
-                Some('e'),
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Create a new shell and begin at this path."
-    }
-
-    fn extra_usage(&self) -> &str {
-        r#"Multiple encodings are supported for reading text files by using
-the '--encoding <encoding>' parameter. Here is an example of a few:
-big5, euc-jp, euc-kr, gbk, iso-8859-1, utf-16, cp1252, latin5
-
-For a more complete list of encodings please refer to the encoding_rs
-documentation link at https://docs.rs/encoding_rs/0.8.28/encoding_rs/#statics"#
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        enter(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Enter a path as a new shell",
-                example: "enter ../projectB",
-                result: None,
-            },
-            Example {
-                description: "Enter a file as a new shell",
-                example: "enter package.json",
-                result: None,
-            },
-            Example {
-                description: "Enters file with iso-8859-1 encoding",
-                example: "enter file.csv --encoding iso-8859-1",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn enter(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let head = args.call_info.args.head.clone();
-    let context = args.context.clone();
-    let scope = args.scope().clone();
-    let path = args.context.shell_manager().path();
-
-    let location: Tagged<PathBuf> = args.req(0)?;
-    let encoding: Option<Tagged<String>> = args.get_flag("encoding")?;
-    let location_string = location.display().to_string();
-
-    if location.is_dir() {
-        Ok(ActionStream::one(ReturnSuccess::action(
-            CommandAction::EnterShell(location_string),
-        )))
-    } else {
-        // If it's a file, attempt to open the file as a value and enter it
-        let cwd = path;
-
-        let full_path = std::path::PathBuf::from(cwd);
-        let span = location.span();
-
-        let (file_extension, tagged_contents) = crate::commands::filesystem::open::fetch(
-            &full_path,
-            &PathBuf::from(location_string),
-            span,
-            encoding,
-        )?;
-
-        match tagged_contents.value {
-            UntaggedValue::Primitive(Primitive::String(_)) => {
-                if let Some(extension) = file_extension {
-                    let command_name = format!("from {}", extension);
-                    if let Some(converter) = scope.get_command(&command_name) {
-                        let tag = tagged_contents.tag.clone();
-                        let new_args = CommandArgs {
-                            context,
-                            call_info: UnevaluatedCallInfo {
-                                args: nu_protocol::hir::Call {
-                                    head,
-                                    positional: None,
-                                    named: None,
-                                    span: Span::unknown(),
-                                    external_redirection: ExternalRedirection::Stdout,
-                                },
-                                name_tag: tag.clone(),
-                            },
-                            input: InputStream::one(tagged_contents),
-                        };
-                        let mut result = converter.run(new_args)?;
-                        let result_vec: Vec<Value> = result.drain_vec();
-                        Ok(result_vec
-                            .into_iter()
-                            .map(move |res| {
-                                let Value { value, .. } = res;
-                                Ok(ReturnSuccess::Action(CommandAction::EnterValueShell(
-                                    Value {
-                                        value,
-                                        tag: tag.clone(),
-                                    },
-                                )))
-                            })
-                            .into_action_stream())
-                    } else {
-                        Ok(ActionStream::one(ReturnSuccess::action(
-                            CommandAction::EnterValueShell(tagged_contents),
-                        )))
-                    }
-                } else {
-                    Ok(ActionStream::one(ReturnSuccess::action(
-                        CommandAction::EnterValueShell(tagged_contents),
-                    )))
-                }
-            }
-            _ => Ok(ActionStream::one(ReturnSuccess::action(
-                CommandAction::EnterValueShell(tagged_contents),
-            ))),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Enter;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Enter {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/exit.rs b/old_nushell/crates/nu-command/src/commands/shells/exit.rs
deleted file mode 100644
index cc6754d15..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/exit.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature, SyntaxShape};
-
-pub struct Exit;
-
-impl WholeStreamCommand for Exit {
-    fn name(&self) -> &str {
-        "exit"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("exit")
-            .optional(
-                "code",
-                SyntaxShape::Number,
-                "Status code to return if this was the last shell or --now was specified",
-            )
-            .switch("now", "Exit out of the shell immediately", Some('n'))
-    }
-
-    fn usage(&self) -> &str {
-        "Exit the current shell (or all shells)."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        exit(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Exit the current shell",
-                example: "exit",
-                result: None,
-            },
-            Example {
-                description: "Exit all shells (exiting Nu)",
-                example: "exit --now",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn exit(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let code = if let Some(value) = args.opt::<i64>(0)? {
-        value as i32
-    } else {
-        0
-    };
-
-    let command_action = if args.has_flag("now") {
-        CommandAction::Exit(code)
-    } else {
-        CommandAction::LeaveShell(code)
-    };
-
-    Ok(ActionStream::one(ReturnSuccess::action(command_action)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Exit;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Exit {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/goto.rs b/old_nushell/crates/nu-command/src/commands/shells/goto.rs
deleted file mode 100644
index d1396c2dc..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/goto.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature, SyntaxShape};
-
-pub struct Goto;
-
-impl WholeStreamCommand for Goto {
-    fn name(&self) -> &str {
-        "g"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("g").required("index", SyntaxShape::Int, "the shell's index to go to")
-    }
-
-    fn usage(&self) -> &str {
-        "Go to specified shell."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        goto(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Enter the first shell",
-            example: "g 0",
-            result: None,
-        }]
-    }
-}
-
-fn goto(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    Ok(ActionStream::one(ReturnSuccess::action(
-        CommandAction::GotoShell(args.req(0)?),
-    )))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Goto;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Goto {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/mod.rs b/old_nushell/crates/nu-command/src/commands/shells/mod.rs
deleted file mode 100644
index 7c4897b1f..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-mod command;
-mod enter;
-mod exit;
-mod goto;
-mod next;
-mod prev;
-
-pub use command::Shells;
-pub use enter::Enter;
-pub use exit::Exit;
-pub use goto::Goto;
-pub use next::Next;
-pub use prev::Previous;
diff --git a/old_nushell/crates/nu-command/src/commands/shells/next.rs b/old_nushell/crates/nu-command/src/commands/shells/next.rs
deleted file mode 100644
index 73df6aaa2..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/next.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature};
-
-pub struct Next;
-
-impl WholeStreamCommand for Next {
-    fn name(&self) -> &str {
-        "n"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("n")
-    }
-
-    fn usage(&self) -> &str {
-        "Go to next shell."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(next(args))
-    }
-}
-
-fn next(_args: CommandArgs) -> ActionStream {
-    vec![Ok(ReturnSuccess::Action(CommandAction::NextShell))].into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Next;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Next {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/shells/prev.rs b/old_nushell/crates/nu-command/src/commands/shells/prev.rs
deleted file mode 100644
index d32a90422..000000000
--- a/old_nushell/crates/nu-command/src/commands/shells/prev.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{CommandAction, ReturnSuccess, Signature};
-
-use nu_engine::WholeStreamCommand;
-
-pub struct Previous;
-
-impl WholeStreamCommand for Previous {
-    fn name(&self) -> &str {
-        "p"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("p")
-    }
-
-    fn usage(&self) -> &str {
-        "Go to previous shell."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(previous(args))
-    }
-}
-
-fn previous(_args: CommandArgs) -> ActionStream {
-    vec![Ok(ReturnSuccess::Action(CommandAction::PreviousShell))].into()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Previous;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Previous {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/build_string.rs b/old_nushell/crates/nu-command/src/commands/strings/build_string.rs
deleted file mode 100644
index 774d3e6ad..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/build_string.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-
-use nu_data::value::format_leaf;
-use nu_engine::WholeStreamCommand;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-
-pub struct BuildString;
-
-impl WholeStreamCommand for BuildString {
-    fn name(&self) -> &str {
-        "build-string"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("build-string").rest(
-            "rest",
-            SyntaxShape::Any,
-            "all values to form into the string",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Builds a string from the arguments."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let tag = args.call_info.name_tag.clone();
-        let rest: Vec<Value> = args.rest(0)?;
-
-        let mut output_string = String::new();
-
-        for r in rest {
-            output_string.push_str(&format_leaf(&r).plain_string(100_000))
-        }
-
-        Ok(OutputStream::one(
-            UntaggedValue::string(output_string).into_value(tag),
-        ))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Builds a string from a string and a number, without spaces between them",
-            example: "build-string 'foo' 3",
-            result: None,
-        }]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/char_.rs b/old_nushell/crates/nu-command/src/commands/strings/char_.rs
deleted file mode 100644
index 75f7bd7f3..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/char_.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-use crate::prelude::*;
-use indexmap::indexmap;
-use indexmap::map::IndexMap;
-use lazy_static::lazy_static;
-use nu_engine::{FromValue, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tagged;
-
-// Character used to separate directories in a Path Environment variable on windows is ";"
-#[cfg(target_family = "windows")]
-const ENV_PATH_SEPARATOR_CHAR: char = ';';
-// Character used to separate directories in a Path Environment variable on linux/mac/unix is ":"
-#[cfg(not(target_family = "windows"))]
-const ENV_PATH_SEPARATOR_CHAR: char = ':';
-
-pub struct Char;
-
-struct CharArgs {
-    name: Option<Tagged<String>>,
-    rest: Vec<Value>,
-    list: bool,
-    unicode: bool,
-}
-
-lazy_static! {
-    static ref CHAR_MAP: IndexMap<&'static str, String> = indexmap! {
-        // These are some regular characters that either can't be used or
-        // it's just easier to use them like this.
-
-        // This are the "normal" characters section
-        "newline" => '\n'.to_string(),
-        "enter" => '\n'.to_string(),
-        "nl" => '\n'.to_string(),
-        "tab" => '\t'.to_string(),
-        "sp" => ' '.to_string(),
-        "space" => ' '.to_string(),
-        "pipe" => '|'.to_string(),
-        "left_brace" => '{'.to_string(),
-        "lbrace" => '{'.to_string(),
-        "right_brace" => '}'.to_string(),
-        "rbrace" => '}'.to_string(),
-        "left_paren" => '('.to_string(),
-        "lp" => '('.to_string(),
-        "lparen" => '('.to_string(),
-        "right_paren" => ')'.to_string(),
-        "rp" => ')'.to_string(),
-        "rparen" => ')'.to_string(),
-        "left_bracket" => '['.to_string(),
-        "lbracket" => '['.to_string(),
-        "right_bracket" => ']'.to_string(),
-        "rbracket" => ']'.to_string(),
-        "single_quote" => '\''.to_string(),
-        "squote" => '\''.to_string(),
-        "sq" => '\''.to_string(),
-        "double_quote" => '\"'.to_string(),
-        "dquote" => '\"'.to_string(),
-        "dq" => '\"'.to_string(),
-        "path_sep" => std::path::MAIN_SEPARATOR.to_string(),
-        "psep" => std::path::MAIN_SEPARATOR.to_string(),
-        "separator" => std::path::MAIN_SEPARATOR.to_string(),
-        "esep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
-        "env_sep" => ENV_PATH_SEPARATOR_CHAR.to_string(),
-        "tilde" => '~'.to_string(),                                // ~
-        "twiddle" => '~'.to_string(),                              // ~
-        "squiggly" => '~'.to_string(),                             // ~
-        "home" => '~'.to_string(),                                 // ~
-        "hash" => '#'.to_string(),                                 // #
-        "hashtag" => '#'.to_string(),                              // #
-        "pound_sign" => '#'.to_string(),                           // #
-        "sharp" => '#'.to_string(),                                // #
-        "root" => '#'.to_string(),                                 // #
-        "comma" => ','.to_string(), // , comma
-        "semicolon" => ';'.to_string(), // ; semicolon
-        "dollar" => '$'.to_string(), // $ dollar
-        "at" => '@'.to_string(), // @ at
-        "minus" => '-'.to_string(), // - minus
-        "subtract" => '-'.to_string(),
-        "dash" => '-'.to_string(),
-        "plus" => '+'.to_string(), // + plus
-        "add" => '+'.to_string(),
-        "divide" => '/'.to_string(), // / divide, slash
-        "slash" => '/'.to_string(),
-        "backslash" => '\\'.to_string(),// \ backslash
-        "percent" => '%'.to_string(), // % percent
-        "multiply" => '*'.to_string(), // * multiply
-        "greater_than" => '>'.to_string(), // > greater_than
-        "gt" => '>'.to_string(),
-        "less_than" => '<'.to_string(), // < less_than
-        "lt" => '<'.to_string(),
-        "and" => '&'.to_string(), // & and, ampersand
-        "ampersand" => '&'.to_string(),
-        "equal" => '='.to_string(), // = equal
-        "eq" => '='.to_string(),
-        "double_equal" => "==".to_string(), // == double_equal
-        "fat_arrow" => "=>".to_string(), // => fat_arrow
-        "right_arrow" => "->".to_string(), // -> right_arrow
-        "left_arrow" => "<-".to_string(), // <- left_arrow
-        "question" => '?'.to_string(), // ? question, q
-        "q" => '?'.to_string(),
-        "colon" => ':'.to_string(), // : colon
-        "underscore" => '_'.to_string(),
-        "u" => '_'.to_string(),
-
-        // This is the unicode section
-        // Unicode names came from https://www.compart.com/en/unicode
-        // Private Use Area (U+E000-U+F8FF)
-        // Unicode can't be mixed with Ansi or it will break width calculation
-        "branch" => '\u{e0a0}'.to_string(),                        // 
-        "segment" => '\u{e0b0}'.to_string(),                       // 
-
-        "identical_to" => '\u{2261}'.to_string(),                  // ≡
-        "hamburger" => '\u{2261}'.to_string(),                     // ≡
-        "not_identical_to" => '\u{2262}'.to_string(),              // ≢
-        "branch_untracked" => '\u{2262}'.to_string(),              // ≢
-        "strictly_equivalent_to" => '\u{2263}'.to_string(),        // ≣
-        "branch_identical" => '\u{2263}'.to_string(),              // ≣
-
-        "upwards_arrow" => '\u{2191}'.to_string(),                 // ↑
-        "branch_ahead" => '\u{2191}'.to_string(),                  // ↑
-        "downwards_arrow" => '\u{2193}'.to_string(),               // ↓
-        "branch_behind" => '\u{2193}'.to_string(),                 // ↓
-        "up_down_arrow" => '\u{2195}'.to_string(),                 // ↕
-        "branch_ahead_behind" => '\u{2195}'.to_string(),           // ↕
-
-        "black_right_pointing_triangle" => '\u{25b6}'.to_string(), // ▶
-        "prompt" => '\u{25b6}'.to_string(),                        // ▶
-        "vector_or_cross_product" => '\u{2a2f}'.to_string(),       // ⨯
-        "failed" => '\u{2a2f}'.to_string(),                        // ⨯
-        "high_voltage_sign" => '\u{26a1}'.to_string(),             // ⚡
-        "elevated" => '\u{26a1}'.to_string(),                      // ⚡
-
-        // This is the emoji section
-        // Weather symbols
-        "sun" => "☀️".to_string(),
-        "sunny" => "☀️".to_string(),
-        "sunrise" => "☀️".to_string(),
-        "moon" => "🌛".to_string(),
-        "cloudy" => "☁️".to_string(),
-        "cloud" => "☁️".to_string(),
-        "clouds" => "☁️".to_string(),
-        "rainy" => "🌦️".to_string(),
-        "rain" => "🌦️".to_string(),
-        "foggy" => "🌫️".to_string(),
-        "fog" => "🌫️".to_string(),
-        "mist" => '\u{2591}'.to_string(),
-        "haze" => '\u{2591}'.to_string(),
-        "snowy" => "❄️".to_string(),
-        "snow" => "❄️".to_string(),
-        "thunderstorm" => "🌩️".to_string(),
-        "thunder" => "🌩️".to_string(),
-
-        // This is the "other" section
-        "bel" => '\x07'.to_string(),       // Terminal Bell
-        "backspace" => '\x08'.to_string(), // Backspace
-    };
-}
-
-impl WholeStreamCommand for Char {
-    fn name(&self) -> &str {
-        "char"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("char")
-            .optional(
-                "character",
-                SyntaxShape::Any,
-                "the name of the character to output",
-            )
-            .rest("rest", SyntaxShape::String, "multiple Unicode bytes")
-            .switch("list", "List all supported character names", Some('l'))
-            .switch("unicode", "Unicode string i.e. 1f378", Some('u'))
-    }
-
-    fn usage(&self) -> &str {
-        "Output special characters (e.g., 'newline')."
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Output newline",
-                example: r#"char newline"#,
-                result: Some(vec![Value::from("\n")]),
-            },
-            Example {
-                description: "Output prompt character, newline and a hamburger character",
-                example: r#"echo (char prompt) (char newline) (char hamburger)"#,
-                result: Some(vec![
-                    UntaggedValue::string("\u{25b6}").into(),
-                    UntaggedValue::string("\n").into(),
-                    UntaggedValue::string("\u{2261}").into(),
-                ]),
-            },
-            Example {
-                description: "Output Unicode character",
-                example: r#"char -u 1f378"#,
-                result: Some(vec![Value::from("\u{1f378}")]),
-            },
-            Example {
-                description: "Output multi-byte Unicode character",
-                example: r#"char -u 1F468 200D 1F466 200D 1F466"#,
-                result: Some(vec![Value::from(
-                    "\u{1F468}\u{200D}\u{1F466}\u{200D}\u{1F466}",
-                )]),
-            },
-        ]
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let args_tag = args.call_info.name_tag.clone();
-        let args = CharArgs {
-            name: args.opt(0)?,
-            rest: args.rest(1)?,
-            list: args.has_flag("list"),
-            unicode: args.has_flag("unicode"),
-        };
-
-        if args.list {
-            Ok(CHAR_MAP
-                .iter()
-                .map(move |(name, s)| {
-                    let mut dict = TaggedDictBuilder::with_capacity(&args_tag, 2);
-                    dict.insert_untagged("name", UntaggedValue::string(*name));
-                    dict.insert_untagged("character", UntaggedValue::string(s));
-                    let unicode_parts: Vec<String> =
-                        s.chars().map(|c| format!("{:x}", c as u32)).collect();
-                    dict.insert_untagged("unicode", UntaggedValue::string(unicode_parts.join(" ")));
-                    dict.into_value()
-                })
-                .into_output_stream())
-        } else if let Some(name) = args.name {
-            if args.unicode {
-                if !args.rest.is_empty() {
-                    // Setup a new buffer to put all the Unicode bytes in
-                    let mut multi_byte = String::new();
-                    // Get the first byte
-                    let decoded_char = string_to_unicode_char(&name.item, &name.tag);
-                    match decoded_char {
-                        Ok(ch) => multi_byte.push(ch),
-                        Err(e) => return Err(e),
-                    }
-                    // Get the rest of the bytes
-                    for byte_part in args.rest {
-                        let byte_part: Tagged<String> = FromValue::from_value(&byte_part)?;
-                        let decoded_char = string_to_unicode_char(&byte_part, &byte_part.tag);
-                        match decoded_char {
-                            Ok(ch) => multi_byte.push(ch),
-                            Err(e) => return Err(e),
-                        }
-                    }
-                    Ok(OutputStream::one(
-                        UntaggedValue::string(multi_byte).into_value(name.tag),
-                    ))
-                } else {
-                    let decoded_char = string_to_unicode_char(&name.item, &name.tag);
-                    if let Ok(ch) = decoded_char {
-                        Ok(OutputStream::one(
-                            UntaggedValue::string(ch).into_value(name.tag()),
-                        ))
-                    } else {
-                        Err(ShellError::labeled_error(
-                            "error decoding Unicode character",
-                            "error decoding Unicode character",
-                            name.tag(),
-                        ))
-                    }
-                }
-            } else {
-                let special_character = str_to_character(&name.item);
-                if let Some(output) = special_character {
-                    Ok(OutputStream::one(
-                        UntaggedValue::string(output).into_value(name.tag()),
-                    ))
-                } else {
-                    Err(ShellError::labeled_error(
-                        "error finding named character",
-                        "error finding named character",
-                        name.tag(),
-                    ))
-                }
-            }
-        } else {
-            Err(ShellError::labeled_error(
-                "char requires the name of the character",
-                "missing name of the character",
-                &args_tag,
-            ))
-        }
-    }
-}
-
-fn string_to_unicode_char(s: &str, t: &Tag) -> Result<char, ShellError> {
-    let decoded_char = u32::from_str_radix(s, 16)
-        .ok()
-        .and_then(std::char::from_u32);
-
-    if let Some(ch) = decoded_char {
-        Ok(ch)
-    } else {
-        Err(ShellError::labeled_error(
-            "error decoding Unicode character",
-            "error decoding Unicode character",
-            t,
-        ))
-    }
-}
-
-fn str_to_character(s: &str) -> Option<String> {
-    CHAR_MAP.get(s).map(|s| s.into())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Char;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Char {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/detect/columns.rs b/old_nushell/crates/nu-command/src/commands/strings/detect/columns.rs
deleted file mode 100644
index b2a1a61eb..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/detect/columns.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use std::{iter::Peekable, str::CharIndices};
-
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue};
-use nu_source::Spanned;
-
-type Input<'t> = Peekable<CharIndices<'t>>;
-
-pub struct DetectColumns;
-
-impl WholeStreamCommand for DetectColumns {
-    fn name(&self) -> &str {
-        "detect columns"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("detect columns")
-            .named(
-                "skip",
-                SyntaxShape::Int,
-                "number of rows to skip before detecting",
-                Some('s'),
-            )
-            .switch("no_headers", "don't detect headers", Some('n'))
-    }
-
-    fn usage(&self) -> &str {
-        "splits contents across multiple columns via the separator."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        detect_columns(args)
-    }
-}
-
-fn detect_columns(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.name_tag();
-    let num_rows_to_skip: Option<usize> = args.get_flag("skip")?;
-    let noheader = args.has_flag("no_headers");
-    let input = args.input.collect_string(name_tag.clone())?;
-
-    let input: Vec<_> = input
-        .lines()
-        .skip(num_rows_to_skip.unwrap_or_default())
-        .map(|x| x.to_string())
-        .collect();
-
-    let mut input = input.into_iter();
-    let headers = input.next();
-
-    if let Some(orig_headers) = headers {
-        let headers = find_columns(&orig_headers);
-
-        Ok((if noheader {
-            vec![orig_headers].into_iter().chain(input)
-        } else {
-            vec![].into_iter().chain(input)
-        })
-        .map(move |x| {
-            let row = find_columns(&x);
-
-            let mut dict = TaggedDictBuilder::new(name_tag.clone());
-
-            if headers.len() == row.len() && !noheader {
-                for (header, val) in headers.iter().zip(row.iter()) {
-                    dict.insert_untagged(&header.item, UntaggedValue::string(&val.item));
-                }
-            } else {
-                let mut pre_output = vec![];
-
-                // column counts don't line up, so see if we can figure out why
-                for cell in row {
-                    for header in &headers {
-                        if cell.span.start() <= header.span.end()
-                            && cell.span.end() > header.span.start()
-                        {
-                            pre_output
-                                .push((header.item.to_string(), UntaggedValue::string(&cell.item)));
-                        }
-                    }
-                }
-
-                for header in &headers {
-                    let mut found = false;
-                    for pre_o in &pre_output {
-                        if pre_o.0 == header.item {
-                            found = true;
-                            break;
-                        }
-                    }
-
-                    if !found {
-                        pre_output.push((header.item.to_string(), UntaggedValue::nothing()));
-                    }
-                }
-
-                if noheader {
-                    for header in headers.iter().enumerate() {
-                        for pre_o in &pre_output {
-                            if pre_o.0 == header.1.item {
-                                dict.insert_untagged(format!("Column{}", header.0), pre_o.1.clone())
-                            }
-                        }
-                    }
-                } else {
-                    for header in &headers {
-                        for pre_o in &pre_output {
-                            if pre_o.0 == header.item {
-                                dict.insert_untagged(&header.item, pre_o.1.clone())
-                            }
-                        }
-                    }
-                }
-            }
-
-            dict.into_value()
-        })
-        .into_output_stream())
-    } else {
-        Ok(OutputStream::empty())
-    }
-}
-
-pub fn find_columns(input: &str) -> Vec<Spanned<String>> {
-    let mut chars = input.char_indices().peekable();
-    let mut output = vec![];
-
-    while let Some((_, c)) = chars.peek() {
-        if c.is_whitespace() {
-            // If the next character is non-newline whitespace, skip it.
-
-            let _ = chars.next();
-        } else {
-            // Otherwise, try to consume an unclassified token.
-
-            let result = baseline(&mut chars);
-
-            output.push(result);
-        }
-    }
-
-    output
-}
-
-#[derive(Clone, Copy)]
-enum BlockKind {
-    Paren,
-    CurlyBracket,
-    SquareBracket,
-}
-
-fn baseline(src: &mut Input) -> Spanned<String> {
-    let mut token_contents = String::new();
-
-    let start_offset = if let Some((pos, _)) = src.peek() {
-        *pos
-    } else {
-        0
-    };
-
-    // This variable tracks the starting character of a string literal, so that
-    // we remain inside the string literal lexer mode until we encounter the
-    // closing quote.
-    let mut quote_start: Option<char> = None;
-
-    // This Vec tracks paired delimiters
-    let mut block_level: Vec<BlockKind> = vec![];
-
-    // A baseline token is terminated if it's not nested inside of a paired
-    // delimiter and the next character is one of: `|`, `;`, `#` or any
-    // whitespace.
-    fn is_termination(block_level: &[BlockKind], c: char) -> bool {
-        block_level.is_empty() && (c.is_whitespace())
-    }
-
-    // The process of slurping up a baseline token repeats:
-    //
-    // - String literal, which begins with `'`, `"` or `\``, and continues until
-    //   the same character is encountered again.
-    // - Delimiter pair, which begins with `[`, `(`, or `{`, and continues until
-    //   the matching closing delimiter is found, skipping comments and string
-    //   literals.
-    // - When not nested inside of a delimiter pair, when a terminating
-    //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
-    //   token is done.
-    // - Otherwise, accumulate the character into the current baseline token.
-    while let Some((_, c)) = src.peek() {
-        let c = *c;
-
-        if quote_start.is_some() {
-            // If we encountered the closing quote character for the current
-            // string, we're done with the current string.
-            if Some(c) == quote_start {
-                quote_start = None;
-            }
-        } else if c == '\n' {
-            if is_termination(&block_level, c) {
-                break;
-            }
-        } else if c == '\'' || c == '"' || c == '`' {
-            // We encountered the opening quote of a string literal.
-            quote_start = Some(c);
-        } else if c == '[' {
-            // We encountered an opening `[` delimiter.
-            block_level.push(BlockKind::SquareBracket);
-        } else if c == ']' {
-            // We encountered a closing `]` delimiter. Pop off the opening `[`
-            // delimiter.
-            if let Some(BlockKind::SquareBracket) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if c == '{' {
-            // We encountered an opening `{` delimiter.
-            block_level.push(BlockKind::CurlyBracket);
-        } else if c == '}' {
-            // We encountered a closing `}` delimiter. Pop off the opening `{`.
-            if let Some(BlockKind::CurlyBracket) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if c == '(' {
-            // We enceountered an opening `(` delimiter.
-            block_level.push(BlockKind::Paren);
-        } else if c == ')' {
-            // We encountered a closing `)` delimiter. Pop off the opening `(`.
-            if let Some(BlockKind::Paren) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if is_termination(&block_level, c) {
-            break;
-        }
-
-        // Otherwise, accumulate the character into the current token.
-        token_contents.push(c);
-
-        // Consume the character.
-        let _ = src.next();
-    }
-
-    let span = Span::new(start_offset, start_offset + token_contents.len());
-
-    // If there is still unclosed opening delimiters, close them and add
-    // synthetic closing characters to the accumulated token.
-    if block_level.last().is_some() {
-        // let delim: char = (*block).closing();
-        // let cause = ParseError::unexpected_eof(delim.to_string(), span);
-
-        // while let Some(bk) = block_level.pop() {
-        //     token_contents.push(bk.closing());
-        // }
-
-        return token_contents.spanned(span);
-    }
-
-    if quote_start.is_some() {
-        // The non-lite parse trims quotes on both sides, so we add the expected quote so that
-        // anyone wanting to consume this partial parse (e.g., completions) will be able to get
-        // correct information from the non-lite parse.
-        // token_contents.push(delimiter);
-
-        // return (
-        //     token_contents.spanned(span),
-        //     Some(ParseError::unexpected_eof(delimiter.to_string(), span)),
-        // );
-        return token_contents.spanned(span);
-    }
-
-    token_contents.spanned(span)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::DetectColumns;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(DetectColumns {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/detect/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/detect/mod.rs
deleted file mode 100644
index 5c56257ba..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/detect/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod columns;
-
-pub use columns::DetectColumns;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/format/command.rs b/old_nushell/crates/nu-command/src/commands/strings/format/command.rs
deleted file mode 100644
index eb402e3cd..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/format/command.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use crate::prelude::*;
-use nu_engine::evaluate_baseline_expr;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-use std::borrow::Borrow;
-
-pub struct Format;
-
-impl WholeStreamCommand for Format {
-    fn name(&self) -> &str {
-        "format"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("format").required(
-            "pattern",
-            SyntaxShape::String,
-            "the pattern to output. Eg) \"{foo}: {bar}\"",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Format columns into a string using a simple pattern."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        format_command(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Print filenames with their sizes",
-            example: "ls | format '{name}: {size}'",
-            result: None,
-        }]
-    }
-}
-
-fn format_command(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let ctx = Arc::new(args.context.clone());
-    let pattern: Tagged<String> = args.req(0)?;
-
-    let format_pattern = format(&pattern);
-    let commands = Arc::new(format_pattern);
-
-    Ok(args
-        .input
-        .map(move |value| {
-            let mut output = String::new();
-            let commands = commands.clone();
-            let ctx = ctx.clone();
-
-            for command in &*commands {
-                match command {
-                    FormatCommand::Text(s) => {
-                        output.push_str(s);
-                    }
-                    FormatCommand::Column(c) => {
-                        // FIXME: use the correct spans
-                        let full_column_path = nu_parser::parse_full_column_path(
-                            &(c.to_string()).spanned(Span::unknown()),
-                            &ctx.scope,
-                        );
-
-                        ctx.scope.enter_scope();
-                        ctx.scope.add_var("$it", value.clone());
-                        let result = evaluate_baseline_expr(&full_column_path.0, &ctx);
-                        ctx.scope.exit_scope();
-
-                        if let Ok(c) = result {
-                            output.push_str(&value::format_leaf(c.borrow()).plain_string(100_000))
-                        } else {
-                            // That column doesn't match, so don't emit anything
-                        }
-                    }
-                }
-            }
-
-            Ok(UntaggedValue::string(output).into_untagged_value())
-        })
-        .into_input_stream())
-}
-
-#[derive(Debug)]
-enum FormatCommand {
-    Text(String),
-    Column(String),
-}
-
-fn format(input: &str) -> Vec<FormatCommand> {
-    let mut output = vec![];
-
-    let mut loop_input = input.chars();
-    loop {
-        let mut before = String::new();
-
-        for c in &mut loop_input {
-            if c == '{' {
-                break;
-            }
-            before.push(c);
-        }
-
-        if !before.is_empty() {
-            output.push(FormatCommand::Text(before.to_string()));
-        }
-        // Look for column as we're now at one
-        let mut column = String::new();
-
-        for c in &mut loop_input {
-            if c == '}' {
-                break;
-            }
-            column.push(c);
-        }
-
-        if !column.is_empty() {
-            output.push(FormatCommand::Column(column.to_string()));
-        }
-
-        if before.is_empty() && column.is_empty() {
-            break;
-        }
-    }
-
-    output
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Format;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Format {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/format/format_filesize.rs b/old_nushell/crates/nu-command/src/commands/strings/format/format_filesize.rs
deleted file mode 100644
index 23d56ffac..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/format/format_filesize.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use crate::prelude::*;
-use nu_data::base::shape::InlineShape;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ColumnPath, Primitive::Filesize, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-use nu_value_ext::get_data_by_column_path;
-
-pub struct FileSize;
-
-impl WholeStreamCommand for FileSize {
-    fn name(&self) -> &str {
-        "format filesize"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("format filesize")
-            .required(
-                "field",
-                SyntaxShape::ColumnPath,
-                "the name of the column to update",
-            )
-            .required(
-                "format value",
-                SyntaxShape::String,
-                "the format into which convert the filesizes",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "Converts a column of filesizes to some specified format"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        filesize(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert the size row to KB",
-                example: "ls | format filesize size KB",
-                result: None,
-            },
-            Example {
-                description: "Convert the apparent row to B",
-                example: "du | format filesize apparent B",
-                result: None,
-            },
-        ]
-    }
-}
-
-fn process_row(
-    input: Value,
-    format: Tagged<String>,
-    field: Arc<ColumnPath>,
-) -> Result<Value, ShellError> {
-    let replace_for = get_data_by_column_path(&input, &field, move |_, _, error| error);
-    match replace_for {
-        Ok(s) => {
-            if let Value {
-                value: UntaggedValue::Primitive(Filesize(fs)),
-                ..
-            } = s
-            {
-                let byte_format = InlineShape::format_bytes(fs, Some(&format.item));
-                let byte_value = Value::from(byte_format.1);
-                Ok(input
-                    .replace_data_at_column_path(&field, byte_value)
-                    .expect(
-                    "Given that the existence check was already done, this shouldn't trigger never",
-                ))
-            } else {
-                Err(ShellError::labeled_error(
-                    "the data in this row is not of the type filesize",
-                    "invalid datatype in row",
-                    input.tag(),
-                ))
-            }
-        }
-        Err(e) => Err(e),
-    }
-}
-
-fn filesize(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let field: ColumnPath = args.req(0)?;
-    let format: Tagged<String> = args.req(1)?;
-    let field = Arc::new(field);
-
-    Ok(args
-        .input
-        .flat_map(move |input| {
-            let format = format.clone();
-            let field = field.clone();
-
-            match process_row(input, format, field) {
-                Ok(s) => Ok(s),
-                Err(e) => Err(e),
-            }
-        })
-        .map(Ok)
-        .into_input_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::FileSize;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(FileSize {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/format/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/format/mod.rs
deleted file mode 100644
index cd8267069..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/format/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-pub mod command;
-pub mod format_filesize;
-
-pub use command::Format;
-pub use format_filesize::FileSize;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/lines.rs b/old_nushell/crates/nu-command/src/commands/strings/lines.rs
deleted file mode 100644
index 5d8a588dc..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/lines.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
-use parking_lot::Mutex;
-
-pub struct Lines;
-
-impl WholeStreamCommand for Lines {
-    fn name(&self) -> &str {
-        "lines"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("lines")
-    }
-
-    fn usage(&self) -> &str {
-        "Split single string into rows, one per line."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        lines(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Split multi-line string into lines",
-            example: r#"^echo "two\nlines" | lines"#,
-            result: None,
-        }]
-    }
-}
-
-fn ends_with_line_ending(st: &str) -> bool {
-    let mut temp = st.to_string();
-    let last = temp.pop();
-    if let Some(c) = last {
-        c == '\n'
-    } else {
-        false
-    }
-}
-
-fn lines(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let leftover_string = Arc::new(Mutex::new(String::new()));
-    let tag = args.name_tag();
-    let name_span = tag.span;
-
-    let eos = vec![UntaggedValue::Primitive(Primitive::EndOfStream).into_untagged_value()];
-
-    Ok(args
-        .input
-        .chain(eos)
-        .filter_map(move |item| {
-            let leftover_string = leftover_string.clone();
-            match item {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(st)),
-                    ..
-                } => {
-                    let mut leftover_string = leftover_string.lock();
-
-                    let mut buffer = leftover_string.clone();
-                    buffer.push_str(&st);
-
-                    let mut lines: Vec<String> = buffer.lines().map(|x| x.to_string()).collect();
-
-                    leftover_string.clear();
-
-                    if !ends_with_line_ending(&st) {
-                        if let Some(last) = lines.pop() {
-                            leftover_string.push_str(&last);
-                        }
-                    }
-
-                    if !lines.is_empty() {
-                        let success_lines: Vec<_> = lines
-                            .iter()
-                            .map(|x| {
-                                ReturnSuccess::value(UntaggedValue::string(x).into_untagged_value())
-                            })
-                            .collect();
-
-                        Some(success_lines)
-                    } else {
-                        None
-                    }
-                }
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::EndOfStream),
-                    ..
-                } => {
-                    let st = leftover_string.lock().clone();
-                    if !st.is_empty() {
-                        Some(vec![ReturnSuccess::value(
-                            UntaggedValue::string(st).into_untagged_value(),
-                        )])
-                    } else {
-                        None
-                    }
-                }
-                Value {
-                    tag: value_span, ..
-                } => Some(vec![Err(ShellError::labeled_error_with_secondary(
-                    "Expected a string from pipeline",
-                    "requires string input",
-                    name_span,
-                    "value originates from here",
-                    value_span,
-                ))]),
-            }
-        })
-        .flatten()
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Lines;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Lines {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/mod.rs
deleted file mode 100644
index b92f5e254..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-mod build_string;
-mod char_;
-mod detect;
-mod format;
-mod lines;
-mod parse;
-mod size;
-mod split;
-mod split_by;
-mod str_;
-
-pub use build_string::BuildString;
-pub use char_::Char;
-pub use detect::DetectColumns;
-pub use format::*;
-pub use lines::Lines;
-pub use parse::*;
-pub use size::Size;
-pub use split::*;
-pub use split_by::SplitBy;
-pub use str_::*;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/parse/command.rs b/old_nushell/crates/nu-command/src/commands/strings/parse/command.rs
deleted file mode 100644
index 656555d69..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/parse/command.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tagged;
-
-use regex::{self, Regex};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "parse"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("parse")
-            .required(
-                "pattern",
-                SyntaxShape::String,
-                "the pattern to match. Eg) \"{foo}: {bar}\"",
-            )
-            .switch("regex", "use full regex syntax for patterns", Some('r'))
-    }
-
-    fn usage(&self) -> &str {
-        "Parse columns from string data using a simple pattern."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        let mut row = IndexMap::new();
-        row.insert("foo".to_string(), Value::from("hi"));
-        row.insert("bar".to_string(), Value::from("there"));
-        vec![
-            Example {
-                description: "Parse a string into two named columns",
-                example: "echo \"hi there\" | parse \"{foo} {bar}\"",
-                result: Some(vec![UntaggedValue::row(row.clone()).into()]),
-            },
-            Example {
-                description: "Parse a string using regex pattern",
-                example: "echo \"hi there\" | parse -r \"(?P<foo>\\w+) (?P<bar>\\w+)\"",
-                result: Some(vec![UntaggedValue::row(row).into()]),
-            },
-        ]
-    }
-}
-
-pub fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let name_tag = args.call_info.name_tag.clone();
-
-    let pattern: Tagged<String> = args.req(0)?;
-    let regex: bool = args.has_flag("regex");
-
-    let item_to_parse = if regex {
-        pattern.item.clone()
-    } else {
-        build_regex(&pattern.item, pattern.tag.clone())?
-    };
-
-    let regex_pattern =
-        Regex::new(&item_to_parse).map_err(|e| parse_regex_error(e, pattern.span()))?;
-
-    let columns = column_names(&regex_pattern);
-    let mut parsed: VecDeque<Value> = VecDeque::new();
-
-    for v in args.input {
-        match v.as_string() {
-            Ok(s) => {
-                let results = regex_pattern.captures_iter(&s);
-
-                for c in results {
-                    let mut dict = TaggedDictBuilder::new(&v.tag);
-
-                    for (column_name, cap) in columns.iter().zip(c.iter().skip(1)) {
-                        let cap_string = cap.map(|v| v.as_str()).unwrap_or("").to_string();
-                        dict.insert_untagged(column_name, UntaggedValue::string(cap_string));
-                    }
-
-                    parsed.push_back(dict.into_value());
-                }
-            }
-            Err(_) => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Expected string input",
-                    "expected string input",
-                    &name_tag,
-                    "value originated here",
-                    v.tag,
-                ))
-            }
-        }
-    }
-
-    Ok(parsed.into_iter().into_output_stream())
-}
-
-fn build_regex(input: &str, tag: Tag) -> Result<String, ShellError> {
-    let mut output = "(?s)\\A".to_string();
-
-    //let mut loop_input = input;
-    let mut loop_input = input.chars().peekable();
-    loop {
-        let mut before = String::new();
-        while let Some(c) = loop_input.next() {
-            if c == '{' {
-                // If '{{', still creating a plaintext parse command, but just for a single '{' char
-                if loop_input.peek() == Some(&'{') {
-                    let _ = loop_input.next();
-                } else {
-                    break;
-                }
-            }
-            before.push(c);
-        }
-
-        if !before.is_empty() {
-            output.push_str(&regex::escape(&before));
-        }
-
-        // Look for column as we're now at one
-        let mut column = String::new();
-        while let Some(c) = loop_input.next() {
-            if c == '}' {
-                break;
-            }
-            column.push(c);
-
-            if loop_input.peek().is_none() {
-                return Err(ShellError::labeled_error(
-                    "Found opening `{` without an associated closing `}`",
-                    "invalid parse pattern",
-                    tag,
-                ));
-            }
-        }
-
-        if !column.is_empty() {
-            output.push_str("(?P<");
-            output.push_str(&column);
-            output.push_str(">.*?)");
-        }
-
-        if before.is_empty() && column.is_empty() {
-            break;
-        }
-    }
-
-    output.push_str("\\z");
-    Ok(output)
-}
-
-fn column_names(regex: &Regex) -> Vec<String> {
-    regex
-        .capture_names()
-        .enumerate()
-        .skip(1)
-        .map(|(i, name)| {
-            name.map(String::from)
-                .unwrap_or_else(|| format!("Capture{}", i))
-        })
-        .collect()
-}
-
-fn parse_regex_error(e: regex::Error, base_span: Span) -> ShellError {
-    match e {
-        regex::Error::Syntax(msg) => {
-            let mut lines = msg.lines();
-
-            let main_msg = lines
-                .next()
-                .map(|l| l.replace(':', ""))
-                .expect("invalid regex pattern");
-
-            let span = lines.nth(1).and_then(|l| l.find('^')).map(|space| {
-                let start = base_span.start() + space - 3;
-                Span::for_char(start)
-            });
-
-            let msg = lines
-                .next()
-                .and_then(|l| l.split(':').nth(1))
-                .map(|s| s.trim().to_string());
-
-            match (msg, span) {
-                (Some(msg), Some(span)) => {
-                    ShellError::labeled_error_with_secondary(&msg, &msg, span, main_msg, span)
-                }
-                _ => ShellError::labeled_error("Invalid regex", "invalid regex", base_span),
-            }
-        }
-        _ => ShellError::labeled_error("Invalid regex", "invalid regex", base_span),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/parse/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/parse/mod.rs
deleted file mode 100644
index e7c608da7..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/parse/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod command;
-
-pub use command::Command as Parse;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/size.rs b/old_nushell/crates/nu-command/src/commands/strings/size.rs
deleted file mode 100644
index cd48623bd..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/size.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-extern crate unicode_segmentation;
-
-use crate::prelude::*;
-use indexmap::indexmap;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, TaggedDictBuilder, UntaggedValue, Value};
-use unicode_segmentation::UnicodeSegmentation;
-
-pub struct Size;
-
-impl WholeStreamCommand for Size {
-    fn name(&self) -> &str {
-        "size"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("size")
-    }
-
-    fn usage(&self) -> &str {
-        "Gather word count statistics on the text."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        size(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Count the number of words in a string",
-                example: r#"echo "There are seven words in this sentence" | size"#,
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "lines".to_string() => UntaggedValue::int(0).into(),
-                        "words".to_string() => UntaggedValue::int(7).into(),
-                        "chars".to_string() => UntaggedValue::int(38).into(),
-                        "bytes".to_string() => UntaggedValue::int(38).into(),
-                })
-                .into()]),
-            },
-            Example {
-                description: "Counts Unicode characters correctly in a string",
-                example: r#"echo "Amélie Amelie" | size"#,
-                result: Some(vec![UntaggedValue::row(indexmap! {
-                        "lines".to_string() => UntaggedValue::int(0).into(),
-                        "words".to_string() => UntaggedValue::int(2).into(),
-                        "chars".to_string() => UntaggedValue::int(13).into(),
-                        "bytes".to_string() => UntaggedValue::int(15).into(),
-                })
-                .into()]),
-            },
-        ]
-    }
-}
-
-fn size(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let input = args.input;
-    let tag = args.call_info.name_tag;
-    let name_span = tag.span;
-
-    Ok(input
-        .map(move |v| {
-            if let Ok(s) = v.as_string() {
-                Ok(count(&s, &v.tag))
-            } else {
-                Err(ShellError::labeled_error_with_secondary(
-                    "Expected a string from pipeline",
-                    "requires string input",
-                    name_span,
-                    "value originates from here",
-                    v.tag.span,
-                ))
-            }
-        })
-        .into_input_stream())
-}
-
-fn count(contents: &str, tag: impl Into<Tag>) -> Value {
-    let mut lines: i64 = 0;
-    let mut words: i64 = 0;
-    let mut chars: i64 = 0;
-    let bytes = contents.len() as i64;
-    let mut end_of_word = true;
-
-    for c in UnicodeSegmentation::graphemes(contents, true) {
-        chars += 1;
-
-        match c {
-            "\n" => {
-                lines += 1;
-                end_of_word = true;
-            }
-            " " => end_of_word = true,
-            _ => {
-                if end_of_word {
-                    words += 1;
-                }
-                end_of_word = false;
-            }
-        }
-    }
-
-    let mut dict = TaggedDictBuilder::new(tag);
-    //TODO: add back in name when we have it in the tag
-    //dict.insert("name", value::string(name));
-    dict.insert_untagged("lines", UntaggedValue::int(lines));
-    dict.insert_untagged("words", UntaggedValue::int(words));
-    dict.insert_untagged("chars", UntaggedValue::int(chars));
-    dict.insert_untagged("bytes", UntaggedValue::int(bytes));
-
-    dict.into_value()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::Size;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Size {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split/chars.rs b/old_nushell/crates/nu-command/src/commands/strings/split/chars.rs
deleted file mode 100644
index dda836bce..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split/chars.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "split chars"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split chars")
-    }
-
-    fn usage(&self) -> &str {
-        "splits a string's characters into separate rows"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(split_chars(args))
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Split the string's characters into separate rows",
-            example: "echo 'hello' | split chars",
-            result: Some(vec![
-                Value::from("h"),
-                Value::from("e"),
-                Value::from("l"),
-                Value::from("l"),
-                Value::from("o"),
-            ]),
-        }]
-    }
-}
-
-fn split_chars(args: CommandArgs) -> ActionStream {
-    let name = args.call_info.name_tag.clone();
-    let input = args.input;
-    input
-        .flat_map(move |v| {
-            if let Ok(s) = v.as_string() {
-                s.chars()
-                    .collect::<Vec<_>>()
-                    .into_iter()
-                    .map(move |x| ReturnSuccess::value(Value::from(x.to_string())))
-                    .into_action_stream()
-            } else {
-                ActionStream::one(Err(ShellError::labeled_error_with_secondary(
-                    "Expected a string from pipeline",
-                    "requires string input",
-                    name.span,
-                    "value originates from here",
-                    v.tag.span,
-                )))
-            }
-        })
-        .into_action_stream()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split/column.rs b/old_nushell/crates/nu-command/src/commands/strings/split/column.rs
deleted file mode 100644
index d8c7a4665..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split/column.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::prelude::*;
-use log::trace;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    Primitive, ReturnSuccess, Signature, SyntaxShape, TaggedDictBuilder, UntaggedValue,
-};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "split column"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split column")
-            .required(
-                "separator",
-                SyntaxShape::String,
-                "the character that denotes what separates columns",
-            )
-            .switch("collapse-empty", "remove empty columns", Some('c'))
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "column names to give the new columns",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "splits contents across multiple columns via the separator."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        split_column(args)
-    }
-}
-
-fn split_column(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name_span = args.call_info.name_tag.span;
-    let separator: Tagged<String> = args.req(0)?;
-    let rest: Vec<Tagged<String>> = args.rest(1)?;
-    let collapse_empty = args.has_flag("collapse-empty");
-    let input = args.input;
-
-    Ok(input
-        .map(move |v| {
-            if let Ok(s) = v.as_string() {
-                let splitter = separator.replace("\\n", "\n");
-                trace!("splitting with {:?}", splitter);
-
-                let split_result: Vec<_> = if collapse_empty {
-                    s.split(&splitter).filter(|s| !s.is_empty()).collect()
-                } else {
-                    s.split(&splitter).collect()
-                };
-
-                trace!("split result = {:?}", split_result);
-
-                let positional: Vec<_> = rest.iter().map(|f| f.item.clone()).collect();
-
-                // If they didn't provide column names, make up our own
-                if positional.is_empty() {
-                    let mut gen_columns = vec![];
-                    for i in 0..split_result.len() {
-                        gen_columns.push(format!("Column{}", i + 1));
-                    }
-
-                    let mut dict = TaggedDictBuilder::new(&v.tag);
-                    for (&k, v) in split_result.iter().zip(&gen_columns) {
-                        dict.insert_untagged(v.clone(), Primitive::String(k.into()));
-                    }
-
-                    ReturnSuccess::value(dict.into_value())
-                } else {
-                    let mut dict = TaggedDictBuilder::new(&v.tag);
-                    for (&k, v) in split_result.iter().zip(&positional) {
-                        dict.insert_untagged(
-                            v,
-                            UntaggedValue::Primitive(Primitive::String(k.into())),
-                        );
-                    }
-                    ReturnSuccess::value(dict.into_value())
-                }
-            } else {
-                Err(ShellError::labeled_error_with_secondary(
-                    "Expected a string from pipeline",
-                    "requires string input",
-                    name_span,
-                    "value originates from here",
-                    v.tag.span,
-                ))
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split/command.rs b/old_nushell/crates/nu-command/src/commands/strings/split/command.rs
deleted file mode 100644
index 2e9955326..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split/command.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-
-#[derive(Clone)]
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "split"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split")
-    }
-
-    fn usage(&self) -> &str {
-        "Split contents across desired subcommand (like row, column) via the separator."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(ActionStream::one(Ok(ReturnSuccess::Value(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        ))))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/split/mod.rs
deleted file mode 100644
index 18bc0717a..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod chars;
-pub mod column;
-pub mod command;
-pub mod row;
-
-pub use chars::SubCommand as SplitChars;
-pub use column::SubCommand as SplitColumn;
-pub use command::Command as Split;
-pub use row::SubCommand as SplitRow;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split/row.rs b/old_nushell/crates/nu-command/src/commands/strings/split/row.rs
deleted file mode 100644
index a86716703..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split/row.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use crate::prelude::*;
-use log::trace;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "split row"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split row").required(
-            "separator",
-            SyntaxShape::String,
-            "the character that denotes what separates rows",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "splits contents over multiple rows via the separator."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        split_row(args)
-    }
-}
-
-fn split_row(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let separator: Tagged<String> = args.req(0)?;
-    let input = args.input;
-
-    Ok(input
-        .flat_map(move |v| {
-            if let Ok(s) = v.as_string() {
-                let splitter = separator.item.replace("\\n", "\n");
-                trace!("splitting with {:?}", splitter);
-                let split_result: Vec<String> = s
-                    .split(&splitter)
-                    .filter_map(|s| {
-                        if s.trim() != "" {
-                            Some(s.to_string())
-                        } else {
-                            None
-                        }
-                    })
-                    .collect();
-
-                trace!("split result = {:?}", split_result);
-
-                (split_result.into_iter().map(move |s| {
-                    ReturnSuccess::value(
-                        UntaggedValue::Primitive(Primitive::String(s)).into_value(&v.tag),
-                    )
-                }))
-                .into_action_stream()
-            } else {
-                ActionStream::one(Err(ShellError::labeled_error_with_secondary(
-                    "Expected a string from pipeline",
-                    "requires string input",
-                    name.span,
-                    "value originates from here",
-                    v.tag.span,
-                )))
-            }
-        })
-        .into_action_stream())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/split_by.rs b/old_nushell/crates/nu-command/src/commands/strings/split_by.rs
deleted file mode 100644
index 069ef2ac8..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/split_by.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use crate::prelude::*;
-use crate::utils::suggestions::suggestions;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, Value};
-use nu_source::Tagged;
-use nu_value_ext::as_string;
-
-pub struct SplitBy;
-
-impl WholeStreamCommand for SplitBy {
-    fn name(&self) -> &str {
-        "split-by"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("split-by").optional(
-            "column_name",
-            SyntaxShape::String,
-            "the name of the column within the nested table to split by",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Creates a new table with the data from the inner tables split by the column given."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        split_by(args)
-    }
-}
-
-pub fn split_by(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-    let column_name: Option<Tagged<String>> = args.opt(0)?;
-
-    let values: Vec<Value> = args.input.collect();
-
-    if values.len() > 1 || values.is_empty() {
-        return Err(ShellError::labeled_error(
-            "Expected table from pipeline",
-            "requires a table input",
-            name,
-        ));
-    }
-
-    let split = split(&column_name, &values[0], &name)?;
-    Ok(ActionStream::one(ReturnSuccess::value(split)))
-}
-
-enum Grouper {
-    ByColumn(Option<Tagged<String>>),
-}
-
-pub fn split(
-    column_name: &Option<Tagged<String>>,
-    values: &Value,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let name = tag.into();
-
-    let grouper = if let Some(column_name) = column_name {
-        Grouper::ByColumn(Some(column_name.clone()))
-    } else {
-        Grouper::ByColumn(None)
-    };
-
-    match grouper {
-        Grouper::ByColumn(Some(column_name)) => {
-            let block = Box::new(move |_, row: &Value| {
-                match row.get_data_by_key(column_name.borrow_spanned()) {
-                    Some(group_key) => Ok(as_string(&group_key)?),
-                    None => Err(suggestions(column_name.borrow_tagged(), row)),
-                }
-            });
-
-            nu_data::utils::split(values, &Some(block), &name)
-        }
-        Grouper::ByColumn(None) => {
-            let block = Box::new(move |_, row: &Value| as_string(row));
-
-            nu_data::utils::split(values, &Some(block), &name)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::split;
-    use super::ShellError;
-    use nu_data::utils::helpers::committers_grouped_by_date;
-    use nu_protocol::UntaggedValue;
-    use nu_source::*;
-    use nu_test_support::value::{date, int, row, string, table};
-
-    #[test]
-    fn splits_inner_tables_by_key() {
-        let for_key = Some(String::from("country").tagged_unknown());
-
-        assert_eq!(
-            split(&for_key, &committers_grouped_by_date(), Tag::unknown()).unwrap(),
-            UntaggedValue::row(indexmap! {
-                "EC".into() => row(indexmap! {
-                    "2019-07-23".into() => table(&[
-                        row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-07-23"), "chickens".into() => int(10)})
-                    ]),
-                    "2019-09-24".into() => table(&[
-                        row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-09-24"), "chickens".into() => int(20)})
-                    ]),
-                    "2019-10-10".into() => table(&[
-                        row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => date("2019-10-10"), "chickens".into() => int(30)})
-                    ])
-                }),
-                "NZ".into() => row(indexmap! {
-                    "2019-07-23".into() => table(&[
-                        row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(5)})
-                    ]),
-                    "2019-09-24".into() => table(&[
-                        row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-09-24"), "chickens".into() => int(10)})
-                    ]),
-                    "2019-10-10".into() => table(&[
-                        row(indexmap!{"name".into() => string("JT"), "country".into() => string("NZ"), "date".into() => date("2019-10-10"), "chickens".into() => int(15)})
-                    ])
-                }),
-                "US".into() => row(indexmap! {
-                    "2019-07-23".into() => table(&[
-                        row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-07-23"), "chickens".into() =>  int(2)})
-                    ]),
-                    "2019-09-24".into() => table(&[
-                        row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-09-24"), "chickens".into() =>  int(4)})
-                    ]),
-                    "2019-10-10".into() => table(&[
-                        row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => date("2019-10-10"), "chickens".into() =>  int(6)})
-                    ])
-                })
-            }).into_untagged_value()
-        );
-    }
-
-    #[test]
-    fn errors_if_key_within_some_inner_table_is_missing() {
-        let for_key = Some(String::from("country").tagged_unknown());
-
-        let nu_releases = row(indexmap! {
-            "2019-07-23".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("AR"), "country".into() => string("EC"), "date".into() => string("2019-07-23")})
-            ]),
-            "2019-09-24".into() =>  table(&[
-                    row(indexmap!{"name".into() => UntaggedValue::string("JT").into_value(Tag::from(Span::new(5,10))), "date".into() => string("2019-09-24")})
-            ]),
-            "October 10-2019".into() =>  table(&[
-                    row(indexmap!{"name".into() => string("YK"), "country".into() => string("US"), "date".into() => string("October 10-2019")})
-            ])
-        });
-
-        assert!(split(&for_key, &nu_releases, Tag::from(Span::new(5, 10))).is_err());
-    }
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use super::SplitBy;
-        use crate::examples::test as test_examples;
-
-        test_examples(SplitBy {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/capitalize.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/capitalize.rs
deleted file mode 100644
index 176aa164a..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/capitalize.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tag;
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str capitalize"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str capitalize").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally capitalize text by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "capitalizes text"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Capitalize contents",
-            example: "echo 'good day' | str capitalize",
-            result: Some(vec![Value::from("Good day")]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                action(&v, v.tag())
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let mut capitalized = String::new();
-
-            for (idx, character) in s.chars().enumerate() {
-                let out = if idx == 0 {
-                    character.to_uppercase().to_string()
-                } else {
-                    character.to_lowercase().to_string()
-                };
-
-                capitalized.push_str(&out);
-            }
-
-            Ok(UntaggedValue::string(capitalized).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn capitalizes() {
-        let word = string("andres");
-        let expected = string("Andres");
-
-        let actual = action(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/camel_case.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/camel_case.rs
deleted file mode 100644
index db1b9ac62..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/camel_case.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use super::{operate, to_lower_camel_case};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str camel-case"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str camel-case").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text to camelCase by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts a string to camelCase"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args, &to_lower_camel_case)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "convert a string to camelCase",
-            example: "echo 'NuShell' | str camel-case",
-            result: Some(vec![Value::from("nuShell")]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{to_lower_camel_case, SubCommand};
-    use crate::commands::strings::str_::case::action;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn camel_case_from_kebab() {
-        let word = string("this-is-the-first-case");
-        let expected = string("thisIsTheFirstCase");
-
-        let actual = action(&word, Tag::unknown(), &to_lower_camel_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn camel_case_from_snake() {
-        let word = string("this_is_the_second_case");
-        let expected = string("thisIsTheSecondCase");
-
-        let actual = action(&word, Tag::unknown(), &to_lower_camel_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/kebab_case.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/kebab_case.rs
deleted file mode 100644
index 9fff03865..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/kebab_case.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use super::{operate, to_kebab_case};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str kebab-case"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str kebab-case").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text to kebab-case by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts a string to kebab-case"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args, &to_kebab_case)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "convert a string to kebab-case",
-            example: "echo 'NuShell' | str kebab-case",
-            result: Some(vec![Value::from("nu-shell")]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{to_kebab_case, SubCommand};
-    use crate::commands::strings::str_::case::action;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn kebab_case_from_camel() {
-        let word = string("thisIsTheFirstCase");
-        let expected = string("this-is-the-first-case");
-
-        let actual = action(&word, Tag::unknown(), &to_kebab_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn kebab_case_from_screaming_snake() {
-        let word = string("THIS_IS_THE_SECOND_CASE");
-        let expected = string("this-is-the-second-case");
-
-        let actual = action(&word, Tag::unknown(), &to_kebab_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/mod.rs
deleted file mode 100644
index 86831443f..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/mod.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-pub mod camel_case;
-pub mod kebab_case;
-pub mod pascal_case;
-pub mod screaming_snake_case;
-pub mod snake_case;
-
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{ColumnPath, Primitive, UntaggedValue, Value};
-use nu_source::Tag;
-use nu_value_ext::ValueExt;
-
-pub use camel_case::SubCommand as CamelCase;
-pub use pascal_case::SubCommand as PascalCase;
-pub use screaming_snake_case::SubCommand as ScreamingSnakeCase;
-pub use snake_case::SubCommand as SnakeCase;
-
-use heck::ToKebabCase;
-use heck::ToLowerCamelCase;
-use heck::ToShoutySnakeCase;
-use heck::ToSnakeCase;
-use heck::ToUpperCamelCase;
-macro_rules! create_heck_function {
-    ($func_name:ident) => {
-        pub fn $func_name(a_slice: &str) -> String {
-            a_slice.$func_name()
-        }
-    };
-}
-create_heck_function!(to_upper_camel_case);
-create_heck_function!(to_lower_camel_case);
-create_heck_function!(to_kebab_case);
-create_heck_function!(to_shouty_snake_case);
-create_heck_function!(to_snake_case);
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-pub fn operate<F>(args: CommandArgs, case_operation: &'static F) -> Result<OutputStream, ShellError>
-where
-    F: Fn(&str) -> String + Send + Sync + 'static,
-{
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                action(&v, v.tag(), &case_operation)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag(), &case_operation)),
-                    )?;
-                }
-
-                Ok(ret)
-            }
-        })
-        .into_input_stream())
-}
-
-pub fn action<F>(
-    input: &Value,
-    tag: impl Into<Tag>,
-    case_operation: &F,
-) -> Result<Value, ShellError>
-where
-    F: Fn(&str) -> String + Send + Sync + 'static,
-{
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::string(case_operation(s)).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/pascal_case.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/pascal_case.rs
deleted file mode 100644
index 2a3298083..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/pascal_case.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use super::{operate, to_upper_camel_case};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str pascal-case"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str pascal-case").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text to PascalCase by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts a string to PascalCase"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args, &to_upper_camel_case)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "convert a string to PascalCase",
-            example: "echo 'nu-shell' | str pascal-case",
-            result: Some(vec![Value::from("NuShell")]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{to_upper_camel_case, SubCommand};
-    use crate::commands::strings::str_::case::action;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn pascal_case_from_kebab() {
-        let word = string("this-is-the-first-case");
-        let expected = string("ThisIsTheFirstCase");
-
-        let actual = action(&word, Tag::unknown(), &to_upper_camel_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn pascal_case_from_snake() {
-        let word = string("this_is_the_second_case");
-        let expected = string("ThisIsTheSecondCase");
-
-        let actual = action(&word, Tag::unknown(), &to_upper_camel_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/screaming_snake_case.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/screaming_snake_case.rs
deleted file mode 100644
index 7fc4c3dcf..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/screaming_snake_case.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use super::{operate, to_shouty_snake_case};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str screaming-snake-case"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str screaming-snake-case").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text to SCREAMING_SNAKE_CASE by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts a string to SCREAMING_SNAKE_CASE"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args, &to_shouty_snake_case)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "convert a string to SCREAMING_SNAKE_CASE",
-            example: "echo 'NuShell' | str screaming-snake-case",
-            result: Some(vec![Value::from("NU_SHELL")]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{to_shouty_snake_case, SubCommand};
-    use crate::commands::strings::str_::case::action;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn snake_case_from_kebab() {
-        let word = string("this-is-the-first-case");
-        let expected = string("THIS_IS_THE_FIRST_CASE");
-
-        let actual = action(&word, Tag::unknown(), &to_shouty_snake_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn snake_case_from_snake() {
-        let word = string("this_is_the_second_case");
-        let expected = string("THIS_IS_THE_SECOND_CASE");
-
-        let actual = action(&word, Tag::unknown(), &to_shouty_snake_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/case/snake_case.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/case/snake_case.rs
deleted file mode 100644
index b2d865520..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/case/snake_case.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use super::{operate, to_snake_case};
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str snake-case"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str snake-case").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text to snake_case by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts a string to snake_case"
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        operate(args, &to_snake_case)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "convert a string to snake_case",
-            example: "echo 'NuShell' | str snake-case",
-            result: Some(vec![Value::from("nu_shell")]),
-        }]
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{to_snake_case, SubCommand};
-    use crate::commands::strings::str_::case::action;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn snake_case_from_kebab() {
-        let word = string("this-is-the-first-case");
-        let expected = string("this_is_the_first_case");
-
-        let actual = action(&word, Tag::unknown(), &to_snake_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn snake_case_from_camel() {
-        let word = string("thisIsTheSecondCase");
-        let expected = string("this_is_the_second_case");
-
-        let actual = action(&word, Tag::unknown(), &to_snake_case).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/collect.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/collect.rs
deleted file mode 100644
index d1d732465..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/collect.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tagged;
-
-pub struct SubCommand;
-
-struct Arguments {
-    separator: Option<Tagged<String>>,
-}
-
-impl Arguments {
-    pub fn separator(&self) -> &str {
-        self.separator.as_ref().map_or("", |sep| &sep.item)
-    }
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str collect"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str collect").desc(self.usage()).optional(
-            "separator",
-            SyntaxShape::String,
-            "the separator to put between the different values",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "collects a list of strings into a string"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        collect(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Collect a list of string",
-            example: "echo ['a' 'b' 'c'] | str collect",
-            result: Some(vec![Value::from("abc")]),
-        }]
-    }
-}
-
-pub fn collect(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let tag = args.call_info.name_tag.clone();
-
-    let (options, input) = (
-        Arguments {
-            separator: args.opt(0)?,
-        },
-        args.input,
-    );
-
-    let separator = options.separator();
-
-    let strings: Vec<Result<String, ShellError>> = input.map(|value| value.as_string()).collect();
-    let strings: Result<Vec<_>, _> = strings.into_iter().collect::<Result<_, _>>();
-
-    match strings {
-        Ok(strings) => {
-            let output = strings.join(separator);
-
-            Ok(ActionStream::one(ReturnSuccess::value(
-                UntaggedValue::string(output).into_value(tag),
-            )))
-        }
-        Err(err) => match err.error {
-            nu_errors::ProximateShellError::TypeError { actual, .. } => {
-                if let Some(item) = actual.item {
-                    Err(ShellError::labeled_error_with_secondary(
-                        "could not convert to string",
-                        format!("tried to convert '{}' in input to a string", item),
-                        tag.span,
-                        format!("'{}' value originated here", item),
-                        actual.span,
-                    ))
-                } else {
-                    Err(ShellError::labeled_error_with_secondary(
-                        "could not convert to string",
-                        "failed to convert input to strings",
-                        tag.span,
-                        "non-string found here",
-                        actual.span,
-                    ))
-                }
-            }
-            _ => Err(err),
-        },
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/command.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/command.rs
deleted file mode 100644
index f2063ec0b..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/command.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "str"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "Apply string function."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(ActionStream::one(ReturnSuccess::value(
-            UntaggedValue::string(get_full_help(&Command, args.scope())).into_value(Tag::unknown()),
-        )))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/contains.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/contains.rs
deleted file mode 100644
index 9660419e6..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/contains.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    pattern: Tagged<String>,
-    insensitive: bool,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str contains"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str contains")
-            .required("pattern", SyntaxShape::String, "the pattern to find")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally check if string contains pattern by column paths",
-            )
-            .switch("insensitive", "search is case insensitive", Some('i'))
-    }
-
-    fn usage(&self) -> &str {
-        "Checks if string contains pattern"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Check if string contains pattern",
-                example: "echo 'my_library.rb' | str contains '.rb'",
-                result: Some(vec![UntaggedValue::boolean(true).into_untagged_value()]),
-            },
-            Example {
-                description: "Check if string contains pattern case insensitive",
-                example: "echo 'my_library.rb' | str contains -i '.RB'",
-                result: Some(vec![UntaggedValue::boolean(true).into_untagged_value()]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            pattern: args.req(0)?,
-            insensitive: args.has_flag("insensitive"),
-            column_paths: args.rest(1)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    Arguments {
-        ref pattern,
-        insensitive,
-        ..
-    }: &Arguments,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let contains = if *insensitive {
-                s.to_lowercase().contains(&pattern.to_lowercase())
-            } else {
-                s.contains(&pattern.item)
-            };
-
-            Ok(UntaggedValue::boolean(contains).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, Arguments, SubCommand};
-    use nu_protocol::UntaggedValue;
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn string_contains_other_string_case_sensitive() {
-        let word = string("Cargo.tomL");
-
-        let options = Arguments {
-            pattern: String::from(".tomL").tagged_unknown(),
-            insensitive: false,
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::boolean(true).into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn string_does_not_contain_other_string_case_sensitive() {
-        let word = string("Cargo.tomL");
-
-        let options = Arguments {
-            pattern: String::from("Lomt.").tagged_unknown(),
-            insensitive: false,
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::boolean(false).into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn string_contains_other_string_case_insensitive() {
-        let word = string("Cargo.ToMl");
-
-        let options = Arguments {
-            pattern: String::from(".TOML").tagged_unknown(),
-            insensitive: true,
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::boolean(true).into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn string_does_not_contain_other_string_case_insensitive() {
-        let word = string("Cargo.tOml");
-
-        let options = Arguments {
-            pattern: String::from("lomt.").tagged_unknown(),
-            insensitive: true,
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::boolean(false).into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/downcase.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/downcase.rs
deleted file mode 100644
index 5d1bfe4cf..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/downcase.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tag;
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str downcase"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str downcase").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally downcase text by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "downcases text"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Downcase contents",
-            example: "echo 'NU' | str downcase",
-            result: Some(vec![Value::from("nu")]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::string(s.to_ascii_lowercase()).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn downcases() {
-        let word = string("ANDRES");
-
-        let actual = action(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, string("andres"));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/ends_with.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/ends_with.rs
deleted file mode 100644
index 648c8f6f4..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/ends_with.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct SubCommand;
-
-struct Arguments {
-    pattern: Tagged<String>,
-    column_paths: Vec<ColumnPath>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str ends-with"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str ends-with")
-            .required("pattern", SyntaxShape::String, "the pattern to match")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally matches suffix of text by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "checks if string ends with pattern"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Checks if string ends with '.rb' pattern",
-            example: "echo 'my_library.rb' | str ends-with '.rb'",
-            result: Some(vec![UntaggedValue::boolean(true).into_untagged_value()]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            pattern: args.req(0)?,
-            column_paths: args.rest(1)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options.pattern, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options.pattern, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, pattern: &str, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let ends_with = s.ends_with(pattern);
-            Ok(UntaggedValue::boolean(ends_with).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_protocol::UntaggedValue;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn str_ends_with_pattern() {
-        let word = string("Cargo.toml");
-        let pattern = ".toml";
-        let expected = UntaggedValue::boolean(true).into_untagged_value();
-
-        let actual = action(&word, pattern, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn str_does_not_end_with_pattern() {
-        let word = string("Cargo.toml");
-        let pattern = "Car";
-        let expected = UntaggedValue::boolean(false).into_untagged_value();
-
-        let actual = action(&word, pattern, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/find_replace.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/find_replace.rs
deleted file mode 100644
index d0de70a32..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/find_replace.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-use regex::Regex;
-
-struct Arguments {
-    all: bool,
-    find: Tagged<String>,
-    replace: Tagged<String>,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str find-replace"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str find-replace")
-            .required("find", SyntaxShape::String, "the pattern to find")
-            .required("replace", SyntaxShape::String, "the replacement pattern")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally find and replace text by column paths",
-            )
-            .switch("all", "replace all occurrences of find string", Some('a'))
-    }
-
-    fn usage(&self) -> &str {
-        "finds and replaces text"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Find and replace contents with capture group",
-                example: "echo 'my_library.rb' | str find-replace '(.+).rb' '$1.nu'",
-                result: Some(vec![Value::from("my_library.nu")]),
-            },
-            Example {
-                description: "Find and replace all occurrences of find string",
-                example: "echo 'abc abc abc' | str find-replace -a 'b' 'z'",
-                result: Some(vec![Value::from("azc azc azc")]),
-            },
-        ]
-    }
-}
-
-struct FindReplace<'a>(&'a str, &'a str);
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            all: args.has_flag("all"),
-            find: args.req(0)?,
-            replace: args.req(1)?,
-            column_paths: args.rest(2)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    Arguments {
-        find, replace, all, ..
-    }: &Arguments,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let FindReplace(find, replacement) = FindReplace(find, replace);
-            let regex = Regex::new(find);
-
-            Ok(match regex {
-                Ok(re) => {
-                    if *all {
-                        UntaggedValue::string(re.replace_all(s, replacement).to_owned())
-                    } else {
-                        UntaggedValue::string(re.replace(s, replacement).to_owned())
-                    }
-                }
-                Err(_) => UntaggedValue::string(s),
-            }
-            .into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, Arguments, SubCommand};
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn can_have_capture_groups() {
-        let word = string("Cargo.toml");
-
-        let options = Arguments {
-            find: String::from("Cargo.(.+)").tagged_unknown(),
-            replace: String::from("Carga.$1").tagged_unknown(),
-            column_paths: vec![],
-            all: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, string("Carga.toml"));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/index_of.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/index_of.rs
deleted file mode 100644
index 16d0dcef2..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/index_of.rs
+++ /dev/null
@@ -1,342 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::{as_string, ValueExt};
-
-struct Arguments {
-    end: bool,
-    pattern: Tagged<String>,
-    range: Option<Value>,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-#[derive(Clone)]
-pub struct IndexOfOptionalBounds(i32, i32);
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str index-of"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str index-of")
-            .required(
-                "pattern",
-                SyntaxShape::String,
-                "the pattern to find index of",
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally returns index of pattern in string by column paths",
-            )
-            .named(
-                "range",
-                SyntaxShape::Any,
-                "optional start and/or end index",
-                Some('r'),
-            )
-            .switch("end", "search from the end of the string", Some('e'))
-    }
-
-    fn usage(&self) -> &str {
-        "Returns starting index of given pattern in string counting from 0. Returns -1 when there are no results."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Returns index of pattern in string",
-                example: "echo 'my_library.rb' | str index-of '.rb'",
-                result: Some(vec![UntaggedValue::int(10).into_untagged_value()]),
-            },
-            Example {
-                description: "Returns index of pattern in string with start index",
-                example: "echo '.rb.rb' | str index-of '.rb' -r '1,'",
-                result: Some(vec![UntaggedValue::int(3).into_untagged_value()]),
-            },
-            Example {
-                description: "Returns index of pattern in string with end index",
-                example: "echo '123456' | str index-of '6' -r ',4'",
-                result: Some(vec![UntaggedValue::int(-1).into_untagged_value()]),
-            },
-            Example {
-                description: "Returns index of pattern in string with start and end index",
-                example: "echo '123456' | str index-of '3' -r '1,4'",
-                result: Some(vec![UntaggedValue::int(2).into_untagged_value()]),
-            },
-            Example {
-                description: "Alternatively you can use this form",
-                example: "echo '123456' | str index-of '3' -r [1 4]",
-                result: Some(vec![UntaggedValue::int(2).into_untagged_value()]),
-            },
-            Example {
-                description: "Returns index of pattern in string",
-                example: "echo '/this/is/some/path/file.txt' | str index-of '/' -e",
-                result: Some(vec![UntaggedValue::int(18).into_untagged_value()]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            pattern: args.req(0)?,
-            range: args.get_flag("range")?,
-            end: args.has_flag("end"),
-            column_paths: args.rest(1)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    Arguments {
-        ref pattern,
-        range,
-        end,
-        ..
-    }: &Arguments,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let range = match range {
-        Some(range) => range.clone(),
-        None => UntaggedValue::string("").into_value(&tag),
-    };
-
-    let r = process_range(input, &range)?;
-
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let start_index = r.0 as usize;
-            let end_index = r.1 as usize;
-
-            if *end {
-                if let Some(result) = s[start_index..end_index].rfind(&**pattern) {
-                    Ok(UntaggedValue::int(result as i64 + start_index as i64).into_value(tag))
-                } else {
-                    Ok(UntaggedValue::int(-1).into_value(tag))
-                }
-            } else if let Some(result) = s[start_index..end_index].find(&**pattern) {
-                Ok(UntaggedValue::int(result as i64 + start_index as i64).into_value(tag))
-            } else {
-                Ok(UntaggedValue::int(-1).into_value(tag))
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.span,
-            ))
-        }
-    }
-}
-
-fn process_range(input: &Value, range: &Value) -> Result<IndexOfOptionalBounds, ShellError> {
-    let input_len = match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => s.len(),
-        _ => 0,
-    };
-    let min_index_str = String::from("0");
-    let max_index_str = input_len.to_string();
-    let r = match &range.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let indexes: Vec<&str> = s.split(',').collect();
-
-            let start_index = indexes.get(0).unwrap_or(&&min_index_str[..]).to_string();
-
-            let end_index = indexes.get(1).unwrap_or(&&max_index_str[..]).to_string();
-
-            Ok((start_index, end_index))
-        }
-        UntaggedValue::Table(indexes) => {
-            if indexes.len() > 2 {
-                Err(ShellError::labeled_error(
-                    "there shouldn't be more than two indexes",
-                    "too many indexes",
-                    range.tag(),
-                ))
-            } else {
-                let idx: Vec<String> = indexes
-                    .iter()
-                    .map(|v| as_string(v).unwrap_or_else(|_| String::from("")))
-                    .collect();
-
-                let start_index = idx.get(0).unwrap_or(&min_index_str).to_string();
-                let end_index = idx.get(1).unwrap_or(&max_index_str).to_string();
-
-                Ok((start_index, end_index))
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                range.tag(),
-            ))
-        }
-    }?;
-
-    let start_index = r.0.parse::<i32>().unwrap_or(0);
-    let end_index = r.1.parse::<i32>().unwrap_or(input_len as i32);
-
-    if start_index < 0 || start_index > end_index {
-        return Err(ShellError::labeled_error(
-            "start index can't be negative or greater than end index",
-            "Invalid start index",
-            range.tag(),
-        ));
-    }
-
-    if end_index < 0 || end_index < start_index || end_index > input_len as i32 {
-        return Err(ShellError::labeled_error(
-            "end index can't be negative, smaller than start index or greater than input length",
-            "Invalid end index",
-            range.tag(),
-        ));
-    }
-    Ok(IndexOfOptionalBounds(start_index, end_index))
-}
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, Arguments, SubCommand};
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::{int, string};
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn returns_index_of_substring() {
-        let word = string("Cargo.tomL");
-
-        let options = Arguments {
-            pattern: String::from(".tomL").tagged_unknown(),
-            range: Some(string("")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, int(5));
-    }
-    #[test]
-    fn index_of_does_not_exist_in_string() {
-        let word = string("Cargo.tomL");
-
-        let options = Arguments {
-            pattern: String::from("Lm").tagged_unknown(),
-            range: Some(string("")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, int(-1));
-    }
-
-    #[test]
-    fn returns_index_of_next_substring() {
-        let word = string("Cargo.Cargo");
-
-        let options = Arguments {
-            pattern: String::from("Cargo").tagged_unknown(),
-            range: Some(string("1,")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, int(6));
-    }
-
-    #[test]
-    fn index_does_not_exist_due_to_end_index() {
-        let word = string("Cargo.Banana");
-
-        let options = Arguments {
-            pattern: String::from("Banana").tagged_unknown(),
-            range: Some(string(",5")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, int(-1));
-    }
-
-    #[test]
-    fn returns_index_of_nums_in_middle_due_to_index_limit_from_both_ends() {
-        let word = string("123123123");
-
-        let options = Arguments {
-            pattern: String::from("123").tagged_unknown(),
-            range: Some(string("2,6")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, int(3));
-    }
-
-    #[test]
-    fn index_does_not_exists_due_to_strict_bounds() {
-        let word = string("123456");
-
-        let options = Arguments {
-            pattern: String::from("1").tagged_unknown(),
-            range: Some(string("2,4")),
-            column_paths: vec![],
-            end: false,
-        };
-
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-        assert_eq!(actual, int(-1));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/length.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/length.rs
deleted file mode 100644
index 3c6329492..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/length.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-pub struct SubCommand;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str length"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str length").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally find length of text by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "outputs the lengths of the strings in the pipeline"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Return the lengths of multiple strings",
-                example: "echo 'hello' | str length",
-                result: Some(vec![UntaggedValue::int(5).into_untagged_value()]),
-            },
-            Example {
-                description: "Return the lengths of multiple strings",
-                example: "echo 'hi' 'there' | str length",
-                result: Some(vec![
-                    UntaggedValue::int(2).into_untagged_value(),
-                    UntaggedValue::int(5).into_untagged_value(),
-                ]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::int(s.len() as i64).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/lpad.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/lpad.rs
deleted file mode 100644
index 7ec42130e..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/lpad.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    length: Tagged<usize>,
-    character: Tagged<String>,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str lpad"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str lpad")
-            .required_named("length", SyntaxShape::Int, "length to pad to", Some('l'))
-            .required_named(
-                "character",
-                SyntaxShape::String,
-                "character to pad with",
-                Some('c'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally check if string contains pattern by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "pad a string with a character a certain length"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Left pad a string with a character a number of places",
-                example: "echo 'nushell' | str lpad -l 10 -c '*'",
-                result: Some(vec![
-                    UntaggedValue::string("***nushell").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Left pad a string with a character a number of places",
-                example: "echo '123' | str lpad -l 10 -c '0'",
-                result: Some(vec![
-                    UntaggedValue::string("0000000123").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Use lpad to truncate a string",
-                example: "echo '123456789' | str lpad -l 3 -c '0'",
-                result: Some(vec![UntaggedValue::string("123").into_untagged_value()]),
-            },
-            Example {
-                description: "Use lpad to pad Unicode",
-                example: "echo '▉' | str lpad -l 10 -c '▉'",
-                result: Some(vec![
-                    UntaggedValue::string("▉▉▉▉▉▉▉▉▉▉").into_untagged_value()
-                ]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            length: args.req_named("length")?,
-            character: args.req_named("character")?,
-            column_paths: args.rest(0)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    Arguments {
-        character, length, ..
-    }: &Arguments,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            if **length < s.len() {
-                Ok(
-                    UntaggedValue::string(s.chars().take(**length).collect::<String>())
-                        .into_value(tag),
-                )
-            } else {
-                let mut res = character.repeat(**length - s.chars().count());
-                res += s;
-                Ok(UntaggedValue::string(res).into_value(tag))
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, Arguments, SubCommand};
-    use nu_errors::ShellError;
-    use nu_protocol::UntaggedValue;
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn left_pad_with_zeros() {
-        let word = string("123");
-
-        let options = Arguments {
-            character: String::from("0").tagged_unknown(),
-            length: 10_usize.tagged_unknown(),
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::string("0000000123").into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn left_pad_but_truncate() {
-        let word = string("123456789");
-
-        let options = Arguments {
-            character: String::from("0").tagged_unknown(),
-            length: 3_usize.tagged_unknown(),
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::string("123").into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/mod.rs
deleted file mode 100644
index 5fcc4da11..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/mod.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-mod capitalize;
-mod case;
-mod collect;
-mod command;
-mod contains;
-mod downcase;
-mod ends_with;
-mod find_replace;
-mod index_of;
-mod length;
-mod lpad;
-mod reverse;
-mod rpad;
-mod starts_with;
-mod substring;
-mod to_datetime;
-mod to_decimal;
-mod to_integer;
-mod trim;
-mod upcase;
-
-pub use capitalize::SubCommand as StrCapitalize;
-pub use case::camel_case::SubCommand as StrCamelCase;
-pub use case::kebab_case::SubCommand as StrKebabCase;
-pub use case::pascal_case::SubCommand as StrPascalCase;
-pub use case::screaming_snake_case::SubCommand as StrScreamingSnakeCase;
-pub use case::snake_case::SubCommand as StrSnakeCase;
-pub use collect::SubCommand as StrCollect;
-pub use command::Command as Str;
-pub use contains::SubCommand as StrContains;
-pub use downcase::SubCommand as StrDowncase;
-pub use ends_with::SubCommand as StrEndsWith;
-pub use find_replace::SubCommand as StrFindReplace;
-pub use index_of::SubCommand as StrIndexOf;
-pub use length::SubCommand as StrLength;
-pub use lpad::SubCommand as StrLPad;
-pub use reverse::SubCommand as StrReverse;
-pub use rpad::SubCommand as StrRPad;
-pub use starts_with::SubCommand as StrStartsWith;
-pub use substring::SubCommand as StrSubstring;
-pub use to_datetime::SubCommand as StrToDatetime;
-pub use to_decimal::SubCommand as StrToDecimal;
-pub use to_integer::SubCommand as StrToInteger;
-pub use trim::Trim as StrTrim;
-pub use upcase::SubCommand as StrUpcase;
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/reverse.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/reverse.rs
deleted file mode 100644
index 7bc78b794..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/reverse.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-pub struct SubCommand;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str reverse"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str reverse").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally reverse text by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "outputs the reversals of the strings in the pipeline"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Return the reversals of multiple strings",
-            example: "echo 'Nushell' | str reverse",
-            result: Some(vec![UntaggedValue::string("llehsuN").into_untagged_value()]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::string(s.chars().rev().collect::<String>()).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/rpad.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/rpad.rs
deleted file mode 100644
index 35b639100..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/rpad.rs
+++ /dev/null
@@ -1,189 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    length: Tagged<usize>,
-    character: Tagged<String>,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str rpad"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str rpad")
-            .required_named("length", SyntaxShape::Int, "length to pad to", Some('l'))
-            .required_named(
-                "character",
-                SyntaxShape::String,
-                "character to pad with",
-                Some('c'),
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally check if string contains pattern by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "pad a string with a character a certain length"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Right pad a string with a character a number of places",
-                example: "echo 'nushell' | str rpad -l 10 -c '*'",
-                result: Some(vec![
-                    UntaggedValue::string("nushell***").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Right pad a string with a character a number of places",
-                example: "echo '123' | str rpad -l 10 -c '0'",
-                result: Some(vec![
-                    UntaggedValue::string("1230000000").into_untagged_value()
-                ]),
-            },
-            Example {
-                description: "Use rpad to truncate a string",
-                example: "echo '123456789' | str rpad -l 3 -c '0'",
-                result: Some(vec![UntaggedValue::string("123").into_untagged_value()]),
-            },
-            Example {
-                description: "Use rpad to pad Unicode",
-                example: "echo '▉' | str rpad -l 10 -c '▉'",
-                result: Some(vec![
-                    UntaggedValue::string("▉▉▉▉▉▉▉▉▉▉").into_untagged_value()
-                ]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            length: args.req_named("length")?,
-            character: args.req_named("character")?,
-            column_paths: args.rest(0)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    Arguments {
-        length, character, ..
-    }: &Arguments,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            if **length < s.len() {
-                Ok(
-                    UntaggedValue::string(s.chars().take(**length).collect::<String>())
-                        .into_value(tag),
-                )
-            } else {
-                let mut res = s.to_string();
-                res += &character.repeat(**length - s.chars().count());
-                Ok(UntaggedValue::string(res).into_value(tag))
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{action, Arguments, SubCommand};
-    use nu_errors::ShellError;
-    use nu_protocol::UntaggedValue;
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn right_pad_with_zeros() {
-        let word = string("123");
-
-        let options = Arguments {
-            character: String::from("0").tagged_unknown(),
-            length: 10_usize.tagged_unknown(),
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::string("1230000000").into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn right_pad_but_truncate() {
-        let word = string("123456789");
-
-        let options = Arguments {
-            character: String::from("0").tagged_unknown(),
-            length: 3_usize.tagged_unknown(),
-            column_paths: vec![],
-        };
-
-        let expected = UntaggedValue::string("123").into_untagged_value();
-        let actual = action(&word, &options, Tag::unknown()).unwrap();
-
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/starts_with.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/starts_with.rs
deleted file mode 100644
index 2a3311b81..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/starts_with.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-pub struct SubCommand;
-
-struct Arguments {
-    pattern: Tagged<String>,
-    column_paths: Vec<ColumnPath>,
-}
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str starts-with"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str starts-with")
-            .required("pattern", SyntaxShape::String, "the pattern to match")
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally matches prefix of text by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "checks if string starts with pattern"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Checks if string starts with 'my' pattern",
-            example: "echo 'my_library.rb' | str starts-with 'my'",
-            result: Some(vec![UntaggedValue::boolean(true).into_untagged_value()]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arc::new(Arguments {
-            pattern: args.req(0)?,
-            column_paths: args.rest(1)?,
-        }),
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &options.pattern, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let options = options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &options.pattern, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, pattern: &str, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let starts_with = s.starts_with(pattern);
-            Ok(UntaggedValue::boolean(starts_with).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_protocol::UntaggedValue;
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn str_starts_with_pattern() {
-        let word = string("Cargo.toml");
-        let pattern = "Car";
-        let expected = UntaggedValue::boolean(true).into_untagged_value();
-
-        let actual = action(&word, pattern, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn str_does_not_start_with_pattern() {
-        let word = string("Cargo.toml");
-        let pattern = ".toml";
-        let expected = UntaggedValue::boolean(false).into_untagged_value();
-
-        let actual = action(&word, pattern, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/substring.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/substring.rs
deleted file mode 100644
index 594654006..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/substring.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tag;
-use nu_value_ext::{as_string, ValueExt};
-
-use std::cmp::Ordering;
-use std::convert::TryInto;
-
-struct Arguments {
-    range: Value,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str substring"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str substring")
-            .required(
-                "range",
-                SyntaxShape::Any,
-                "the indexes to substring [start end]",
-            )
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally substring text by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "substrings text"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Get a substring from the text",
-                example: "echo 'good nushell' | str substring [5 12]",
-                result: Some(vec![Value::from("nushell")]),
-            },
-            Example {
-                description: "Alternatively, you can use the form",
-                example: "echo 'good nushell' | str substring '5,12'",
-                result: Some(vec![Value::from("nushell")]),
-            },
-            Example {
-                description: "Drop the last `n` characters from the string",
-                example: "echo 'good nushell' | str substring ',-5'",
-                result: Some(vec![Value::from("good nu")]),
-            },
-            Example {
-                description: "Get the remaining characters from a starting index",
-                example: "echo 'good nushell' | str substring '5,'",
-                result: Some(vec![Value::from("nushell")]),
-            },
-            Example {
-                description: "Get the characters from the beginning until ending index",
-                example: "echo 'good nushell' | str substring ',7'",
-                result: Some(vec![Value::from("good nu")]),
-            },
-        ]
-    }
-}
-
-#[derive(Clone)]
-struct Substring(isize, isize);
-
-impl From<(isize, isize)> for Substring {
-    fn from(input: (isize, isize)) -> Substring {
-        Substring(input.0, input.1)
-    }
-}
-
-struct SubstringText(String, String);
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let name = args.call_info.name_tag.clone();
-
-    let (options, input) = (
-        Arguments {
-            range: args.req(0)?,
-            column_paths: args.rest(1)?,
-        },
-        args.input,
-    );
-
-    let indexes = Arc::new(process_arguments(&options, name)?.into());
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &indexes, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let indexes = indexes.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &indexes, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, options: &Substring, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let len: isize = s.len().try_into().map_err(|_| {
-                ShellError::labeled_error(
-                    "could not perform substring",
-                    "could not perform substring",
-                    tag.span,
-                )
-            })?;
-
-            let start: isize = if options.0 < 0 {
-                options.0 + len
-            } else {
-                options.0
-            };
-            let end: isize = if options.1 < 0 {
-                std::cmp::max(len + options.1, 0)
-            } else {
-                options.1
-            };
-
-            if start < len && end >= 0 {
-                match start.cmp(&end) {
-                    Ordering::Equal => Ok(UntaggedValue::string("").into_value(tag)),
-                    Ordering::Greater => Err(ShellError::labeled_error(
-                        "End must be greater than or equal to Start",
-                        "End must be greater than or equal to Start",
-                        tag.span,
-                    )),
-                    Ordering::Less => Ok(UntaggedValue::string(if end == isize::max_value() {
-                        s.chars().skip(start as usize).collect::<String>()
-                    } else {
-                        s.chars()
-                            .skip(start as usize)
-                            .take((end - start) as usize)
-                            .collect::<String>()
-                    })
-                    .into_value(tag)),
-                }
-            } else {
-                Ok(UntaggedValue::string("").into_value(tag))
-            }
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.span,
-            ))
-        }
-    }
-}
-
-fn process_arguments(
-    options: &Arguments,
-    name: impl Into<Tag>,
-) -> Result<(isize, isize), ShellError> {
-    let name = name.into();
-
-    let search = match &options.range.value {
-        UntaggedValue::Table(indexes) => {
-            if indexes.len() > 2 {
-                Err(ShellError::labeled_error(
-                    "could not perform substring",
-                    "could not perform substring",
-                    name.span,
-                ))
-            } else {
-                let idx: Vec<String> = indexes
-                    .iter()
-                    .map(|v| as_string(v).unwrap_or_else(|_| String::from("")))
-                    .collect();
-
-                let start = idx
-                    .get(0)
-                    .ok_or_else(|| {
-                        ShellError::labeled_error(
-                            "could not perform substring",
-                            "could not perform substring",
-                            name.span,
-                        )
-                    })?
-                    .to_string();
-                let end = idx
-                    .get(1)
-                    .ok_or_else(|| {
-                        ShellError::labeled_error(
-                            "could not perform substring",
-                            "could not perform substring",
-                            name.span,
-                        )
-                    })?
-                    .to_string();
-
-                Ok(SubstringText(start, end))
-            }
-        }
-        UntaggedValue::Primitive(Primitive::String(indexes)) => {
-            let idx: Vec<&str> = indexes.split(',').collect();
-
-            let start = idx
-                .get(0)
-                .ok_or_else(|| {
-                    ShellError::labeled_error(
-                        "could not perform substring",
-                        "could not perform substring",
-                        name.span,
-                    )
-                })?
-                .to_string();
-            let end = idx
-                .get(1)
-                .ok_or_else(|| {
-                    ShellError::labeled_error(
-                        "could not perform substring",
-                        "could not perform substring",
-                        name.span,
-                    )
-                })?
-                .to_string();
-
-            Ok(SubstringText(start, end))
-        }
-        _ => Err(ShellError::labeled_error(
-            "could not perform substring",
-            "could not perform substring",
-            name.span,
-        )),
-    }?;
-
-    let start = match &search {
-        SubstringText(start, _) if start.is_empty() || start == "_" => 0,
-        SubstringText(start, _) => start.trim().parse().map_err(|_| {
-            ShellError::labeled_error(
-                "could not perform substring",
-                "could not perform substring",
-                name.span,
-            )
-        })?,
-    };
-
-    let end = match &search {
-        SubstringText(_, end) if end.is_empty() || end == "_" => isize::max_value(),
-        SubstringText(_, end) => end.trim().parse().map_err(|_| {
-            ShellError::labeled_error(
-                "could not perform substring",
-                "could not perform substring",
-                name.span,
-            )
-        })?,
-    };
-
-    Ok((start, end))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand, Substring};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    struct Expectation<'a> {
-        options: (isize, isize),
-        expected: &'a str,
-    }
-
-    impl Expectation<'_> {
-        fn options(&self) -> Substring {
-            Substring(self.options.0, self.options.1)
-        }
-    }
-
-    fn expectation(word: &str, indexes: (isize, isize)) -> Expectation {
-        Expectation {
-            options: indexes,
-            expected: word,
-        }
-    }
-
-    #[test]
-    fn substrings_indexes() {
-        let word = string("andres");
-
-        let cases = vec![
-            expectation("a", (0, 1)),
-            expectation("an", (0, 2)),
-            expectation("and", (0, 3)),
-            expectation("andr", (0, 4)),
-            expectation("andre", (0, 5)),
-            expectation("andres", (0, 6)),
-            expectation("", (0, -6)),
-            expectation("a", (0, -5)),
-            expectation("an", (0, -4)),
-            expectation("and", (0, -3)),
-            expectation("andr", (0, -2)),
-            expectation("andre", (0, -1)),
-            // str substring [ -4 , _ ]
-            // str substring   -4 ,
-            expectation("dres", (-4, isize::max_value())),
-            expectation("", (0, -110)),
-            expectation("", (6, 0)),
-            expectation("", (6, -1)),
-            expectation("", (6, -2)),
-            expectation("", (6, -3)),
-            expectation("", (6, -4)),
-            expectation("", (6, -5)),
-            expectation("", (6, -6)),
-        ];
-
-        for expectation in &cases {
-            let expected = expectation.expected;
-            let actual = action(&word, &expectation.options(), Tag::unknown()).unwrap();
-
-            assert_eq!(actual, string(expected));
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/to_datetime.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/to_datetime.rs
deleted file mode 100644
index d88b1337a..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/to_datetime.rs
+++ /dev/null
@@ -1,373 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, ShellTypeName, Signature, SyntaxShape, UntaggedValue,
-    Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-use chrono::{DateTime, FixedOffset, Local, LocalResult, Offset, TimeZone, Utc};
-
-struct Arguments {
-    timezone: Option<Tagged<String>>,
-    offset: Option<Tagged<i16>>,
-    format: Option<Tagged<String>>,
-    column_paths: Vec<ColumnPath>,
-}
-
-// In case it may be confused with chrono::TimeZone
-#[derive(Clone)]
-enum Zone {
-    Utc,
-    Local,
-    East(u8),
-    West(u8),
-    Error, // we want the nullshell to cast it instead of rust
-}
-
-impl Zone {
-    fn new(i: i16) -> Self {
-        if i.abs() <= 12 {
-            // guanranteed here
-            if i >= 0 {
-                Self::East(i as u8) // won't go out of range
-            } else {
-                Self::West(-i as u8) // same here
-            }
-        } else {
-            Self::Error // Out of range
-        }
-    }
-    fn from_string(s: String) -> Self {
-        match s.to_lowercase().as_str() {
-            "utc" | "u" => Self::Utc,
-            "local" | "l" => Self::Local,
-            _ => Self::Error,
-        }
-    }
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str to-datetime"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str to-datetime")
-            .named(
-                "timezone",
-                SyntaxShape::String,
-                "Specify timezone if the input is timestamp, like 'UTC/u' or 'LOCAL/l'",
-                Some('z'),
-            )
-            .named(
-                "offset",
-                SyntaxShape::Int,
-                "Specify timezone by offset if the input is timestamp, like '+8', '-4', prior than timezone",
-                Some('o'),
-            )
-            .named(
-                "format",
-                SyntaxShape::String,
-                "Specify date and time formatting",
-                Some('f'),
-            )
-            .rest(
-"rest",
-                SyntaxShape::Any,
-                "optionally convert text into datetime by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "converts text into datetime"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert to datetime",
-                example: "echo '16.11.1984 8:00 am +0000' | str to-datetime",
-                result: None,
-            },
-            Example {
-                description: "Convert to datetime",
-                example: "echo '2020-08-04T16:39:18+00:00' | str to-datetime",
-                result: None,
-            },
-            Example {
-                description: "Convert to datetime using a custom format",
-                example: "echo '20200904_163918+0000' | str to-datetime -f '%Y%m%d_%H%M%S%z'",
-                result: None,
-            },
-            Example {
-                description: "Convert timestamp (no larger than 8e+12) to datetime using a specified timezone",
-                example: "echo '1614434140' | str to-datetime -z 'UTC'",
-                result: None,
-            },
-            Example {
-                description:
-                    "Convert timestamp (no larger than 8e+12) to datetime using a specified timezone offset (between -12 and 12)",
-                example: "echo '1614434140' | str to-datetime -o '+9'",
-                result: None,
-            },
-        ]
-    }
-}
-
-#[derive(Clone)]
-struct DatetimeFormat(String);
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let options = Arguments {
-        timezone: args.get_flag("timezone")?,
-        offset: args.get_flag("offset")?,
-        format: args.get_flag("format")?,
-        column_paths: args.rest(0)?,
-    };
-    let input = args.input;
-
-    // if zone-offset is specified, then zone will be neglected
-    let zone_options = if let Some(Tagged {
-        item: zone_offset,
-        tag,
-    }) = &options.offset
-    {
-        Some(Tagged {
-            item: Zone::new(*zone_offset),
-            tag: tag.into(),
-        })
-    } else if let Some(Tagged { item: zone, tag }) = &options.timezone {
-        Some(Tagged {
-            item: Zone::from_string(zone.clone()),
-            tag: tag.into(),
-        })
-    } else {
-        None
-    };
-
-    let format_options = if let Some(Tagged { item: fmt, .. }) = &options.format {
-        Some(DatetimeFormat(fmt.to_string()))
-    } else {
-        None
-    };
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, &zone_options, &format_options, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    let zone_options = zone_options.clone();
-                    let format_options = format_options.clone();
-
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, &zone_options, &format_options, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(
-    input: &Value,
-    timezone: &Option<Tagged<Zone>>,
-    dateformat: &Option<DatetimeFormat>,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let ts = s.parse::<i64>();
-            // if timezone if specified, first check if the input is a timestamp.
-            if let Some(tz) = timezone {
-                const TIMESTAMP_BOUND: i64 = 8.2e+12 as i64;
-                // Since the timestamp method of chrono itself don't throw an error (it just panicked)
-                // We have to manually guard it.
-                if let Ok(t) = ts {
-                    if t.abs() > TIMESTAMP_BOUND {
-                        return Err(ShellError::labeled_error(
-                            "could not parse input as a valid timestamp",
-                            "given timestamp is out of range, it should between -8e+12 and 8e+12",
-                            tag.into().span,
-                        ));
-                    }
-                    const HOUR: i32 = 3600;
-                    let stampout = match tz.item {
-                        Zone::Utc => UntaggedValue::date(Utc.timestamp(t, 0)),
-                        Zone::Local => UntaggedValue::date(Local.timestamp(t, 0)),
-                        Zone::East(i) => {
-                            let eastoffset = FixedOffset::east((i as i32) * HOUR);
-                            UntaggedValue::date(eastoffset.timestamp(t, 0))
-                        }
-                        Zone::West(i) => {
-                            let westoffset = FixedOffset::west((i as i32) * HOUR);
-                            UntaggedValue::date(westoffset.timestamp(t, 0))
-                        }
-                        Zone::Error => {
-                            return Err(ShellError::labeled_error(
-                                "could not continue to convert timestamp",
-                                "given timezone or offset is invalid",
-                                tz.tag().span,
-                            ));
-                        }
-                    };
-                    return Ok(stampout.into_value(tag));
-                }
-            };
-            // if it's not, continue and negelect the timezone option.
-            let out = match dateformat {
-                Some(dt) => match DateTime::parse_from_str(s, &dt.0) {
-                    Ok(d) => UntaggedValue::date(d),
-                    Err(reason) => {
-                        return Err(ShellError::labeled_error(
-                            format!("could not parse as datetime using format '{}'", dt.0),
-                            reason.to_string(),
-                            tag.into().span,
-                        ))
-                    }
-                },
-                None => match dtparse::parse(s) {
-                    Ok((native_dt, fixed_offset)) => {
-                        let offset = match fixed_offset {
-                            Some(fo) => fo,
-                            None => FixedOffset::east(0).fix(),
-                        };
-                        match offset.from_local_datetime(&native_dt) {
-                            LocalResult::Single(d) => UntaggedValue::date(d),
-                            LocalResult::Ambiguous(d, _) => UntaggedValue::date(d),
-                            LocalResult::None => {
-                                return Err(ShellError::labeled_error(
-                                    "could not convert to a timezone-aware datetime",
-                                    "local time representation is invalid",
-                                    tag.into().span,
-                                ))
-                            }
-                        }
-                    }
-                    Err(reason) => {
-                        return Err(ShellError::labeled_error(
-                            "could not parse as datetime",
-                            reason.to_string(),
-                            tag.into().span,
-                        ))
-                    }
-                },
-            };
-
-            Ok(out.into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, DatetimeFormat, SubCommand, Zone};
-    use nu_protocol::{Primitive, UntaggedValue};
-    use nu_source::{Tag, Tagged};
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn takes_a_date_format() {
-        let date_str = string("16.11.1984 8:00 am +0000");
-
-        let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string()));
-
-        let actual = action(&date_str, &None, &fmt_options, Tag::unknown()).unwrap();
-
-        match actual.value {
-            UntaggedValue::Primitive(Primitive::Date(_)) => {}
-            _ => panic!("Didn't convert to date"),
-        }
-    }
-
-    #[test]
-    fn takes_iso8601_date_format() {
-        let date_str = string("2020-08-04T16:39:18+00:00");
-        let actual = action(&date_str, &None, &None, Tag::unknown()).unwrap();
-        match actual.value {
-            UntaggedValue::Primitive(Primitive::Date(_)) => {}
-            _ => panic!("Didn't convert to date"),
-        }
-    }
-
-    #[test]
-    fn takes_timestamp_offset() {
-        let date_str = string("1614434140");
-        let timezone_option = Some(Tagged {
-            item: Zone::East(8),
-            tag: Tag::unknown(),
-        });
-        let actual = action(&date_str, &timezone_option, &None, Tag::unknown()).unwrap();
-        match actual.value {
-            UntaggedValue::Primitive(Primitive::Date(_)) => {}
-            _ => panic!("Didn't convert to date"),
-        }
-    }
-
-    #[test]
-    fn takes_timestamp() {
-        let date_str = string("1614434140");
-        let timezone_option = Some(Tagged {
-            item: Zone::Local,
-            tag: Tag::unknown(),
-        });
-        let actual = action(&date_str, &timezone_option, &None, Tag::unknown()).unwrap();
-        match actual.value {
-            UntaggedValue::Primitive(Primitive::Date(_)) => {}
-            _ => panic!("Didn't convert to date"),
-        }
-    }
-
-    #[test]
-    fn takes_invalid_timestamp() {
-        let date_str = string("10440970000000");
-        let timezone_option = Some(Tagged {
-            item: Zone::Utc,
-            tag: Tag::unknown(),
-        });
-        let actual = action(&date_str, &timezone_option, &None, Tag::unknown());
-
-        assert!(actual.is_err());
-    }
-
-    #[test]
-    fn communicates_parsing_error_given_an_invalid_datetimelike_string() {
-        let date_str = string("16.11.1984 8:00 am Oops0000");
-
-        let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string()));
-
-        let actual = action(&date_str, &None, &fmt_options, Tag::unknown());
-
-        assert!(actual.is_err());
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/to_decimal.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/to_decimal.rs
deleted file mode 100644
index a61779e59..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/to_decimal.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tag;
-use nu_value_ext::ValueExt;
-
-use bigdecimal::BigDecimal;
-use std::str::FromStr;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str to-decimal"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str to-decimal").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally convert text into decimal by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "converts text into decimal"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Convert to decimal",
-            example: "echo '3.1415' | str to-decimal",
-            result: None,
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let other = s.trim();
-            let out = match BigDecimal::from_str(other) {
-                Ok(v) => UntaggedValue::decimal(v),
-                Err(reason) => {
-                    return Err(ShellError::labeled_error(
-                        "could not parse as decimal",
-                        reason.to_string(),
-                        tag.into().span,
-                    ))
-                }
-            };
-            Ok(out.into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_source::Tag;
-    use nu_test_support::value::{decimal_from_float, string};
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    #[allow(clippy::approx_constant)]
-    fn turns_to_integer() {
-        let word = string("3.1415");
-        let expected = decimal_from_float(3.1415);
-
-        let actual = action(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn communicates_parsing_error_given_an_invalid_decimallike_string() {
-        let decimal_str = string("11.6anra");
-
-        let actual = action(&decimal_str, Tag::unknown());
-
-        assert!(actual.is_err());
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/to_integer.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/to_integer.rs
deleted file mode 100644
index 5d976dac6..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/to_integer.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    radix: Option<Tagged<u32>>,
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str to-int"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str to-int")
-            .named("radix", SyntaxShape::Number, "radix of integer", Some('r'))
-            .rest(
-                "rest",
-                SyntaxShape::ColumnPath,
-                "optionally convert text into integer by column paths",
-            )
-    }
-
-    fn usage(&self) -> &str {
-        "converts text into integer"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Convert to an integer",
-                example: "echo '255' | str to-int",
-                result: Some(vec![UntaggedValue::int(255).into()]),
-            },
-            Example {
-                description: "Convert str column to an integer",
-                example: "echo [['count']; ['255']] | str to-int count | get count",
-                result: Some(vec![UntaggedValue::int(255).into()]),
-            },
-            Example {
-                description: "Convert to integer from binary",
-                example: "echo '1101' | str to-int -r 2",
-                result: Some(vec![UntaggedValue::int(13).into()]),
-            },
-            Example {
-                description: "Convert to integer from hex",
-                example: "echo 'FF' | str to-int -r 16",
-                result: Some(vec![UntaggedValue::int(255).into()]),
-            },
-        ]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let options = Arguments {
-        radix: args.get_flag("radix")?,
-        column_paths: args.rest(0)?,
-    };
-    let input = args.input;
-
-    let radix = options.radix.as_ref().map(|r| r.item).unwrap_or(10);
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag(), radix)?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag(), radix)),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>, radix: u32) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let trimmed = s.trim();
-
-            let out = match trimmed {
-                b if b.starts_with("0b") => {
-                    let num = match i64::from_str_radix(b.trim_start_matches("0b"), 2) {
-                        Ok(n) => n,
-                        Err(reason) => {
-                            return Err(ShellError::labeled_error(
-                                "could not parse as integer",
-                                reason.to_string(),
-                                tag.into().span,
-                            ))
-                        }
-                    };
-                    UntaggedValue::int(num)
-                }
-                h if h.starts_with("0x") => {
-                    let num = match i64::from_str_radix(h.trim_start_matches("0x"), 16) {
-                        Ok(n) => n,
-                        Err(reason) => {
-                            return Err(ShellError::labeled_error(
-                                "could not parse as int",
-                                reason.to_string(),
-                                tag.into().span,
-                            ))
-                        }
-                    };
-                    UntaggedValue::int(num)
-                }
-                _ => {
-                    let num = match i64::from_str_radix(trimmed, radix) {
-                        Ok(n) => n,
-                        Err(reason) => {
-                            return Err(ShellError::labeled_error(
-                                "could not parse as int",
-                                reason.to_string(),
-                                tag.into().span,
-                            ))
-                        }
-                    };
-                    UntaggedValue::int(num)
-                }
-            };
-
-            Ok(out.into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_source::Tag;
-    use nu_test_support::value::{int, string};
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn turns_to_integer() {
-        let word = string("10");
-        let expected = int(10);
-
-        let actual = action(&word, Tag::unknown(), 10).unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn turns_binary_to_integer() {
-        let s = string("0b101");
-        let actual = action(&s, Tag::unknown(), 10).unwrap();
-        assert_eq!(actual, int(5));
-    }
-
-    #[test]
-    fn turns_hex_to_integer() {
-        let s = string("0xFF");
-        let actual = action(&s, Tag::unknown(), 16).unwrap();
-        assert_eq!(actual, int(255));
-    }
-
-    #[test]
-    fn communicates_parsing_error_given_an_invalid_integerlike_string() {
-        let integer_str = string("36anra");
-
-        let actual = action(&integer_str, Tag::unknown(), 10);
-
-        assert!(actual.is_err());
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/trim/command.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/trim/command.rs
deleted file mode 100644
index a0898acb9..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/trim/command.rs
+++ /dev/null
@@ -1,851 +0,0 @@
-use super::operate;
-use crate::commands::strings::str_::trim::ClosureFlags;
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, Value};
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str trim"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str trim")
-            .rest(
-"rest",
-                SyntaxShape::ColumnPath,
-                "optionally trim text by column paths",
-            )
-            .named(
-                "char",
-                SyntaxShape::String,
-                "character to trim (default: whitespace)",
-                Some('c'),
-            )
-            .switch(
-                "left",
-                "trims characters only from the beginning of the string (default: whitespace)",
-                Some('l'),
-            )
-            .switch(
-                "right",
-                "trims characters only from the end of the string (default: whitespace)",
-                Some('r'),
-            )
-            .switch(
-                "all",
-                "trims all characters from both sides of the string *and* in the middle (default: whitespace)",
-                Some('a'),
-            )
-            .switch("both", "trims all characters from left and right side of the string (default: whitespace)", Some('b'))
-            .switch("format", "trims spaces replacing multiple characters with singles in the middle (default: whitespace)", Some('f'))
-    }
-    fn usage(&self) -> &str {
-        "trims text"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args, &trim)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Trim whitespace",
-                example: "echo 'Nu shell ' | str trim",
-                result: Some(vec![Value::from("Nu shell")]),
-            },
-            Example {
-                description: "Trim a specific character",
-                example: "echo '=== Nu shell ===' | str trim -c '=' | str trim",
-                result: Some(vec![Value::from("Nu shell")]),
-            },
-            Example {
-                description: "Trim all characters",
-                example: "echo ' Nu   shell ' | str trim -a",
-                result: Some(vec![Value::from("Nushell")]),
-            },
-            Example {
-                description: "Trim whitespace from the beginning of string",
-                example: "echo ' Nu shell ' | str trim -l",
-                result: Some(vec![Value::from("Nu shell ")]),
-            },
-            Example {
-                description: "Trim a specific character",
-                example: "echo '=== Nu shell ===' | str trim -c '='",
-                result: Some(vec![Value::from(" Nu shell ")]),
-            },
-            Example {
-                description: "Trim whitespace from the end of string",
-                example: "echo ' Nu shell ' | str trim -r",
-                result: Some(vec![Value::from(" Nu shell")]),
-            },
-            Example {
-                description: "Trim a specific character",
-                example: "echo '=== Nu shell ===' | str trim -r -c '='",
-                result: Some(vec![Value::from("=== Nu shell ")]),
-            },
-        ]
-    }
-}
-
-fn trim(s: &str, char_: Option<char>, closure_flags: &ClosureFlags) -> String {
-    let ClosureFlags {
-        left_trim,
-        right_trim,
-        all_flag,
-        both_flag,
-        format_flag,
-    } = closure_flags;
-    let delimiters = match char_ {
-        Some(c) => vec![c],
-        // Trying to make this trim work like rust default trim()
-        // which uses is_whitespace() as a default
-        None => vec![
-            ' ',    // space
-            '\x09', // horizontal tab
-            '\x0A', // new line, line feed
-            '\x0B', // vertical tab
-            '\x0C', // form feed, new page
-            '\x0D', // carriage return
-        ], //whitespace
-    };
-
-    if *left_trim {
-        s.trim_start_matches(&delimiters[..]).to_string()
-    } else if *right_trim {
-        s.trim_end_matches(&delimiters[..]).to_string()
-    } else if *all_flag {
-        s.split(&delimiters[..])
-            .filter(|s| !s.is_empty())
-            .collect::<String>()
-    } else if *both_flag {
-        s.trim_matches(&delimiters[..]).to_string()
-    } else if *format_flag {
-        // The idea here is to use regex to go through these delimiters and
-        // where there are multiple, replace them with singles
-
-        // create our return string which is a copy of the original string
-        let mut return_string = String::from(s);
-        // Iterate through the delimiters replacing them with regex friendly names
-        for r in &delimiters {
-            let reg = match r {
-                ' ' => r"\s".to_string(),
-                '\x09' => r"\t".to_string(),
-                '\x0A' => r"\n".to_string(),
-                '\x0B' => r"\v".to_string(),
-                '\x0C' => r"\f".to_string(),
-                '\x0D' => r"\r".to_string(),
-                _ => format!(r"\{}", r),
-            };
-            // create a regex string that looks for 2 or more of each of these characters
-            let re_str = format!("{}{{2,}}", reg);
-            // create the regex
-            let re = regex::Regex::new(&re_str).expect("Error creating regular expression");
-            // replace all multiple occurrences with single occurrences represented by r
-            let new_str = re.replace_all(&return_string, r.to_string());
-            // update the return string so the next loop has the latest changes
-            return_string = new_str.to_string();
-        }
-        // for good measure, trim_matches, which gets the start and end
-        // theoretically we shouldn't have to do this but from my testing, we do.
-        return_string.trim_matches(&delimiters[..]).to_string()
-    } else {
-        s.trim().to_string()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::SubCommand;
-    use crate::commands::strings::str_::trim::command::trim;
-    use crate::commands::strings::str_::trim::{action, ActionMode, ClosureFlags};
-    use nu_protocol::row;
-    use nu_source::Tag;
-    use nu_test_support::value::{int, string, table};
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn trims() {
-        let word = string("andres ");
-        let expected = string("andres");
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_global() {
-        let word = string(" global   ");
-        let expected = string("global");
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_ignores_numbers() {
-        let number = int(2020);
-        let expected = int(2020);
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &number,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_row() {
-        let row = row!["a".to_string() => string("    c "), " b ".to_string() => string("  d   ")];
-        let expected = row!["a".to_string() => string("c"), " b ".to_string() => string("d")];
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_table() {
-        let row = table(&[string("  a  "), int(65), string(" d")]);
-        let expected = table(&[string("a"), int(65), string("d")]);
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_custom_character_both_ends() {
-        let word = string("!#andres#!");
-        let expected = string("#andres#");
-        let closure_flags = ClosureFlags {
-            both_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some('!'),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn trims_all_white_space() {
-        let word = string(" Value1 a lot  of  spaces ");
-        let expected = string("Value1alotofspaces");
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some(' '),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trims_row_all_white_space() {
-        let row = row!["a".to_string() => string("    nu    shell "), " b ".to_string() => string("  b c   d     e  ")];
-        let expected =
-            row!["a".to_string() => string("nushell"), " b ".to_string() => string("bcde")];
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trims_table_all_white_space() {
-        let row = table(&[string("  nu      shell   "), int(65), string(" d")]);
-        let expected = table(&[string("nushell"), int(65), string("d")]);
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_all_custom_character() {
-        let word = string(".Value1.a.lot..of...dots.");
-        let expected = string("Value1alotofdots");
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some('.'),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trims_row_all_custom_character() {
-        let row = row!["a".to_string() => string("!!!!nu!!shell!!!"), " b ".to_string() => string("!!b!c!!d!e!!")];
-        let expected =
-            row!["a".to_string() => string("nushell"), " b ".to_string() => string("bcde")];
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            Some('!'),
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trims_table_all_custom_character() {
-        let row = table(&[string("##nu####shell##"), int(65), string("#d")]);
-        let expected = table(&[string("nushell"), int(65), string("d")]);
-        let closure_flags = ClosureFlags {
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            Some('#'),
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn trims_whitespace_from_left() {
-        let word = string(" andres ");
-        let expected = string("andres ");
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_left_ignores_numbers() {
-        let number = int(2020);
-        let expected = int(2020);
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &number,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_left_global() {
-        let word = string(" global   ");
-        let expected = string("global   ");
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_left_row() {
-        let row = row!["a".to_string() => string("    c "), " b ".to_string() => string("  d   ")];
-        let expected = row!["a".to_string() => string("c "), " b ".to_string() => string("d   ")];
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_left_table() {
-        let row = table(&[string("  a  "), int(65), string(" d")]);
-        let expected = table(&[string("a  "), int(65), string("d")]);
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_custom_chars_from_left() {
-        let word = string("!!! andres !!!");
-        let expected = string(" andres !!!");
-        let closure_flags = ClosureFlags {
-            left_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some('!'),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn trims_whitespace_from_right() {
-        let word = string(" andres ");
-        let expected = string(" andres");
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_right_global() {
-        let word = string(" global   ");
-        let expected = string(" global");
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_right_ignores_numbers() {
-        let number = int(2020);
-        let expected = int(2020);
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &number,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_right_row() {
-        let row = row!["a".to_string() => string("    c "), " b ".to_string() => string("  d   ")];
-        let expected = row!["a".to_string() => string("    c"), " b ".to_string() => string("  d")];
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_right_table() {
-        let row = table(&[string("  a  "), int(65), string(" d")]);
-        let expected = table(&[string("  a"), int(65), string(" d")]);
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_custom_chars_from_right() {
-        let word = string("#@! andres !@#");
-        let expected = string("#@! andres !@");
-        let closure_flags = ClosureFlags {
-            right_trim: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some('#'),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_whitespace_format_flag() {
-        let word = string(" nushell    is     great ");
-        let expected = string("nushell is great");
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some(' '),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_format_flag_global() {
-        let word = string("global ");
-        let expected = string("global");
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some(' '),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-    #[test]
-    fn global_trim_format_flag_ignores_numbers() {
-        let number = int(2020);
-        let expected = int(2020);
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &number,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_format_flag_row() {
-        let row = row!["a".to_string() => string("    c "), " b ".to_string() => string(" b c    d  e  ")];
-        let expected = row!["a".to_string() => string("c"), " b ".to_string() => string("b c d e")];
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn global_trim_format_flag_table() {
-        let row = table(&[
-            string("  a    b     c    d  "),
-            int(65),
-            string(" b c  d e   f"),
-        ]);
-        let expected = table(&[string("a b c d"), int(65), string("b c d e f")]);
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &row,
-            Tag::unknown(),
-            None,
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_custom_chars_format_flag() {
-        let word = string(".Value1.a..lot...of....dots.");
-        let expected = string("Value1.a.lot.of.dots");
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some('.'),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_all_format_flag_whitespace() {
-        let word = string(" nushell    is     great   ");
-        let expected = string("nushellisgreat");
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some(' '),
-            &closure_flags,
-            &trim,
-            ActionMode::Local,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn trims_all_format_flag_global() {
-        let word = string(" nushell    is     great   ");
-        let expected = string("nushellisgreat");
-        let closure_flags = ClosureFlags {
-            format_flag: true,
-            all_flag: true,
-            ..Default::default()
-        };
-
-        let actual = action(
-            &word,
-            Tag::unknown(),
-            Some(' '),
-            &closure_flags,
-            &trim,
-            ActionMode::Global,
-        )
-        .unwrap();
-        assert_eq!(actual, expected);
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/trim/mod.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/trim/mod.rs
deleted file mode 100644
index 115b3572d..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/trim/mod.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-mod command;
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{ColumnPath, Primitive, ReturnSuccess, UntaggedValue, Value};
-use nu_source::{Tag, Tagged};
-use nu_value_ext::ValueExt;
-use std::iter::FromIterator;
-
-pub use command::SubCommand as Trim;
-
-struct Arguments {
-    character: Option<Tagged<char>>,
-    column_paths: Vec<ColumnPath>,
-}
-
-#[derive(Default, Debug, Copy, Clone)]
-pub struct ClosureFlags {
-    all_flag: bool,
-    left_trim: bool,
-    right_trim: bool,
-    format_flag: bool,
-    both_flag: bool,
-}
-
-pub fn operate<F>(args: CommandArgs, trim_operation: &'static F) -> Result<ActionStream, ShellError>
-where
-    F: Fn(&str, Option<char>, &ClosureFlags) -> String + Send + Sync + 'static,
-{
-    let (options, closure_flags, input) = (
-        Arc::new(Arguments {
-            character: args.get_flag("char")?,
-            column_paths: args.rest(0)?,
-        }),
-        ClosureFlags {
-            all_flag: args.has_flag("all"),
-            left_trim: args.has_flag("left"),
-            right_trim: args.has_flag("right"),
-            format_flag: args.has_flag("format"),
-            both_flag: args.has_flag("both")
-                || (!args.has_flag("all")
-                    && !args.has_flag("left")
-                    && !args.has_flag("right")
-                    && !args.has_flag("format")), // this is the case if no flags are provided
-        },
-        args.input,
-    );
-    let to_trim = options.character.as_ref().map(|tagged| tagged.item);
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(
-                    &v,
-                    v.tag(),
-                    to_trim,
-                    &closure_flags,
-                    &trim_operation,
-                    ActionMode::Global,
-                )?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| {
-                            action(
-                                old,
-                                old.tag(),
-                                to_trim,
-                                &closure_flags,
-                                &trim_operation,
-                                ActionMode::Local,
-                            )
-                        }),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum ActionMode {
-    Local,
-    Global,
-}
-
-pub fn action<F>(
-    input: &Value,
-    tag: impl Into<Tag>,
-    char_: Option<char>,
-    closure_flags: &ClosureFlags,
-    trim_operation: &F,
-    mode: ActionMode,
-) -> Result<Value, ShellError>
-where
-    F: Fn(&str, Option<char>, &ClosureFlags) -> String + Send + Sync + 'static,
-{
-    let tag = tag.into();
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::string(trim_operation(s, char_, closure_flags)).into_value(tag))
-        }
-        other => match mode {
-            ActionMode::Global => match other {
-                UntaggedValue::Row(dictionary) => {
-                    let results: Result<Vec<(String, Value)>, ShellError> = dictionary
-                        .entries()
-                        .iter()
-                        .map(|(k, v)| -> Result<_, ShellError> {
-                            Ok((
-                                k.clone(),
-                                action(v, tag.clone(), char_, closure_flags, trim_operation, mode)?,
-                            ))
-                        })
-                        .collect();
-                    let indexmap = IndexMap::from_iter(results?);
-                    Ok(UntaggedValue::Row(indexmap.into()).into_value(tag))
-                }
-                UntaggedValue::Table(values) => {
-                    let values: Result<Vec<Value>, ShellError> = values
-                        .iter()
-                        .map(|v| -> Result<_, ShellError> {
-                            action(v, tag.clone(), char_, closure_flags, trim_operation, mode)
-                        })
-                        .collect();
-                    Ok(UntaggedValue::Table(values?).into_value(tag))
-                }
-                _ => Ok(input.clone()),
-            },
-            ActionMode::Local => {
-                let got = format!("got {}", other.type_name());
-                Err(ShellError::labeled_error(
-                    "value is not string",
-                    got,
-                    tag.span,
-                ))
-            }
-        },
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/strings/str_/upcase.rs b/old_nushell/crates/nu-command/src/commands/strings/str_/upcase.rs
deleted file mode 100644
index 285e55ee3..000000000
--- a/old_nushell/crates/nu-command/src/commands/strings/str_/upcase.rs
+++ /dev/null
@@ -1,112 +0,0 @@
-use crate::prelude::*;
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{
-    ColumnPath, Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::Tag;
-use nu_value_ext::ValueExt;
-
-struct Arguments {
-    column_paths: Vec<ColumnPath>,
-}
-
-pub struct SubCommand;
-
-impl WholeStreamCommand for SubCommand {
-    fn name(&self) -> &str {
-        "str upcase"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("str upcase").rest(
-            "rest",
-            SyntaxShape::ColumnPath,
-            "optionally upcase text by column paths",
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "upcases text"
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        operate(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Upcase contents",
-            example: "echo 'nu' | str upcase",
-            result: Some(vec![Value::from("NU")]),
-        }]
-    }
-}
-
-fn operate(args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (options, input) = (
-        Arguments {
-            column_paths: args.rest(0)?,
-        },
-        args.input,
-    );
-
-    Ok(input
-        .map(move |v| {
-            if options.column_paths.is_empty() {
-                ReturnSuccess::value(action(&v, v.tag())?)
-            } else {
-                let mut ret = v;
-
-                for path in &options.column_paths {
-                    ret = ret.swap_data_by_column_path(
-                        path,
-                        Box::new(move |old| action(old, old.tag())),
-                    )?;
-                }
-
-                ReturnSuccess::value(ret)
-            }
-        })
-        .into_action_stream())
-}
-
-fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    match &input.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            Ok(UntaggedValue::string(s.to_ascii_uppercase()).into_value(tag))
-        }
-        other => {
-            let got = format!("got {}", other.type_name());
-            Err(ShellError::labeled_error(
-                "value is not string",
-                got,
-                tag.into().span,
-            ))
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::ShellError;
-    use super::{action, SubCommand};
-    use nu_source::Tag;
-    use nu_test_support::value::string;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(SubCommand {})
-    }
-
-    #[test]
-    fn upcases() {
-        let word = string("andres");
-
-        let actual = action(&word, Tag::unknown()).unwrap();
-        assert_eq!(actual, string("ANDRES"));
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/system/mod.rs b/old_nushell/crates/nu-command/src/commands/system/mod.rs
deleted file mode 100644
index 6fd20a936..000000000
--- a/old_nushell/crates/nu-command/src/commands/system/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[cfg(feature = "ps")]
-mod ps;
-#[cfg(feature = "ps")]
-pub use ps::Command as Ps;
-
-#[cfg(feature = "sys")]
-mod sys;
-#[cfg(feature = "sys")]
-pub use sys::Command as Sys;
diff --git a/old_nushell/crates/nu-command/src/commands/system/ps.rs b/old_nushell/crates/nu-command/src/commands/system/ps.rs
deleted file mode 100644
index aca2c62c5..000000000
--- a/old_nushell/crates/nu-command/src/commands/system/ps.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, TaggedDictBuilder, UntaggedValue};
-use sysinfo::{PidExt, ProcessExt, System, SystemExt};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "ps"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ps")
-            .desc("View information about system processes.")
-            .switch(
-                "long",
-                "list all available columns for each entry",
-                Some('l'),
-            )
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "View information about system processes."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_ps(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "List the system processes",
-            example: "ps",
-            result: None,
-        }]
-    }
-}
-
-fn run_ps(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let long = args.has_flag("long");
-    let mut sys = System::new_all();
-    sys.refresh_all();
-
-    let mut output = vec![];
-
-    let result: Vec<_> = sys.processes().iter().map(|x| *x.0).collect();
-
-    for pid in result {
-        if let Some(result) = sys.process(pid) {
-            let mut dict = TaggedDictBuilder::new(args.name_tag());
-            dict.insert_untagged("pid", UntaggedValue::int(pid.as_u32() as i64));
-            dict.insert_untagged("name", UntaggedValue::string(result.name()));
-            dict.insert_untagged(
-                "status",
-                UntaggedValue::string(format!("{:?}", result.status())),
-            );
-            dict.insert_untagged(
-                "cpu",
-                UntaggedValue::decimal_from_float(result.cpu_usage() as f64, args.name_tag().span),
-            );
-            dict.insert_untagged("mem", UntaggedValue::filesize(result.memory() * 1000));
-            dict.insert_untagged(
-                "virtual",
-                UntaggedValue::filesize(result.virtual_memory() * 1000),
-            );
-
-            if long {
-                if let Some(parent) = result.parent() {
-                    dict.insert_untagged("parent", UntaggedValue::int(parent.as_u32() as i64));
-                } else {
-                    dict.insert_untagged("parent", UntaggedValue::nothing());
-                }
-                dict.insert_untagged("exe", UntaggedValue::filepath(result.exe()));
-                dict.insert_untagged("command", UntaggedValue::string(result.cmd().join(" ")));
-            }
-
-            output.push(dict.into_value());
-        }
-    }
-
-    Ok(output.into_iter().into_output_stream())
-}
diff --git a/old_nushell/crates/nu-command/src/commands/system/sys.rs b/old_nushell/crates/nu-command/src/commands/system/sys.rs
deleted file mode 100644
index 9ca64f515..000000000
--- a/old_nushell/crates/nu-command/src/commands/system/sys.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, TaggedDictBuilder, UntaggedValue};
-use sysinfo::{ComponentExt, DiskExt, NetworkExt, ProcessorExt, System, SystemExt, UserExt};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "sys"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("sys")
-            .desc("View information about the current system.")
-            .filter()
-    }
-
-    fn usage(&self) -> &str {
-        "View information about the system."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        run_sys(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![Example {
-            description: "Show info about the system",
-            example: "sys",
-            result: None,
-        }]
-    }
-}
-
-fn run_sys(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let tag = args.name_tag();
-    let mut sys = System::new();
-
-    let mut sysinfo = TaggedDictBuilder::with_capacity(&tag, 6);
-
-    if let Some(host) = host(&mut sys, tag.clone()) {
-        sysinfo.insert_value("host", host);
-    }
-    if let Some(cpus) = cpu(&mut sys, tag.clone()) {
-        sysinfo.insert_value("cpu", cpus);
-    }
-    if let Some(disks) = disks(&mut sys, tag.clone()) {
-        sysinfo.insert_value("disks", disks);
-    }
-    if let Some(mem) = mem(&mut sys, tag.clone()) {
-        sysinfo.insert_value("mem", mem);
-    }
-    if let Some(temp) = temp(&mut sys, tag.clone()) {
-        sysinfo.insert_value("temp", temp);
-    }
-    if let Some(net) = net(&mut sys, tag) {
-        sysinfo.insert_value("net", net);
-    }
-
-    Ok(vec![sysinfo.into_value()].into_iter().into_output_stream())
-}
-
-pub fn trim_cstyle_null(s: String) -> String {
-    s.trim_matches(char::from(0)).to_string()
-}
-
-pub fn disks(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_disks();
-    sys.refresh_disks_list();
-
-    let mut output = vec![];
-    for disk in sys.disks() {
-        let mut dict = TaggedDictBuilder::new(&tag);
-        dict.insert_untagged(
-            "device",
-            UntaggedValue::string(trim_cstyle_null(disk.name().to_string_lossy().to_string())),
-        );
-        dict.insert_untagged(
-            "type",
-            UntaggedValue::string(trim_cstyle_null(
-                String::from_utf8_lossy(disk.file_system()).to_string(),
-            )),
-        );
-        dict.insert_untagged("mount", UntaggedValue::filepath(disk.mount_point()));
-        dict.insert_untagged("total", UntaggedValue::filesize(disk.total_space()));
-        dict.insert_untagged("free", UntaggedValue::filesize(disk.available_space()));
-        output.push(dict.into_value());
-    }
-    if !output.is_empty() {
-        Some(UntaggedValue::Table(output))
-    } else {
-        None
-    }
-}
-
-pub fn net(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_networks();
-    sys.refresh_networks_list();
-
-    let mut output = vec![];
-    for (iface, data) in sys.networks() {
-        let mut dict = TaggedDictBuilder::new(&tag);
-        dict.insert_untagged(
-            "name",
-            UntaggedValue::string(trim_cstyle_null(iface.to_string())),
-        );
-        dict.insert_untagged("sent", UntaggedValue::filesize(data.total_transmitted()));
-        dict.insert_untagged("recv", UntaggedValue::filesize(data.total_received()));
-
-        output.push(dict.into_value());
-    }
-    if !output.is_empty() {
-        Some(UntaggedValue::Table(output))
-    } else {
-        None
-    }
-}
-
-pub fn cpu(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_cpu();
-
-    let mut output = vec![];
-    for cpu in sys.processors() {
-        let mut dict = TaggedDictBuilder::new(&tag);
-        dict.insert_untagged(
-            "name",
-            UntaggedValue::string(trim_cstyle_null(cpu.name().to_string())),
-        );
-        dict.insert_untagged(
-            "brand",
-            UntaggedValue::string(trim_cstyle_null(cpu.brand().to_string())),
-        );
-        dict.insert_untagged("freq", UntaggedValue::int(cpu.frequency() as i64));
-
-        output.push(dict.into_value());
-    }
-    if !output.is_empty() {
-        Some(UntaggedValue::Table(output))
-    } else {
-        None
-    }
-}
-
-pub fn mem(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_memory();
-
-    let mut dict = TaggedDictBuilder::new(tag);
-    let total_mem = sys.total_memory();
-    let free_mem = sys.free_memory();
-    let total_swap = sys.total_swap();
-    let free_swap = sys.free_swap();
-
-    dict.insert_untagged("total", UntaggedValue::filesize(total_mem * 1000));
-    dict.insert_untagged("free", UntaggedValue::filesize(free_mem * 1000));
-    dict.insert_untagged("swap total", UntaggedValue::filesize(total_swap * 1000));
-    dict.insert_untagged("swap free", UntaggedValue::filesize(free_swap * 1000));
-
-    Some(dict.into_untagged_value())
-}
-
-pub fn host(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_users_list();
-
-    let mut dict = TaggedDictBuilder::new(&tag);
-    if let Some(name) = sys.name() {
-        dict.insert_untagged("name", UntaggedValue::string(trim_cstyle_null(name)));
-    }
-    if let Some(version) = sys.os_version() {
-        dict.insert_untagged(
-            "os version",
-            UntaggedValue::string(trim_cstyle_null(version)),
-        );
-    }
-    if let Some(version) = sys.kernel_version() {
-        dict.insert_untagged(
-            "kernel version",
-            UntaggedValue::string(trim_cstyle_null(version)),
-        );
-    }
-    if let Some(hostname) = sys.host_name() {
-        dict.insert_untagged(
-            "hostname",
-            UntaggedValue::string(trim_cstyle_null(hostname)),
-        );
-    }
-    dict.insert_untagged(
-        "uptime",
-        UntaggedValue::duration(1000000000 * sys.uptime() as i64),
-    );
-
-    let mut users = vec![];
-    for user in sys.users() {
-        let mut user_dict = TaggedDictBuilder::new(&tag);
-        user_dict.insert_untagged(
-            "name",
-            UntaggedValue::string(trim_cstyle_null(user.name().to_string())),
-        );
-
-        let mut groups = vec![];
-        for group in user.groups() {
-            groups
-                .push(UntaggedValue::string(trim_cstyle_null(group.to_string())).into_value(&tag));
-        }
-        user_dict.insert_untagged("groups", UntaggedValue::Table(groups));
-
-        users.push(user_dict.into_value());
-    }
-    if !users.is_empty() {
-        dict.insert_untagged("sessions", UntaggedValue::Table(users));
-    }
-
-    Some(dict.into_untagged_value())
-}
-
-pub fn temp(sys: &mut System, tag: Tag) -> Option<UntaggedValue> {
-    sys.refresh_components();
-    sys.refresh_components_list();
-
-    let mut output = vec![];
-
-    for component in sys.components() {
-        let mut dict = TaggedDictBuilder::new(&tag);
-
-        dict.insert_untagged("unit", UntaggedValue::string(component.label()));
-        dict.insert_untagged(
-            "temp",
-            UntaggedValue::decimal_from_float(component.temperature() as f64, tag.span),
-        );
-        dict.insert_untagged(
-            "high",
-            UntaggedValue::decimal_from_float(component.max() as f64, tag.span),
-        );
-
-        if let Some(critical) = component.critical() {
-            dict.insert_untagged(
-                "critical",
-                UntaggedValue::decimal_from_float(critical as f64, tag.span),
-            );
-        }
-        output.push(dict.into_value());
-    }
-    if !output.is_empty() {
-        Some(UntaggedValue::Table(output))
-    } else {
-        None
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/autoview/command.rs b/old_nushell/crates/nu-command/src/commands/viewers/autoview/command.rs
deleted file mode 100644
index 948533277..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/autoview/command.rs
+++ /dev/null
@@ -1,330 +0,0 @@
-use crate::commands::viewers::autoview::options::ConfigExtensions;
-use crate::prelude::*;
-use crate::primitive::get_color_config;
-use nu_data::value::format_leaf;
-use nu_engine::{UnevaluatedCallInfo, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::hir::{self, Expression, ExternalRedirection, Literal, SpannedExpression};
-use nu_protocol::{Primitive, Signature, UntaggedValue, Value};
-use nu_table::TextStyle;
-
-#[cfg(feature = "dataframe")]
-use nu_protocol::dataframe::FrameStruct;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "autoview"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("autoview")
-    }
-
-    fn usage(&self) -> &str {
-        "View the contents of the pipeline as a table or list."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        autoview(args)
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![
-            Example {
-                description: "Automatically view the results",
-                example: "ls | autoview",
-                result: None,
-            },
-            Example {
-                description: "Autoview is also implied. The above can be written as",
-                example: "ls",
-                result: None,
-            },
-        ]
-    }
-}
-
-pub fn autoview(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let configuration = args.configs().lock().global_config();
-    let tag = args.call_info.name_tag.clone();
-
-    let binary = args.scope().get_command("binaryview");
-    let text = args.scope().get_command("textview");
-    let table = args.scope().get_command("table");
-    let context = args.context;
-    let mut input_stream = args.input;
-
-    if let Some(x) = input_stream.next() {
-        match input_stream.next() {
-            Some(y) => {
-                let ctrl_c = context.ctrl_c().clone();
-                let xy = vec![x, y];
-                let xy_stream = xy.into_iter().chain(input_stream).interruptible(ctrl_c);
-
-                let stream = InputStream::from_stream(xy_stream);
-
-                if let Some(table) = table {
-                    let command_args = create_default_command_args(&context, stream, tag);
-                    let result = table.run(command_args)?;
-                    let _ = result.collect::<Vec<_>>();
-                }
-            }
-            _ => {
-                match x {
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::String(ref s)),
-                        tag: Tag { anchor, span },
-                    } if anchor.is_some() => {
-                        if let Some(text) = text {
-                            let command_args = create_default_command_args(
-                                &context,
-                                InputStream::one(
-                                    UntaggedValue::string(s).into_value(Tag { anchor, span }),
-                                ),
-                                tag,
-                            );
-                            let result = text.run_with_actions(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        } else {
-                            out!("{}", s);
-                        }
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::String(s)),
-                        ..
-                    } => {
-                        out!("{}", s);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::FilePath(s)),
-                        ..
-                    } => {
-                        out!("{}", s.display());
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Int(n)),
-                        ..
-                    } => {
-                        out!("{}", n);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::BigInt(n)),
-                        ..
-                    } => {
-                        out!("{}", n);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Decimal(n)),
-                        ..
-                    } => {
-                        // TODO: normalize decimal to remove trailing zeros.
-                        // normalization will be available in next release of bigdecimal crate
-                        let mut output = n.to_string();
-                        if output.contains('.') {
-                            output = output.trim_end_matches('0').to_owned();
-                        }
-                        if output.ends_with('.') {
-                            output.push('0');
-                        }
-                        out!("{}", output);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Boolean(b)),
-                        ..
-                    } => {
-                        out!("{}", b);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Duration(_)),
-                        ..
-                    } => {
-                        let output = format_leaf(&x).plain_string(100_000);
-                        out!("{}", output);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Filesize(_)),
-                        ..
-                    } => {
-                        let output = format_leaf(&x).plain_string(100_000);
-                        out!("{}", output);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Date(d)),
-                        ..
-                    } => {
-                        out!("{}", d);
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Range(_)),
-                        ..
-                    } => {
-                        let output = format_leaf(&x).plain_string(100_000);
-                        out!("{}", output);
-                    }
-
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Binary(ref b)),
-                        ..
-                    } => {
-                        if let Some(binary) = binary {
-                            let command_args =
-                                create_default_command_args(&context, InputStream::one(x), tag);
-                            let result = binary.run_with_actions(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        } else {
-                            use nu_pretty_hex::*;
-                            out!("{:?}", b.hex_dump());
-                        }
-                    }
-
-                    Value {
-                        value: UntaggedValue::Error(e),
-                        ..
-                    } => {
-                        return Err(e);
-                    }
-
-                    Value {
-                        value: UntaggedValue::Row(ref row),
-                        ..
-                    } => {
-                        let pivot_mode = configuration.pivot_mode();
-
-                        let term_width = context.host().lock().width();
-                        if pivot_mode.is_always()
-                            || (pivot_mode.is_auto()
-                                && (row
-                                    .entries
-                                    .iter()
-                                    .map(|(_, v)| v.convert_to_string())
-                                    .collect::<Vec<_>>()
-                                    .iter()
-                                    .fold(0usize, |acc, len| acc + len.len())
-                                    + row.entries.iter().count() * 2)
-                                    > term_width)
-                        {
-                            let mut entries = vec![];
-                            for (key, value) in &row.entries {
-                                entries.push(vec![
-                                    nu_table::StyledString::new(
-                                        key.to_string(),
-                                        TextStyle::new()
-                                            .alignment(nu_table::Alignment::Left)
-                                            .fg(nu_ansi_term::Color::Green)
-                                            .bold(Some(true)),
-                                    ),
-                                    nu_table::StyledString::new(
-                                        format_leaf(value).plain_string(100_000),
-                                        nu_table::TextStyle::basic_left(),
-                                    ),
-                                ]);
-                            }
-
-                            let color_hm = get_color_config(&configuration);
-
-                            let table =
-                                nu_table::Table::new(vec![], entries, nu_table::Theme::compact());
-
-                            println!("{}", nu_table::draw_table(&table, term_width, &color_hm));
-                        } else if let Some(table) = table {
-                            let command_args =
-                                create_default_command_args(&context, InputStream::one(x), tag);
-                            let result = table.run(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        } else {
-                            out!("{:?}", row);
-                        }
-                    }
-                    #[cfg(feature = "dataframe")]
-                    Value {
-                        value: UntaggedValue::DataFrame(df),
-                        tag,
-                    } => {
-                        if let Some(table) = table {
-                            // TODO. Configure the parameter rows from file. It can be
-                            // adjusted to see a certain amount of values in the head
-                            let command_args =
-                                create_default_command_args(&context, df.print()?.into(), tag);
-                            let result = table.run(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        }
-                    }
-                    #[cfg(feature = "dataframe")]
-                    Value {
-                        value: UntaggedValue::FrameStruct(FrameStruct::GroupBy(groupby)),
-                        tag,
-                    } => {
-                        if let Some(table) = table {
-                            // TODO. Configure the parameter rows from file. It can be
-                            // adjusted to see a certain amount of values in the head
-                            let command_args =
-                                create_default_command_args(&context, groupby.print()?.into(), tag);
-                            let result = table.run(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        }
-                    }
-                    Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        ..
-                    } => {
-                        // Do nothing
-                    }
-                    Value {
-                        value: ref item, ..
-                    } => {
-                        if let Some(table) = table {
-                            let command_args =
-                                create_default_command_args(&context, InputStream::one(x), tag);
-                            let result = table.run(command_args)?;
-                            let _ = result.collect::<Vec<_>>();
-                        } else {
-                            out!("{:?}", item);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Ok(InputStream::empty())
-}
-
-fn create_default_command_args(
-    context: &EvaluationContext,
-    input: InputStream,
-    tag: Tag,
-) -> CommandArgs {
-    let span = tag.span;
-    CommandArgs {
-        context: context.clone(),
-        call_info: UnevaluatedCallInfo {
-            args: hir::Call {
-                head: Box::new(SpannedExpression::new(
-                    Expression::Literal(Literal::String(String::new())),
-                    span,
-                )),
-                positional: None,
-                named: None,
-                span,
-                external_redirection: ExternalRedirection::Stdout,
-            },
-            name_tag: tag,
-        },
-        input,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/autoview/mod.rs b/old_nushell/crates/nu-command/src/commands/viewers/autoview/mod.rs
deleted file mode 100644
index 5cb35ceb1..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/autoview/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod command;
-mod options;
-
-pub use command::Command as Autoview;
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/autoview/options.rs b/old_nushell/crates/nu-command/src/commands/viewers/autoview/options.rs
deleted file mode 100644
index ad6aa5fca..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/autoview/options.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-pub use nu_data::config::NuConfig;
-use std::fmt::Debug;
-
-#[derive(PartialEq, Debug)]
-pub enum AutoPivotMode {
-    Auto,
-    Always,
-    Never,
-}
-
-impl AutoPivotMode {
-    pub fn is_auto(&self) -> bool {
-        matches!(self, AutoPivotMode::Auto)
-    }
-
-    pub fn is_always(&self) -> bool {
-        matches!(self, AutoPivotMode::Always)
-    }
-
-    #[allow(unused)]
-    pub fn is_never(&self) -> bool {
-        matches!(self, AutoPivotMode::Never)
-    }
-}
-
-pub trait ConfigExtensions: Debug + Send {
-    fn pivot_mode(&self) -> AutoPivotMode;
-}
-
-pub fn pivot_mode(config: &NuConfig) -> AutoPivotMode {
-    let vars = &config.vars;
-
-    if let Some(mode) = vars.get("pivot_mode") {
-        let mode = match mode.as_string() {
-            Ok(m) if m.to_lowercase() == "auto" => AutoPivotMode::Auto,
-            Ok(m) if m.to_lowercase() == "always" => AutoPivotMode::Always,
-            Ok(m) if m.to_lowercase() == "never" => AutoPivotMode::Never,
-            _ => AutoPivotMode::Never,
-        };
-
-        return mode;
-    }
-
-    AutoPivotMode::Never
-}
-
-impl ConfigExtensions for NuConfig {
-    fn pivot_mode(&self) -> AutoPivotMode {
-        pivot_mode(self)
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/bat_constants.rs b/old_nushell/crates/nu-command/src/commands/viewers/bat_constants.rs
deleted file mode 100644
index 0b7ca91a5..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/bat_constants.rs
+++ /dev/null
@@ -1,358 +0,0 @@
-pub const BAT_LANGUAGES: &[&str] = &[
-    "as",
-    "csv",
-    "tsv",
-    "applescript",
-    "script editor",
-    "s",
-    "S",
-    "adoc",
-    "asciidoc",
-    "asc",
-    "asa",
-    "yasm",
-    "nasm",
-    "asm",
-    "inc",
-    "mac",
-    "awk",
-    "bat",
-    "cmd",
-    "bib",
-    "sh",
-    "bash",
-    "zsh",
-    ".bash_aliases",
-    ".bash_completions",
-    ".bash_functions",
-    ".bash_login",
-    ".bash_logout",
-    ".bash_profile",
-    ".bash_variables",
-    ".bashrc",
-    ".profile",
-    ".textmate_init",
-    ".zshrc",
-    "PKGBUILD",
-    ".ebuild",
-    ".eclass",
-    "c",
-    "h",
-    "cs",
-    "csx",
-    "cpp",
-    "cc",
-    "cp",
-    "cxx",
-    "c++",
-    "C",
-    "h",
-    "hh",
-    "hpp",
-    "hxx",
-    "h++",
-    "inl",
-    "ipp",
-    "cabal",
-    "clj",
-    "cljc",
-    "cljs",
-    "edn",
-    "CMakeLists.txt",
-    "cmake",
-    "h.in",
-    "hh.in",
-    "hpp.in",
-    "hxx.in",
-    "h++.in",
-    "CMakeCache.txt",
-    "cr",
-    "css",
-    "css.erb",
-    "css.liquid",
-    "d",
-    "di",
-    "dart",
-    "diff",
-    "patch",
-    "Dockerfile",
-    "dockerfile",
-    "ex",
-    "exs",
-    "elm",
-    "erl",
-    "hrl",
-    "Emakefile",
-    "emakefile",
-    "fs",
-    "fsi",
-    "fsx",
-    "fs",
-    "fsi",
-    "fsx",
-    "fish",
-    "attributes",
-    "gitattributes",
-    ".gitattributes",
-    "COMMIT_EDITMSG",
-    "MERGE_MSG",
-    "TAG_EDITMSG",
-    "gitconfig",
-    ".gitconfig",
-    ".gitmodules",
-    "exclude",
-    "gitignore",
-    ".gitignore",
-    ".git",
-    "gitlog",
-    "git-rebase-todo",
-    "go",
-    "dot",
-    "DOT",
-    "gv",
-    "groovy",
-    "gvy",
-    "gradle",
-    "Jenkinsfile",
-    "hs",
-    "hs",
-    "hsc",
-    "show-nonprintable",
-    "html",
-    "htm",
-    "shtml",
-    "xhtml",
-    "asp",
-    "html.eex",
-    "yaws",
-    "rails",
-    "rhtml",
-    "erb",
-    "html.erb",
-    "adp",
-    "twig",
-    "html.twig",
-    "ini",
-    "INI",
-    "INF",
-    "reg",
-    "REG",
-    "lng",
-    "cfg",
-    "CFG",
-    "desktop",
-    "url",
-    "URL",
-    ".editorconfig",
-    ".hgrc",
-    "hgrc",
-    "java",
-    "bsh",
-    "properties",
-    "jsp",
-    "js",
-    "htc",
-    "js",
-    "jsx",
-    "babel",
-    "es6",
-    "js.erb",
-    "json",
-    "sublime-settings",
-    "sublime-menu",
-    "sublime-keymap",
-    "sublime-mousemap",
-    "sublime-theme",
-    "sublime-build",
-    "sublime-project",
-    "sublime-completions",
-    "sublime-commands",
-    "sublime-macro",
-    "sublime-color-scheme",
-    "ipynb",
-    "Pipfile.lock",
-    "jsonnet",
-    "libsonnet",
-    "libjsonnet",
-    "jl",
-    "kt",
-    "kts",
-    "tex",
-    "ltx",
-    "less",
-    "css.less",
-    "lisp",
-    "cl",
-    "clisp",
-    "l",
-    "mud",
-    "el",
-    "scm",
-    "ss",
-    "lsp",
-    "fasl",
-    "lhs",
-    "lua",
-    "make",
-    "GNUmakefile",
-    "makefile",
-    "Makefile",
-    "makefile.am",
-    "Makefile.am",
-    "makefile.in",
-    "Makefile.in",
-    "OCamlMakefile",
-    "mak",
-    "mk",
-    "md",
-    "mdown",
-    "markdown",
-    "markdn",
-    "matlab",
-    "build",
-    "nix",
-    "m",
-    "h",
-    "mm",
-    "M",
-    "h",
-    "ml",
-    "mli",
-    "mll",
-    "mly",
-    "pas",
-    "p",
-    "dpr",
-    "pl",
-    "pm",
-    "pod",
-    "t",
-    "PL",
-    "php",
-    "php3",
-    "php4",
-    "php5",
-    "php7",
-    "phps",
-    "phpt",
-    "phtml",
-    "txt",
-    "ps1",
-    "psm1",
-    "psd1",
-    "proto",
-    "protodevel",
-    "pb.txt",
-    "proto.text",
-    "textpb",
-    "pbtxt",
-    "prototxt",
-    "pp",
-    "epp",
-    "purs",
-    "py",
-    "py3",
-    "pyw",
-    "pyi",
-    "pyx",
-    "pyx.in",
-    "pxd",
-    "pxd.in",
-    "pxi",
-    "pxi.in",
-    "rpy",
-    "cpy",
-    "SConstruct",
-    "Sconstruct",
-    "sconstruct",
-    "SConscript",
-    "gyp",
-    "gypi",
-    "Snakefile",
-    "wscript",
-    "R",
-    "r",
-    "s",
-    "S",
-    "Rprofile",
-    "rd",
-    "re",
-    "rst",
-    "rest",
-    "robot",
-    "rb",
-    "Appfile",
-    "Appraisals",
-    "Berksfile",
-    "Brewfile",
-    "capfile",
-    "cgi",
-    "Cheffile",
-    "config.ru",
-    "Deliverfile",
-    "Fastfile",
-    "fcgi",
-    "Gemfile",
-    "gemspec",
-    "Guardfile",
-    "irbrc",
-    "jbuilder",
-    "Podfile",
-    "podspec",
-    "prawn",
-    "rabl",
-    "rake",
-    "Rakefile",
-    "Rantfile",
-    "rbx",
-    "rjs",
-    "ruby.rail",
-    "Scanfile",
-    "simplecov",
-    "Snapfile",
-    "thor",
-    "Thorfile",
-    "Vagrantfile",
-    "haml",
-    "sass",
-    "rxml",
-    "builder",
-    "rs",
-    "scala",
-    "sbt",
-    "sql",
-    "ddl",
-    "dml",
-    "erbsql",
-    "sql.erb",
-    "swift",
-    "log",
-    "tcl",
-    "tf",
-    "tfvars",
-    "hcl",
-    "sty",
-    "cls",
-    "textile",
-    "toml",
-    "tml",
-    "Cargo.lock",
-    "Gopkg.lock",
-    "Pipfile",
-    "ts",
-    "tsx",
-    "varlink",
-    "vim",
-    ".vimrc",
-    "xml",
-    "xsd",
-    "xslt",
-    "tld",
-    "dtml",
-    "rss",
-    "opml",
-    "svg",
-    "yaml",
-    "yml",
-    "sublime-syntax",
-];
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/mod.rs b/old_nushell/crates/nu-command/src/commands/viewers/mod.rs
deleted file mode 100644
index ddd1b9c67..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod autoview;
-mod bat_constants;
-mod table;
-
-pub use autoview::*;
-pub use bat_constants::BAT_LANGUAGES;
-pub use table::*;
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/table/command.rs b/old_nushell/crates/nu-command/src/commands/viewers/table/command.rs
deleted file mode 100644
index 6caa91c6d..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/table/command.rs
+++ /dev/null
@@ -1,267 +0,0 @@
-use crate::commands::viewers::table::options::{ConfigExtensions, NuConfig};
-use crate::prelude::*;
-use crate::primitive::get_color_config;
-use futures::executor::block_on;
-use nu_data::value::{format_leaf, style_leaf};
-use nu_engine::WholeStreamCommand;
-use nu_errors::ShellError;
-use nu_protocol::{Signature, SyntaxShape, UntaggedValue, Value};
-use nu_table::{draw_table, Alignment, StyledString, TextStyle};
-use std::collections::HashMap;
-use std::sync::atomic::Ordering;
-use std::time::Instant;
-
-const STREAM_PAGE_SIZE: usize = 1000;
-const STREAM_TIMEOUT_CHECK_INTERVAL: usize = 100;
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "table"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("table").named(
-            "start_number",
-            SyntaxShape::Number,
-            "row number to start viewing from",
-            Some('n'),
-        )
-    }
-
-    fn usage(&self) -> &str {
-        "View the contents of the pipeline as a table."
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        table(args)
-    }
-}
-
-pub fn from_list(
-    values: &[Value],
-    configuration: &NuConfig,
-    starting_idx: usize,
-    color_hm: &HashMap<String, nu_ansi_term::Style>,
-) -> nu_table::Table {
-    let header_style = configuration.header_style();
-    let mut headers: Vec<StyledString> = nu_protocol::merge_descriptors(values)
-        .into_iter()
-        .map(|x| StyledString::new(x, header_style))
-        .collect();
-    let entries = values_to_entries(values, &mut headers, configuration, starting_idx, color_hm);
-    nu_table::Table {
-        headers,
-        data: entries,
-        theme: configuration.table_mode(),
-    }
-}
-
-fn values_to_entries(
-    values: &[Value],
-    headers: &mut Vec<StyledString>,
-    configuration: &NuConfig,
-    starting_idx: usize,
-    color_hm: &HashMap<String, nu_ansi_term::Style>,
-) -> Vec<Vec<StyledString>> {
-    let disable_indexes = configuration.disabled_indexes();
-    let mut entries = vec![];
-
-    if headers.is_empty() {
-        headers.push(StyledString::new("".to_string(), TextStyle::basic_left()));
-    }
-
-    for (idx, value) in values.iter().enumerate() {
-        let mut row: Vec<StyledString> = headers
-            .iter()
-            .map(|d: &StyledString| {
-                if d.contents.is_empty() {
-                    match value {
-                        Value {
-                            value: UntaggedValue::Row(..),
-                            ..
-                        } => StyledString::new(
-                            format_leaf(&UntaggedValue::nothing()).plain_string(100_000),
-                            style_leaf(&UntaggedValue::nothing(), color_hm),
-                        ),
-                        _ => StyledString::new(
-                            format_leaf(value).plain_string(100_000),
-                            style_leaf(value, color_hm),
-                        ),
-                    }
-                } else {
-                    match value {
-                        Value {
-                            value: UntaggedValue::Row(..),
-                            ..
-                        } => {
-                            let data = value.get_data(&d.contents);
-
-                            StyledString::new(
-                                format_leaf(data.borrow()).plain_string(100_000),
-                                style_leaf(data.borrow(), color_hm),
-                            )
-                        }
-                        _ => StyledString::new(
-                            format_leaf(&UntaggedValue::nothing()).plain_string(100_000),
-                            style_leaf(&UntaggedValue::nothing(), color_hm),
-                        ),
-                    }
-                }
-            })
-            .collect();
-
-        // Indices are green, bold, right-aligned:
-        // unless we change them :)
-        if !disable_indexes {
-            row.insert(
-                0,
-                StyledString::new(
-                    (starting_idx + idx).to_string(),
-                    TextStyle::new().alignment(Alignment::Right).style(
-                        color_hm
-                            .get("index_color")
-                            .unwrap_or(
-                                &nu_ansi_term::Style::default()
-                                    .bold()
-                                    .fg(nu_ansi_term::Color::Green),
-                            )
-                            .to_owned(),
-                    ),
-                ),
-            );
-        }
-
-        entries.push(row);
-    }
-
-    if !disable_indexes {
-        headers.insert(
-            0,
-            StyledString::new(
-                "#".to_string(),
-                TextStyle::new().alignment(Alignment::Center).style(
-                    color_hm
-                        .get("header_color")
-                        .unwrap_or(
-                            &nu_ansi_term::Style::default()
-                                .bold()
-                                .fg(nu_ansi_term::Color::Green),
-                        )
-                        .to_owned(),
-                ),
-            ),
-        );
-    }
-
-    entries
-}
-
-fn table(mut args: CommandArgs) -> Result<OutputStream, ShellError> {
-    let configuration = args.configs().lock().global_config();
-
-    // Ideally, get_color_config would get all the colors configured in the config.toml
-    // and create a style based on those settings. However, there are few places where
-    // this just won't work right now, like header styling, because a style needs to know
-    // more than just color, it needs fg & bg color, bold, dimmed, italic, underline,
-    // blink, reverse, hidden, strikethrough and most of those aren't available in the
-    // config.toml.... yet.
-    let color_hm = get_color_config(&configuration);
-
-    let mut start_number = if let Some(f) = args.get_flag("start_number")? {
-        f
-    } else {
-        0
-    };
-
-    let mut delay_slot = None;
-
-    let term_width = args.host().lock().width();
-
-    let stream_data = async {
-        let finished = Arc::new(AtomicBool::new(false));
-        // we are required to clone finished, for use within the callback, otherwise we get borrow errors
-        while !finished.clone().load(Ordering::Relaxed) {
-            let mut new_input: VecDeque<Value> = VecDeque::new();
-
-            let start_time = Instant::now();
-            for idx in 0..STREAM_PAGE_SIZE {
-                if let Some(val) = delay_slot {
-                    new_input.push_back(val);
-                    delay_slot = None;
-                } else {
-                    match args.input.next() {
-                        Some(a) => {
-                            if !new_input.is_empty() {
-                                if let Some(descs) = new_input.get(0) {
-                                    let descs = descs.data_descriptors();
-                                    let compare = a.data_descriptors();
-                                    if descs != compare {
-                                        delay_slot = Some(a);
-                                        break;
-                                    } else {
-                                        new_input.push_back(a);
-                                    }
-                                } else {
-                                    new_input.push_back(a);
-                                }
-                            } else {
-                                new_input.push_back(a);
-                            }
-                        }
-                        _ => {
-                            finished.store(true, Ordering::Relaxed);
-                            break;
-                        }
-                    }
-
-                    // Check if we've gone over our buffering threshold
-                    if (idx + 1) % STREAM_TIMEOUT_CHECK_INTERVAL == 0 {
-                        let end_time = Instant::now();
-
-                        // If we've been buffering over a second, go ahead and send out what we have so far
-                        if (end_time - start_time).as_secs() >= 1 {
-                            break;
-                        }
-
-                        if finished.load(Ordering::Relaxed) {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            let input: Vec<Value> = new_input.into();
-
-            if !input.is_empty() {
-                let t = from_list(&input, &configuration, start_number, &color_hm);
-                let output = draw_table(&t, term_width, &color_hm);
-
-                println!("{}", output);
-            }
-
-            start_number += input.len();
-        }
-
-        Result::<_, ShellError>::Ok(())
-    };
-
-    block_on(stream_data)
-        .map_err(|_| ShellError::untagged_runtime_error("Error streaming data"))?;
-
-    Ok(OutputStream::empty())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Command;
-    use super::ShellError;
-
-    #[test]
-    fn examples_work_as_expected() -> Result<(), ShellError> {
-        use crate::examples::test as test_examples;
-
-        test_examples(Command {})
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/table/mod.rs b/old_nushell/crates/nu-command/src/commands/viewers/table/mod.rs
deleted file mode 100644
index 96f007aac..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/table/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod command;
-mod options;
-
-pub use command::Command as Table;
diff --git a/old_nushell/crates/nu-command/src/commands/viewers/table/options.rs b/old_nushell/crates/nu-command/src/commands/viewers/table/options.rs
deleted file mode 100644
index cafb34951..000000000
--- a/old_nushell/crates/nu-command/src/commands/viewers/table/options.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-pub use nu_data::config::NuConfig;
-use nu_data::primitive::lookup_ansi_color_style;
-use nu_protocol::Value;
-use nu_table::{Alignment, TextStyle};
-use std::fmt::Debug;
-
-pub trait ConfigExtensions: Debug + Send {
-    fn table_mode(&self) -> nu_table::Theme;
-    fn disabled_indexes(&self) -> bool;
-    fn header_style(&self) -> TextStyle;
-}
-
-pub fn header_alignment_from_value(align_value: Option<&Value>) -> nu_table::Alignment {
-    match align_value {
-        Some(v) => match v
-            .as_string()
-            .unwrap_or_else(|_| "none".to_string())
-            .as_ref()
-        {
-            "l" | "left" => nu_table::Alignment::Left,
-            "c" | "center" => nu_table::Alignment::Center,
-            "r" | "right" => nu_table::Alignment::Right,
-            _ => nu_table::Alignment::Center,
-        },
-        _ => nu_table::Alignment::Center,
-    }
-}
-
-pub fn get_color_from_key_and_subkey(config: &NuConfig, key: &str, subkey: &str) -> Option<Value> {
-    let vars = &config.vars;
-
-    if let Some(config_vars) = vars.get(key) {
-        for (kee, value) in config_vars.row_entries() {
-            if kee == subkey {
-                return Some(value.clone());
-            }
-        }
-    }
-
-    None
-}
-
-pub fn header_bold_from_value(bold_value: Option<&Value>) -> bool {
-    bold_value
-        .map(|x| x.as_bool().unwrap_or(true))
-        .unwrap_or(true)
-}
-
-pub fn table_mode(config: &NuConfig) -> nu_table::Theme {
-    let vars = &config.vars;
-
-    vars.get("table_mode")
-        .map_or(nu_table::Theme::compact(), |mode| match mode.as_string() {
-            Ok(m) if m == "basic" => nu_table::Theme::basic(),
-            Ok(m) if m == "compact" => nu_table::Theme::compact(),
-            Ok(m) if m == "light" => nu_table::Theme::light(),
-            Ok(m) if m == "thin" => nu_table::Theme::thin(),
-            Ok(m) if m == "with_love" => nu_table::Theme::with_love(),
-            Ok(m) if m == "compact_double" => nu_table::Theme::compact_double(),
-            Ok(m) if m == "rounded" => nu_table::Theme::rounded(),
-            Ok(m) if m == "reinforced" => nu_table::Theme::reinforced(),
-            Ok(m) if m == "heavy" => nu_table::Theme::heavy(),
-            Ok(m) if m == "none" => nu_table::Theme::none(),
-            _ => nu_table::Theme::compact(),
-        })
-}
-
-pub fn disabled_indexes(config: &NuConfig) -> bool {
-    let vars = &config.vars;
-
-    vars.get("disable_table_indexes")
-        .map_or(false, |x| x.as_bool().unwrap_or(false))
-}
-
-impl ConfigExtensions for NuConfig {
-    fn header_style(&self) -> TextStyle {
-        // FIXME: I agree, this is the long way around, please suggest and alternative.
-        let head_color = get_color_from_key_and_subkey(self, "color_config", "header_color");
-        let (head_color_style, head_bold_bool) = match head_color {
-            Some(s) => (
-                lookup_ansi_color_style(s.as_string().unwrap_or_else(|_| "green".to_string())),
-                header_bold_from_value(Some(&s)),
-            ),
-            None => (nu_ansi_term::Color::Green.normal(), true),
-        };
-
-        let head_align = get_color_from_key_and_subkey(self, "color_config", "header_align");
-        let head_alignment = match head_align {
-            Some(a) => header_alignment_from_value(Some(&a)),
-            None => Alignment::Center,
-        };
-
-        TextStyle::new()
-            .alignment(head_alignment)
-            .bold(Some(head_bold_bool))
-            .fg(head_color_style
-                .foreground
-                .unwrap_or(nu_ansi_term::Color::Green))
-    }
-
-    fn table_mode(&self) -> nu_table::Theme {
-        table_mode(self)
-    }
-
-    fn disabled_indexes(&self) -> bool {
-        disabled_indexes(self)
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/default_context.rs b/old_nushell/crates/nu-command/src/default_context.rs
deleted file mode 100644
index 9d091957e..000000000
--- a/old_nushell/crates/nu-command/src/default_context.rs
+++ /dev/null
@@ -1,372 +0,0 @@
-use crate::prelude::*;
-use nu_engine::whole_stream_command;
-use std::error::Error;
-
-pub fn create_default_context(interactive: bool) -> Result<EvaluationContext, Box<dyn Error>> {
-    let context = EvaluationContext::basic();
-
-    {
-        use crate::commands::*;
-
-        context.add_commands(vec![
-            // Fundamentals
-            whole_stream_command(NuPlugin),
-            whole_stream_command(Let),
-            whole_stream_command(LetEnv),
-            whole_stream_command(UnletEnv),
-            whole_stream_command(LoadEnv),
-            whole_stream_command(Def),
-            whole_stream_command(Source),
-            whole_stream_command(Alias),
-            whole_stream_command(Unalias),
-            whole_stream_command(Ignore),
-            whole_stream_command(Tutor),
-            whole_stream_command(Find),
-            // System/file operations
-            whole_stream_command(ErrorMake),
-            whole_stream_command(Exec),
-            whole_stream_command(Pwd),
-            whole_stream_command(Ls),
-            whole_stream_command(Du),
-            whole_stream_command(Cd),
-            whole_stream_command(Remove),
-            whole_stream_command(Open),
-            whole_stream_command(Pathvar),
-            whole_stream_command(PathvarAdd),
-            whole_stream_command(PathvarRemove),
-            whole_stream_command(PathvarReset),
-            whole_stream_command(PathvarAppend),
-            whole_stream_command(PathvarSave),
-            whole_stream_command(Config),
-            whole_stream_command(ConfigGet),
-            whole_stream_command(ConfigSet),
-            whole_stream_command(ConfigSetInto),
-            whole_stream_command(ConfigClear),
-            whole_stream_command(ConfigRemove),
-            whole_stream_command(ConfigPath),
-            whole_stream_command(Help),
-            whole_stream_command(History),
-            whole_stream_command(Save),
-            whole_stream_command(Touch),
-            whole_stream_command(Cpy),
-            whole_stream_command(Date),
-            whole_stream_command(DateListTimeZone),
-            whole_stream_command(DateNow),
-            whole_stream_command(DateToTable),
-            whole_stream_command(DateToTimeZone),
-            whole_stream_command(DateFormat),
-            whole_stream_command(DateHumanize),
-            whole_stream_command(Cal),
-            whole_stream_command(Mkdir),
-            whole_stream_command(Mv),
-            whole_stream_command(Kill),
-            whole_stream_command(Version),
-            whole_stream_command(Clear),
-            whole_stream_command(Describe),
-            whole_stream_command(Which),
-            whole_stream_command(Debug),
-            whole_stream_command(WithEnv),
-            whole_stream_command(Do),
-            whole_stream_command(Sleep),
-            // Statistics
-            whole_stream_command(Size),
-            whole_stream_command(Length),
-            whole_stream_command(Benchmark),
-            // Metadata
-            whole_stream_command(Tags),
-            // Shells
-            whole_stream_command(Next),
-            whole_stream_command(Previous),
-            whole_stream_command(Goto),
-            whole_stream_command(Shells),
-            whole_stream_command(Enter),
-            whole_stream_command(Exit),
-            // Viz
-            whole_stream_command(Chart),
-            // Viewers
-            whole_stream_command(Autoview),
-            whole_stream_command(Table),
-            // Text manipulation
-            whole_stream_command(Hash),
-            whole_stream_command(HashBase64),
-            whole_stream_command(HashMd5::default()),
-            whole_stream_command(HashSha256::default()),
-            whole_stream_command(Split),
-            whole_stream_command(SplitColumn),
-            whole_stream_command(SplitRow),
-            whole_stream_command(SplitChars),
-            whole_stream_command(Lines),
-            whole_stream_command(Echo),
-            whole_stream_command(Parse),
-            whole_stream_command(Str),
-            whole_stream_command(StrToDecimal),
-            whole_stream_command(StrToInteger),
-            whole_stream_command(StrDowncase),
-            whole_stream_command(StrUpcase),
-            whole_stream_command(StrCapitalize),
-            whole_stream_command(StrFindReplace),
-            whole_stream_command(StrSubstring),
-            whole_stream_command(StrToDatetime),
-            whole_stream_command(StrContains),
-            whole_stream_command(StrIndexOf),
-            whole_stream_command(StrTrim),
-            whole_stream_command(StrStartsWith),
-            whole_stream_command(StrEndsWith),
-            whole_stream_command(StrCollect),
-            whole_stream_command(StrLength),
-            whole_stream_command(StrLPad),
-            whole_stream_command(StrReverse),
-            whole_stream_command(StrRPad),
-            whole_stream_command(StrCamelCase),
-            whole_stream_command(StrPascalCase),
-            whole_stream_command(StrKebabCase),
-            whole_stream_command(StrSnakeCase),
-            whole_stream_command(StrScreamingSnakeCase),
-            whole_stream_command(BuildString),
-            whole_stream_command(Ansi),
-            whole_stream_command(AnsiStrip),
-            whole_stream_command(AnsiGradient),
-            whole_stream_command(Char),
-            whole_stream_command(DetectColumns),
-            // Column manipulation
-            whole_stream_command(DropColumn),
-            whole_stream_command(MoveColumn),
-            whole_stream_command(Reject),
-            whole_stream_command(Select),
-            whole_stream_command(Get),
-            whole_stream_command(Update),
-            whole_stream_command(UpdateCells),
-            whole_stream_command(Insert),
-            whole_stream_command(Into),
-            whole_stream_command(IntoBinary),
-            whole_stream_command(IntoColumnPath),
-            whole_stream_command(IntoInt),
-            whole_stream_command(IntoFilepath),
-            whole_stream_command(IntoFilesize),
-            whole_stream_command(IntoString),
-            whole_stream_command(SplitBy),
-            // Row manipulation
-            whole_stream_command(All),
-            whole_stream_command(Any),
-            whole_stream_command(Reverse),
-            whole_stream_command(Append),
-            whole_stream_command(Prepend),
-            whole_stream_command(SortBy),
-            whole_stream_command(GroupBy),
-            whole_stream_command(GroupByDate),
-            whole_stream_command(First),
-            whole_stream_command(Last),
-            whole_stream_command(Every),
-            whole_stream_command(Nth),
-            whole_stream_command(Drop),
-            whole_stream_command(DropNth),
-            whole_stream_command(Format),
-            whole_stream_command(FileSize),
-            whole_stream_command(Where),
-            whole_stream_command(If),
-            whole_stream_command(Compact),
-            whole_stream_command(Default),
-            whole_stream_command(Skip),
-            whole_stream_command(SkipUntil),
-            whole_stream_command(SkipWhile),
-            whole_stream_command(Keep),
-            whole_stream_command(KeepUntil),
-            whole_stream_command(KeepWhile),
-            whole_stream_command(Range),
-            whole_stream_command(Rename),
-            whole_stream_command(Uniq),
-            whole_stream_command(Each),
-            whole_stream_command(EachGroup),
-            whole_stream_command(EachWindow),
-            whole_stream_command(Empty),
-            whole_stream_command(ForIn),
-            // Table manipulation
-            whole_stream_command(Flatten),
-            whole_stream_command(Merge),
-            whole_stream_command(Shuffle),
-            whole_stream_command(Wrap),
-            whole_stream_command(Pivot),
-            whole_stream_command(Headers),
-            whole_stream_command(Reduce),
-            whole_stream_command(Roll),
-            whole_stream_command(RollColumn),
-            whole_stream_command(RollUp),
-            whole_stream_command(Rotate),
-            whole_stream_command(RotateCounterClockwise),
-            whole_stream_command(Zip),
-            whole_stream_command(Collect),
-            // Data processing
-            whole_stream_command(Histogram),
-            whole_stream_command(Autoenv),
-            whole_stream_command(AutoenvTrust),
-            whole_stream_command(AutoenvUntrust),
-            whole_stream_command(Math),
-            whole_stream_command(MathAbs),
-            whole_stream_command(MathAverage),
-            whole_stream_command(MathEval),
-            whole_stream_command(MathMedian),
-            whole_stream_command(MathMinimum),
-            whole_stream_command(MathMode),
-            whole_stream_command(MathMaximum),
-            whole_stream_command(MathStddev),
-            whole_stream_command(MathSummation),
-            whole_stream_command(MathVariance),
-            whole_stream_command(MathProduct),
-            whole_stream_command(MathRound),
-            whole_stream_command(MathFloor),
-            whole_stream_command(MathCeil),
-            whole_stream_command(MathSqrt),
-            // File format output
-            whole_stream_command(To),
-            whole_stream_command(ToCsv),
-            whole_stream_command(ToHtml),
-            whole_stream_command(ToJson),
-            whole_stream_command(ToMarkdown),
-            whole_stream_command(ToToml),
-            whole_stream_command(ToTsv),
-            whole_stream_command(ToUrl),
-            whole_stream_command(ToYaml),
-            whole_stream_command(ToXml),
-            // File format input
-            whole_stream_command(From),
-            whole_stream_command(FromCsv),
-            whole_stream_command(FromEml),
-            whole_stream_command(FromTsv),
-            whole_stream_command(FromSsv),
-            whole_stream_command(FromIni),
-            whole_stream_command(FromJson),
-            whole_stream_command(FromOds),
-            whole_stream_command(FromToml),
-            whole_stream_command(FromUrl),
-            whole_stream_command(FromXlsx),
-            whole_stream_command(FromXml),
-            whole_stream_command(FromYaml),
-            whole_stream_command(FromYml),
-            whole_stream_command(FromIcs),
-            whole_stream_command(FromVcf),
-            // "Private" commands (not intended to be accessed directly)
-            whole_stream_command(RunExternalCommand { interactive }),
-            // Random value generation
-            whole_stream_command(Random),
-            whole_stream_command(RandomBool),
-            whole_stream_command(RandomDice),
-            #[cfg(feature = "uuid_crate")]
-            whole_stream_command(RandomUUID),
-            whole_stream_command(RandomInteger),
-            whole_stream_command(RandomDecimal),
-            whole_stream_command(RandomChars),
-            // Path
-            whole_stream_command(PathBasename),
-            whole_stream_command(PathCommand),
-            whole_stream_command(PathDirname),
-            whole_stream_command(PathExists),
-            whole_stream_command(PathExpand),
-            whole_stream_command(PathJoin),
-            whole_stream_command(PathParse),
-            whole_stream_command(PathRelativeTo),
-            whole_stream_command(PathSplit),
-            whole_stream_command(PathType),
-            // Url
-            whole_stream_command(UrlCommand),
-            whole_stream_command(UrlScheme),
-            whole_stream_command(UrlPath),
-            whole_stream_command(UrlHost),
-            whole_stream_command(UrlQuery),
-            whole_stream_command(Seq),
-            whole_stream_command(SeqDates),
-            whole_stream_command(TermSize),
-            // Network
-            #[cfg(feature = "fetch")]
-            whole_stream_command(Fetch),
-            #[cfg(feature = "post")]
-            whole_stream_command(Post),
-            // System
-            #[cfg(feature = "ps")]
-            whole_stream_command(Ps),
-            #[cfg(feature = "sys")]
-            whole_stream_command(Sys),
-        ]);
-
-        //Dataframe commands
-        #[cfg(feature = "dataframe")]
-        context.add_commands(vec![
-            whole_stream_command(DataFrame),
-            whole_stream_command(DataFrameOpen),
-            whole_stream_command(DataFrameList),
-            whole_stream_command(DataFrameGroupBy),
-            whole_stream_command(DataFrameAggregate),
-            whole_stream_command(DataFrameShow),
-            whole_stream_command(DataFrameSample),
-            whole_stream_command(DataFrameJoin),
-            whole_stream_command(DataFrameDrop),
-            whole_stream_command(DataFrameSelect),
-            whole_stream_command(DataFrameDTypes),
-            whole_stream_command(DataFrameDummies),
-            whole_stream_command(DataFrameFirst),
-            whole_stream_command(DataFrameLast),
-            whole_stream_command(DataFrameSlice),
-            whole_stream_command(DataFrameMelt),
-            whole_stream_command(DataFramePivot),
-            whole_stream_command(DataFrameWhere),
-            whole_stream_command(DataFrameToDF),
-            whole_stream_command(DataFrameToParquet),
-            whole_stream_command(DataFrameToCsv),
-            whole_stream_command(DataFrameSort),
-            whole_stream_command(DataFrameGet),
-            whole_stream_command(DataFrameDropDuplicates),
-            whole_stream_command(DataFrameDropNulls),
-            whole_stream_command(DataFrameColumn),
-            whole_stream_command(DataFrameWithColumn),
-            whole_stream_command(DataFrameFilter),
-            whole_stream_command(DataFrameSeriesRename),
-            whole_stream_command(DataFrameValueCounts),
-            whole_stream_command(DataFrameIsNull),
-            whole_stream_command(DataFrameIsNotNull),
-            whole_stream_command(DataFrameAllTrue),
-            whole_stream_command(DataFrameAllFalse),
-            whole_stream_command(DataFrameArgMax),
-            whole_stream_command(DataFrameArgMin),
-            whole_stream_command(DataFrameArgTrue),
-            whole_stream_command(DataFrameArgUnique),
-            whole_stream_command(DataFrameArgSort),
-            whole_stream_command(DataFrameUnique),
-            whole_stream_command(DataFrameNUnique),
-            whole_stream_command(DataFrameNNull),
-            whole_stream_command(DataFrameIsUnique),
-            whole_stream_command(DataFrameIsDuplicated),
-            whole_stream_command(DataFrameIsIn),
-            whole_stream_command(DataFrameShift),
-            whole_stream_command(DataFrameSet),
-            whole_stream_command(DataFrameNot),
-            whole_stream_command(DataFrameTake),
-            whole_stream_command(DataFrameSetWithIdx),
-            whole_stream_command(DataFrameShape),
-            whole_stream_command(DataFrameReplace),
-            whole_stream_command(DataFrameReplaceAll),
-            whole_stream_command(DataFrameStringLengths),
-            whole_stream_command(DataFrameContains),
-            whole_stream_command(DataFrameToLowercase),
-            whole_stream_command(DataFrameToUppercase),
-            whole_stream_command(DataFrameStringSlice),
-            whole_stream_command(DataFrameConcatenate),
-            whole_stream_command(DataFrameAppend),
-            whole_stream_command(DataFrameGetHour),
-            whole_stream_command(DataFrameGetMinute),
-            whole_stream_command(DataFrameGetSecond),
-            whole_stream_command(DataFrameGetDay),
-            whole_stream_command(DataFrameGetMonth),
-            whole_stream_command(DataFrameGetYear),
-            whole_stream_command(DataFrameGetWeek),
-            whole_stream_command(DataFrameGetWeekDay),
-            whole_stream_command(DataFrameGetOrdinal),
-            whole_stream_command(DataFrameGetNanoSecond),
-            whole_stream_command(DataFrameStrFTime),
-            whole_stream_command(DataFrameDescribe),
-            whole_stream_command(DataFrameRolling),
-            whole_stream_command(DataFrameCumulative),
-            whole_stream_command(DataFrameRename),
-        ]);
-    }
-
-    Ok(context)
-}
diff --git a/old_nushell/crates/nu-command/src/examples.rs b/old_nushell/crates/nu-command/src/examples.rs
deleted file mode 100644
index 3ef28d77b..000000000
--- a/old_nushell/crates/nu-command/src/examples.rs
+++ /dev/null
@@ -1,368 +0,0 @@
-mod sample;
-
-mod double_echo;
-mod double_ls;
-mod stub_generate;
-
-use double_echo::Command as DoubleEcho;
-use double_ls::Command as DoubleLs;
-use stub_generate::{mock_path, Command as StubOpen};
-
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::hir::{ClassifiedBlock, ExternalRedirection};
-use nu_protocol::{ShellTypeName, Value};
-use nu_source::AnchorLocation;
-
-#[cfg(feature = "dataframe")]
-use crate::commands::{
-    DataFrameDropNulls, DataFrameGroupBy, DataFrameIsNull, DataFrameShift, DataFrameToDF,
-    DataFrameWithColumn, StrToDatetime,
-};
-
-use crate::commands::{
-    Append, BuildString, Collect, Each, Echo, First, Get, If, IntoInt, Keep, Last, Let, Math,
-    MathMode, Nth, Select, StrCollect, Wrap,
-};
-use nu_engine::{run_block, whole_stream_command, Command, EvaluationContext, WholeStreamCommand};
-use nu_stream::InputStream;
-
-pub fn test_examples(cmd: Command) -> Result<(), ShellError> {
-    let examples = cmd.examples();
-
-    let base_context = EvaluationContext::basic();
-
-    base_context.add_commands(vec![
-        // Command Doubles
-        whole_stream_command(DoubleLs {}),
-        // Minimal restricted commands to aid in testing
-        whole_stream_command(Append {}),
-        whole_stream_command(Echo {}),
-        whole_stream_command(BuildString {}),
-        whole_stream_command(First {}),
-        whole_stream_command(Get {}),
-        whole_stream_command(If {}),
-        whole_stream_command(IntoInt {}),
-        whole_stream_command(Keep {}),
-        whole_stream_command(Each {}),
-        whole_stream_command(Last {}),
-        whole_stream_command(Nth {}),
-        whole_stream_command(Let {}),
-        whole_stream_command(Select),
-        whole_stream_command(StrCollect),
-        whole_stream_command(Collect),
-        whole_stream_command(Wrap),
-        cmd,
-    ]);
-
-    for sample_pipeline in examples {
-        let mut ctx = base_context.clone();
-
-        let block = parse_line(sample_pipeline.example, &ctx)?;
-
-        if let Some(expected) = &sample_pipeline.result {
-            let result = evaluate_block(block, &mut ctx)?;
-
-            ctx.with_errors(|reasons| reasons.iter().cloned().next())
-                .map_or(Ok(()), Err)?;
-
-            if expected.len() != result.len() {
-                let rows_returned =
-                    format!("expected: {}\nactual: {}", expected.len(), result.len());
-                let failed_call = format!("command: {}\n", sample_pipeline.example);
-
-                panic!(
-                    "example command produced unexpected number of results.\n {} {}",
-                    failed_call, rows_returned
-                );
-            }
-
-            for (e, a) in expected.iter().zip(&result) {
-                if !values_equal(e, a) {
-                    let row_errored = format!("expected: {:#?}\nactual: {:#?}", e, a);
-                    let failed_call = format!("command: {}\n", sample_pipeline.example);
-
-                    panic!(
-                        "example command produced unexpected result.\n {} {}",
-                        failed_call, row_errored
-                    );
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-pub fn test(cmd: impl WholeStreamCommand + 'static) -> Result<(), ShellError> {
-    let examples = cmd.examples();
-
-    let base_context = EvaluationContext::basic();
-
-    base_context.add_commands(vec![
-        whole_stream_command(Math),
-        whole_stream_command(MathMode {}),
-        whole_stream_command(Echo {}),
-        whole_stream_command(BuildString {}),
-        whole_stream_command(Get {}),
-        whole_stream_command(Keep {}),
-        whole_stream_command(Each {}),
-        whole_stream_command(Let {}),
-        whole_stream_command(cmd),
-        whole_stream_command(Select),
-        whole_stream_command(StrCollect),
-        whole_stream_command(Collect),
-        whole_stream_command(Wrap),
-    ]);
-
-    for sample_pipeline in examples {
-        let mut ctx = base_context.clone();
-
-        let block = parse_line(sample_pipeline.example, &ctx)?;
-
-        if let Some(expected) = &sample_pipeline.result {
-            let start = std::time::Instant::now();
-            let result = evaluate_block(block, &mut ctx)?;
-
-            println!("input: {}", sample_pipeline.example);
-            println!("result: {:?}", result);
-            println!("done: {:?}", start.elapsed());
-
-            ctx.with_errors(|reasons| reasons.iter().cloned().take(1).next())
-                .map_or(Ok(()), Err)?;
-
-            if expected.len() != result.len() {
-                let rows_returned =
-                    format!("expected: {}\nactual: {}", expected.len(), result.len());
-                let failed_call = format!("command: {}\n", sample_pipeline.example);
-
-                panic!(
-                    "example command produced unexpected number of results.\n {} {}",
-                    failed_call, rows_returned
-                );
-            }
-
-            for (e, a) in expected.iter().zip(&result) {
-                if !values_equal(e, a) {
-                    let row_errored = format!("expected: {:#?}\nactual: {:#?}", e, a);
-                    let failed_call = format!("command: {}\n", sample_pipeline.example);
-
-                    panic!(
-                        "example command produced unexpected result.\n {} {}",
-                        failed_call, row_errored
-                    );
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(feature = "dataframe")]
-pub fn test_dataframe(cmd: impl WholeStreamCommand + 'static) -> Result<(), ShellError> {
-    use nu_protocol::UntaggedValue;
-
-    let examples = cmd.examples();
-
-    let base_context = EvaluationContext::basic();
-
-    base_context.add_commands(vec![
-        whole_stream_command(cmd),
-        // Commands used with dataframe
-        whole_stream_command(DataFrameToDF),
-        whole_stream_command(DataFrameShift),
-        whole_stream_command(DataFrameIsNull),
-        whole_stream_command(DataFrameGroupBy),
-        whole_stream_command(DataFrameWithColumn),
-        whole_stream_command(DataFrameDropNulls),
-        // Base commands for context
-        whole_stream_command(Math),
-        whole_stream_command(MathMode {}),
-        whole_stream_command(Echo {}),
-        whole_stream_command(BuildString {}),
-        whole_stream_command(Get {}),
-        whole_stream_command(Keep {}),
-        whole_stream_command(Each {}),
-        whole_stream_command(Let {}),
-        whole_stream_command(Select),
-        whole_stream_command(StrCollect),
-        whole_stream_command(Collect),
-        whole_stream_command(Wrap),
-        whole_stream_command(StrToDatetime),
-    ]);
-
-    for sample_pipeline in examples {
-        let mut ctx = base_context.clone();
-
-        println!("{:?}", &sample_pipeline.example);
-        let block = parse_line(sample_pipeline.example, &ctx)?;
-
-        if let Some(expected) = &sample_pipeline.result {
-            let start = std::time::Instant::now();
-            let result = evaluate_block(block, &mut ctx)?;
-
-            println!("input: {}", sample_pipeline.example);
-            println!("result: {:?}", result);
-            println!("done: {:?}", start.elapsed());
-
-            let value = match result.get(0) {
-                Some(v) => v,
-                None => panic!(
-                    "Unable to extract a value after parsing example: {}",
-                    sample_pipeline.example
-                ),
-            };
-
-            let df = match &value.value {
-                UntaggedValue::DataFrame(df) => df,
-                _ => panic!(
-                    "Unable to extract dataframe from parsed example: {}",
-                    sample_pipeline.example
-                ),
-            };
-
-            let expected = match expected.get(0) {
-                Some(v) => v,
-                None => panic!("Empty vector in result example"),
-            };
-
-            let df_expected = match &expected.value {
-                UntaggedValue::DataFrame(df) => df,
-                _ => panic!("Unable to extract dataframe from example result"),
-            };
-
-            println!("expected: {:?}", df_expected);
-
-            assert_eq!(df, df_expected)
-        }
-    }
-
-    Ok(())
-}
-
-pub fn test_anchors(cmd: Command) -> Result<(), ShellError> {
-    let examples = cmd.examples();
-
-    let base_context = EvaluationContext::basic();
-
-    base_context.add_commands(vec![
-        // Minimal restricted commands to aid in testing
-        whole_stream_command(StubOpen {}),
-        whole_stream_command(DoubleEcho {}),
-        whole_stream_command(DoubleLs {}),
-        whole_stream_command(Append {}),
-        whole_stream_command(BuildString {}),
-        whole_stream_command(First {}),
-        whole_stream_command(Get {}),
-        whole_stream_command(If {}),
-        whole_stream_command(IntoInt {}),
-        whole_stream_command(Keep {}),
-        whole_stream_command(Each {}),
-        whole_stream_command(Last {}),
-        whole_stream_command(Nth {}),
-        whole_stream_command(Let {}),
-        whole_stream_command(Select),
-        whole_stream_command(StrCollect),
-        whole_stream_command(Collect),
-        whole_stream_command(Wrap),
-        cmd,
-    ]);
-
-    for sample_pipeline in examples {
-        let pipeline_with_anchor = format!("stub open --path | {}", sample_pipeline.example);
-
-        let mut ctx = base_context.clone();
-
-        let block = parse_line(&pipeline_with_anchor, &ctx)?;
-
-        if sample_pipeline.result.is_some() {
-            let result = evaluate_block(block, &mut ctx)?;
-
-            ctx.with_errors(|reasons| reasons.iter().cloned().next())
-                .map_or(Ok(()), Err)?;
-
-            for actual in &result {
-                if !is_anchor_carried(actual, mock_path()) {
-                    let failed_call = format!("command: {}\n", pipeline_with_anchor);
-
-                    panic!(
-                        "example command didn't carry anchor tag correctly.\n {} {:#?} {:#?}",
-                        failed_call,
-                        actual,
-                        mock_path()
-                    );
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
-
-/// Parse and run a nushell pipeline
-fn parse_line(line: &str, ctx: &EvaluationContext) -> Result<ClassifiedBlock, ShellError> {
-    //FIXME: do we still need this?
-    let line = if let Some(line) = line.strip_suffix('\n') {
-        line
-    } else {
-        line
-    };
-
-    let (lite_result, err) = nu_parser::lex(line, 0, nu_parser::NewlineMode::Normal);
-    if let Some(err) = err {
-        return Err(err.into());
-    }
-    let (lite_result, err) = nu_parser::parse_block(lite_result);
-    if let Some(err) = err {
-        return Err(err.into());
-    }
-
-    // TODO ensure the command whose examples we're testing is actually in the pipeline
-    let (block, err) = nu_parser::classify_block(&lite_result, &ctx.scope);
-    Ok(ClassifiedBlock { block, failed: err })
-}
-
-fn evaluate_block(
-    block: ClassifiedBlock,
-    ctx: &mut EvaluationContext,
-) -> Result<Vec<Value>, ShellError> {
-    let input_stream = InputStream::empty();
-
-    ctx.scope.enter_scope();
-
-    let result = run_block(&block.block, ctx, input_stream, ExternalRedirection::Stdout);
-
-    ctx.scope.exit_scope();
-
-    let result = result?.drain_vec();
-    Ok(result)
-}
-
-// TODO probably something already available to do this
-// TODO perhaps better panic messages when things don't compare
-
-// Deep value comparisons that ignore tags
-fn values_equal(expected: &Value, actual: &Value) -> bool {
-    use nu_protocol::UntaggedValue::*;
-
-    match (&expected.value, &actual.value) {
-        (Primitive(e), Primitive(a)) => e == a,
-        (Row(e), Row(a)) => {
-            if e.entries.len() != a.entries.len() {
-                return false;
-            }
-
-            e.entries
-                .iter()
-                .zip(&a.entries)
-                .all(|((ek, ev), (ak, av))| ek == ak && values_equal(ev, av))
-        }
-        (Table(e), Table(a)) => e.iter().zip(a).all(|(e, a)| values_equal(e, a)),
-        (e, a) => unimplemented!("{} {}", e.type_name(), a.type_name()),
-    }
-}
-
-fn is_anchor_carried(actual: &Value, anchor: AnchorLocation) -> bool {
-    actual.tag.anchor() == Some(anchor)
-}
diff --git a/old_nushell/crates/nu-command/src/examples/double_echo.rs b/old_nushell/crates/nu-command/src/examples/double_echo.rs
deleted file mode 100644
index e06e3ae27..000000000
--- a/old_nushell/crates/nu-command/src/examples/double_echo.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use nu_errors::ShellError;
-
-use nu_engine::{CommandArgs, WholeStreamCommand};
-use nu_protocol::{Primitive, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_stream::{ActionStream, IntoActionStream};
-
-use serde::Deserialize;
-
-pub struct Command;
-
-#[derive(Deserialize)]
-struct Arguments {
-    #[allow(unused)]
-    pub rest: Vec<Value>,
-}
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "echo"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("echo").rest("rest", SyntaxShape::Any, "the values to echo")
-    }
-
-    fn usage(&self) -> &str {
-        "Mock echo."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let name_tag = args.call_info.name_tag.clone();
-        let rest: Vec<Value> = args.rest(0)?;
-
-        let mut base_value = UntaggedValue::string("Yehuda Katz in Ecuador").into_value(name_tag);
-        let input: Vec<Value> = args.input.collect();
-
-        if let Some(first) = input.get(0) {
-            base_value = first.clone()
-        }
-
-        let stream = rest.into_iter().flat_map(move |i| {
-            let base_value = base_value.clone();
-            match i.as_string() {
-                Ok(s) => ActionStream::one(Ok(ReturnSuccess::Value(Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    tag: base_value.tag,
-                }))),
-                _ => match i {
-                    Value {
-                        value: UntaggedValue::Table(table),
-                        ..
-                    } => {
-                        if table.len() == 1 && table[0].is_table() {
-                            let mut values: Vec<Value> =
-                                table[0].table_entries().cloned().collect();
-
-                            for v in &mut values {
-                                v.tag = base_value.tag();
-                            }
-
-                            let subtable =
-                                vec![UntaggedValue::Table(values).into_value(base_value.tag())];
-
-                            (subtable.into_iter().map(ReturnSuccess::value)).into_action_stream()
-                        } else {
-                            (table
-                                .into_iter()
-                                .map(move |mut v| {
-                                    v.tag = base_value.tag();
-                                    v
-                                })
-                                .map(ReturnSuccess::value))
-                            .into_action_stream()
-                        }
-                    }
-                    _ => ActionStream::one(Ok(ReturnSuccess::Value(Value {
-                        value: i.value.clone(),
-                        tag: base_value.tag,
-                    }))),
-                },
-            }
-        });
-
-        Ok(stream.into_action_stream())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/examples/double_ls.rs b/old_nushell/crates/nu-command/src/examples/double_ls.rs
deleted file mode 100644
index 2628f3dce..000000000
--- a/old_nushell/crates/nu-command/src/examples/double_ls.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::examples::sample::ls::file_listing;
-
-use nu_engine::{CommandArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue, Value};
-use nu_stream::{ActionStream, IntoActionStream};
-
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "ls"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("ls")
-    }
-
-    fn usage(&self) -> &str {
-        "Mock ls."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let name_tag = args.call_info.name_tag.clone();
-
-        let mut base_value =
-            UntaggedValue::string("Andrés N. Robalino in Portland").into_value(name_tag);
-        let input: Vec<Value> = args.input.collect();
-
-        if let Some(first) = input.get(0) {
-            base_value = first.clone()
-        }
-
-        Ok((file_listing()
-            .iter()
-            .map(|row| Value {
-                value: row.value.clone(),
-                tag: base_value.tag.clone(),
-            })
-            .collect::<Vec<_>>()
-            .into_iter()
-            .map(ReturnSuccess::value))
-        .into_action_stream())
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/examples/sample.rs b/old_nushell/crates/nu-command/src/examples/sample.rs
deleted file mode 100644
index d3a592c67..000000000
--- a/old_nushell/crates/nu-command/src/examples/sample.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use nu_protocol::{row, Value};
-use nu_test_support::value::{date, int, string};
-
-pub mod ls {
-    use super::*;
-
-    pub fn file_listing() -> Vec<Value> {
-        vec![
-            row! {
-                   "name".to_string() => string("Andres.txt"),
-                   "type".to_string() =>       string("File"),
-               "chickens".to_string() =>              int(10),
-               "modified".to_string() =>   date("2019-07-23")
-            },
-            row! {
-                   "name".to_string() =>   string("Jonathan"),
-                   "type".to_string() =>        string("Dir"),
-               "chickens".to_string() =>               int(5),
-               "modified".to_string() =>   date("2019-07-23")
-            },
-            row! {
-                   "name".to_string() =>  string("Darren.txt"),
-                   "type".to_string() =>        string("File"),
-               "chickens".to_string() =>               int(20),
-               "modified".to_string() =>    date("2019-09-24")
-            },
-            row! {
-                   "name".to_string() =>      string("Yehuda"),
-                   "type".to_string() =>         string("Dir"),
-               "chickens".to_string() =>                int(4),
-               "modified".to_string() =>    date("2019-09-24")
-            },
-        ]
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/examples/stub_generate.rs b/old_nushell/crates/nu-command/src/examples/stub_generate.rs
deleted file mode 100644
index 4dbe8abb3..000000000
--- a/old_nushell/crates/nu-command/src/examples/stub_generate.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use nu_engine::{CommandArgs, WholeStreamCommand};
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue, Value};
-use nu_source::{AnchorLocation, Tag};
-use nu_stream::ActionStream;
-pub struct Command;
-
-impl WholeStreamCommand for Command {
-    fn name(&self) -> &str {
-        "stub open"
-    }
-
-    fn signature(&self) -> Signature {
-        Signature::build("stub open").switch("path", "Add a mocked path", Some('p'))
-    }
-
-    fn usage(&self) -> &str {
-        "Generates tables and metadata that mimics behavior of real commands in controlled ways."
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let name_tag = args.call_info.name_tag.clone();
-
-        let mocked_path = args.call_info.switch_present("path");
-
-        let out = UntaggedValue::string("Yehuda Katz in Ecuador");
-
-        if mocked_path {
-            Ok(ActionStream::one(Ok(ReturnSuccess::Value(Value {
-                value: out,
-                tag: Tag {
-                    anchor: Some(mock_path()),
-                    span: name_tag.span,
-                },
-            }))))
-        } else {
-            Ok(ActionStream::one(Ok(ReturnSuccess::Value(
-                out.into_value(name_tag),
-            ))))
-        }
-    }
-}
-
-pub fn mock_path() -> AnchorLocation {
-    let path = String::from("path/to/las_best_arepas_in_the_world.txt");
-
-    AnchorLocation::File(path)
-}
diff --git a/old_nushell/crates/nu-command/src/lib.rs b/old_nushell/crates/nu-command/src/lib.rs
deleted file mode 100644
index ecb91f5c2..000000000
--- a/old_nushell/crates/nu-command/src/lib.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-#![recursion_limit = "2048"]
-
-#[cfg(test)]
-#[macro_use]
-extern crate indexmap;
-
-#[macro_use]
-mod prelude;
-mod classified;
-pub mod commands;
-mod default_context;
-pub mod utils;
-
-#[cfg(test)]
-mod examples;
-
-pub use crate::default_context::create_default_context;
-pub use nu_data::config;
-pub use nu_data::dict::TaggedListBuilder;
-pub use nu_data::primitive;
-pub use nu_data::value;
-pub use nu_stream::{ActionStream, InputStream, InterruptibleStream};
-pub use nu_value_ext::ValueExt;
-pub use num_traits::cast::ToPrimitive;
-
-// TODO: Temporary redirect
-pub use nu_protocol::{did_you_mean, TaggedDictBuilder};
diff --git a/old_nushell/crates/nu-command/src/prelude.rs b/old_nushell/crates/nu-command/src/prelude.rs
deleted file mode 100644
index 26dc518bc..000000000
--- a/old_nushell/crates/nu-command/src/prelude.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-#[macro_export]
-macro_rules! return_err {
-    ($expr:expr) => {
-        match $expr {
-            Err(_) => return,
-            Ok(expr) => expr,
-        };
-    };
-}
-
-pub(crate) use bigdecimal::BigDecimal;
-pub(crate) use indexmap::{indexmap, IndexMap};
-pub(crate) use itertools::Itertools;
-pub(crate) use nu_data::config;
-pub(crate) use nu_data::value;
-pub(crate) use nu_engine::EvaluationContext;
-pub(crate) use nu_engine::Example;
-pub(crate) use nu_engine::Host;
-pub(crate) use nu_engine::RunnableContext;
-pub(crate) use nu_engine::{get_full_help, CommandArgs, Scope, WholeStreamCommand};
-pub(crate) use nu_parser::ParserScope;
-pub(crate) use nu_protocol::{out, row};
-pub(crate) use nu_source::{AnchorLocation, PrettyDebug, Span, SpannedItem, Tag, TaggedItem};
-pub(crate) use nu_stream::{ActionStream, InputStream, Interruptible, OutputStream};
-pub(crate) use nu_stream::{IntoActionStream, IntoInputStream, IntoOutputStream};
-pub(crate) use nu_value_ext::ValueExt;
-pub(crate) use num_bigint::BigInt;
-pub(crate) use num_traits::cast::ToPrimitive;
-pub(crate) use serde::Deserialize;
-pub(crate) use std::collections::VecDeque;
-pub(crate) use std::sync::atomic::AtomicBool;
-pub(crate) use std::sync::Arc;
diff --git a/old_nushell/crates/nu-command/src/utils.rs b/old_nushell/crates/nu-command/src/utils.rs
deleted file mode 100644
index ed6dc62fc..000000000
--- a/old_nushell/crates/nu-command/src/utils.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod suggestions;
-pub mod test_bins;
diff --git a/old_nushell/crates/nu-command/src/utils/suggestions.rs b/old_nushell/crates/nu-command/src/utils/suggestions.rs
deleted file mode 100644
index b96ee86ec..000000000
--- a/old_nushell/crates/nu-command/src/utils/suggestions.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::did_you_mean;
-use nu_errors::ShellError;
-use nu_protocol::Value;
-use nu_source::Tagged;
-
-pub fn suggestions(tried: Tagged<&str>, for_value: &Value) -> ShellError {
-    let possibilities = did_you_mean(for_value, tried.to_string());
-
-    match possibilities {
-        Some(p) => ShellError::labeled_error(
-            "Unknown column",
-            format!("did you mean '{}'?", p[0]),
-            tried.tag(),
-        ),
-        None => ShellError::labeled_error(
-            "Unknown column",
-            "row does not contain this column",
-            tried.tag(),
-        ),
-    }
-}
diff --git a/old_nushell/crates/nu-command/src/utils/test_bins.rs b/old_nushell/crates/nu-command/src/utils/test_bins.rs
deleted file mode 100644
index b02f00e09..000000000
--- a/old_nushell/crates/nu-command/src/utils/test_bins.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-use std::io::{self, BufRead, Write};
-
-/// Echo's value of env keys from args
-/// Example: nu --testbin env_echo FOO BAR
-/// If it it's not present echo's nothing
-pub fn echo_env() {
-    let args = args();
-    for arg in args {
-        if let Ok(v) = std::env::var(arg) {
-            println!("{}", v);
-        }
-    }
-}
-
-pub fn cococo() {
-    let args: Vec<String> = args();
-
-    if args.len() > 1 {
-        // Write back out all the arguments passed
-        // if given at least 1 instead of chickens
-        // speaking co co co.
-        println!("{}", &args[1..].join(" "));
-    } else {
-        println!("cococo");
-    }
-}
-
-pub fn meow() {
-    let args: Vec<String> = args();
-
-    for arg in args.iter().skip(1) {
-        let contents = std::fs::read_to_string(arg).expect("Expected a filepath");
-        println!("{}", contents);
-    }
-}
-
-pub fn nonu() {
-    args().iter().skip(1).for_each(|arg| print!("{}", arg));
-}
-
-pub fn repeater() {
-    let mut stdout = io::stdout();
-    let args = args();
-    let mut args = args.iter().skip(1);
-    let letter = args.next().expect("needs a character to iterate");
-    let count = args.next().expect("need the number of times to iterate");
-
-    let count: u64 = count.parse().expect("can't convert count to number");
-
-    for _ in 0..count {
-        let _ = write!(stdout, "{}", letter);
-    }
-    let _ = stdout.flush();
-}
-
-pub fn iecho() {
-    // println! panics if stdout gets closed, whereas writeln gives us an error
-    let mut stdout = io::stdout();
-    let _ = args()
-        .iter()
-        .skip(1)
-        .cycle()
-        .try_for_each(|v| writeln!(stdout, "{}", v));
-}
-
-pub fn fail() {
-    std::process::exit(1);
-}
-
-pub fn chop() {
-    if did_chop_arguments() {
-        // we are done and don't care about standard input.
-        std::process::exit(0);
-    }
-
-    // if no arguments given, chop from standard input and exit.
-    let stdin = io::stdin();
-    let mut stdout = io::stdout();
-
-    for given in stdin.lock().lines().flatten() {
-        let chopped = if given.is_empty() {
-            &given
-        } else {
-            let to = given.len() - 1;
-            &given[..to]
-        };
-
-        if let Err(_e) = writeln!(stdout, "{}", chopped) {
-            break;
-        }
-    }
-
-    std::process::exit(0);
-}
-
-fn did_chop_arguments() -> bool {
-    let args: Vec<String> = args();
-
-    if args.len() > 1 {
-        let mut arguments = args.iter();
-        arguments.next();
-
-        for arg in arguments {
-            let chopped = if arg.is_empty() {
-                &arg
-            } else {
-                let to = arg.len() - 1;
-                &arg[..to]
-            };
-
-            println!("{}", chopped);
-        }
-
-        return true;
-    }
-
-    false
-}
-
-fn args() -> Vec<String> {
-    // skip (--testbin bin_name args)
-    std::env::args().skip(2).collect()
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/all.rs b/old_nushell/crates/nu-command/tests/commands/all.rs
deleted file mode 100644
index 2012ff0de..000000000
--- a/old_nushell/crates/nu-command/tests/commands/all.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn checks_all_rows_are_true() {
-    Playground::setup("all_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo  [ "Andrés", "Andrés", "Andrés" ] 
-                | all? $it == "Andrés"
-                "#
-            )),
-            says().stdout("true")
-        );
-    })
-}
-
-#[test]
-fn checks_all_rows_are_false_with_param() {
-    Playground::setup("all_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                [1, 2, 3, 4] | all? { |a| $a >= 5 }
-                "#
-            )),
-            says().stdout("false")
-        );
-    })
-}
-
-#[test]
-fn checks_all_rows_are_true_with_param() {
-    Playground::setup("all_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                [1, 2, 3, 4] | all? { |a| $a < 5 }
-                "#
-            )),
-            says().stdout("true")
-        );
-    })
-}
-
-#[test]
-fn checks_all_columns_of_a_table_is_true() {
-    Playground::setup("any_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo [
-                        [  first_name, last_name,   rusty_at, likes  ];
-                        [      Andrés,  Robalino, 10/11/2013,   1    ]
-                        [    Jonathan,    Turner, 10/12/2013,   1    ]
-                        [      Darren, Schroeder, 10/11/2013,   1    ]
-                        [      Yehuda,      Katz, 10/11/2013,   1    ]
-                ]
-                | all? likes > 0
-                "#
-            )),
-            says().stdout("true")
-        );
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/any.rs b/old_nushell/crates/nu-command/tests/commands/any.rs
deleted file mode 100644
index 255673f80..000000000
--- a/old_nushell/crates/nu-command/tests/commands/any.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn checks_any_row_is_true() {
-    Playground::setup("any_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo  [ "Ecuador", "USA", "New Zealand" ] 
-                | any? $it == "New Zealand"
-                "#
-            )),
-            says().stdout("true")
-        );
-    })
-}
-
-#[test]
-fn checks_any_column_of_a_table_is_true() {
-    Playground::setup("any_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo [
-                        [  first_name, last_name,   rusty_at, likes  ];
-                        [      Andrés,  Robalino, 10/11/2013,   1    ]
-                        [    Jonathan,    Turner, 10/12/2013,   1    ]
-                        [      Darren, Schroeder, 10/11/2013,   1    ]
-                        [      Yehuda,      Katz, 10/11/2013,   1    ]
-                ]
-                | any? rusty_at == 10/12/2013
-                "#
-            )),
-            says().stdout("true")
-        );
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/append.rs b/old_nushell/crates/nu-command/tests/commands/append.rs
deleted file mode 100644
index 36318264a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/append.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn adds_a_row_to_the_end() {
-    Playground::setup("append_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo  [ "Andrés N. Robalino", "Jonathan Turner", "Yehuda Katz" ] 
-                | append "pollo loco"
-                | nth 3
-                "#
-            )),
-            says().stdout("pollo loco")
-        );
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/cal.rs b/old_nushell/crates/nu-command/tests/commands/cal.rs
deleted file mode 100644
index eafceb900..000000000
--- a/old_nushell/crates/nu-command/tests/commands/cal.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn cal_full_year() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal -y --full-year 2010 | first | to json
-        "#
-    ));
-
-    let first_week_2010_json = r#"{"year":2010,"sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thursday":null,"friday":1,"saturday":2}"#;
-
-    assert_eq!(actual.out, first_week_2010_json);
-}
-
-#[test]
-fn cal_february_2020_leap_year() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal -ym --full-year 2020 --month-names | where month == "february" | to json
-        "#
-    ));
-
-    let cal_february_json = r#"[{"year":2020,"month":"february","sunday":null,"monday":null,"tuesday":null,"wednesday":null,"thursday":null,"friday":null,"saturday":1},{"year":2020,"month":"february","sunday":2,"monday":3,"tuesday":4,"wednesday":5,"thursday":6,"friday":7,"saturday":8},{"year":2020,"month":"february","sunday":9,"monday":10,"tuesday":11,"wednesday":12,"thursday":13,"friday":14,"saturday":15},{"year":2020,"month":"february","sunday":16,"monday":17,"tuesday":18,"wednesday":19,"thursday":20,"friday":21,"saturday":22},{"year":2020,"month":"february","sunday":23,"monday":24,"tuesday":25,"wednesday":26,"thursday":27,"friday":28,"saturday":29}]"#;
-
-    assert_eq!(actual.out, cal_february_json);
-}
-
-#[test]
-fn cal_friday_the_thirteenths_in_2015() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal --full-year 2015 | default friday 0 | where friday == 13 | length
-        "#
-    ));
-
-    assert!(actual.out.contains('3'));
-}
-
-#[test]
-fn cal_rows_in_2020() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal --full-year 2020 | length
-        "#
-    ));
-
-    assert!(actual.out.contains("62"));
-}
-
-#[test]
-fn cal_week_day_start_monday() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal --full-year 2020 -m --month-names --week-start monday | where month == january | to json
-        "#
-    ));
-
-    let cal_january_json = r#"[{"month":"january","monday":null,"tuesday":null,"wednesday":1,"thursday":2,"friday":3,"saturday":4,"sunday":5},{"month":"january","monday":6,"tuesday":7,"wednesday":8,"thursday":9,"friday":10,"saturday":11,"sunday":12},{"month":"january","monday":13,"tuesday":14,"wednesday":15,"thursday":16,"friday":17,"saturday":18,"sunday":19},{"month":"january","monday":20,"tuesday":21,"wednesday":22,"thursday":23,"friday":24,"saturday":25,"sunday":26},{"month":"january","monday":27,"tuesday":28,"wednesday":29,"thursday":30,"friday":31,"saturday":null,"sunday":null}]"#;
-
-    assert_eq!(actual.out, cal_january_json);
-}
-
-#[test]
-fn cal_sees_pipeline_year() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal --full-year 1020 | get monday | first 3 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[3,10,17]");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/cd.rs b/old_nushell/crates/nu-command/tests/commands/cd.rs
deleted file mode 100644
index 229aa23d5..000000000
--- a/old_nushell/crates/nu-command/tests/commands/cd.rs
+++ /dev/null
@@ -1,458 +0,0 @@
-use nu_test_support::fs::{Stub::EmptyFile, Stub::FileWithContent};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-use std::path::PathBuf;
-
-#[test]
-fn filesystem_change_from_current_directory_using_relative_path() {
-    Playground::setup("cd_test_1", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.root(),
-            r#"
-                cd cd_test_1
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), *dirs.test());
-    })
-}
-
-#[test]
-fn filesystem_change_from_current_directory_using_absolute_path() {
-    Playground::setup("cd_test_2", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd "{}"
-                echo (pwd)
-            "#,
-            dirs.formats()
-        );
-
-        assert_eq!(PathBuf::from(actual.out), dirs.formats());
-    })
-}
-
-#[test]
-fn filesystem_switch_back_to_previous_working_directory() {
-    Playground::setup("cd_test_3", |dirs, sandbox| {
-        sandbox.mkdir("odin");
-
-        let actual = nu!(
-            cwd: dirs.test().join("odin"),
-            r#"
-                cd {}
-                cd -
-                echo (pwd)
-            "#,
-            dirs.test()
-        );
-
-        assert_eq!(PathBuf::from(actual.out), dirs.test().join("odin"));
-    })
-}
-
-#[test]
-fn filesytem_change_from_current_directory_using_relative_path_and_dash() {
-    Playground::setup("cd_test_4", |dirs, sandbox| {
-        sandbox.within("odin").mkdir("-");
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd odin/-
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(
-            PathBuf::from(actual.out),
-            dirs.test().join("odin").join("-")
-        );
-    })
-}
-
-#[test]
-fn filesystem_change_current_directory_to_parent_directory() {
-    Playground::setup("cd_test_5", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd ..
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), *dirs.root());
-    })
-}
-
-#[test]
-fn filesystem_change_current_directory_to_two_parents_up_using_multiple_dots() {
-    Playground::setup("cd_test_6", |dirs, sandbox| {
-        sandbox.within("foo").mkdir("bar");
-
-        let actual = nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                cd ...
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), *dirs.test());
-    })
-}
-
-#[test]
-fn filesystem_change_current_directory_to_parent_directory_after_delete_cwd() {
-    Playground::setup("cd_test_7", |dirs, sandbox| {
-        sandbox.within("foo").mkdir("bar");
-
-        let actual = nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                rm {}/foo/bar
-                echo ","
-                cd ..
-                echo (pwd)
-            "#,
-            dirs.test()
-        );
-
-        let actual = actual.out.split(',').nth(1).unwrap();
-
-        assert_eq!(PathBuf::from(actual), *dirs.test().join("foo"));
-    })
-}
-
-#[test]
-fn filesystem_change_to_home_directory() {
-    Playground::setup("cd_test_8", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd ~
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(Some(PathBuf::from(actual.out)), dirs_next::home_dir());
-    })
-}
-
-#[test]
-fn filesystem_change_to_a_directory_containing_spaces() {
-    Playground::setup("cd_test_9", |dirs, sandbox| {
-        sandbox.mkdir("robalino turner katz");
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd "robalino turner katz"
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(
-            PathBuf::from(actual.out),
-            dirs.test().join("robalino turner katz")
-        );
-    })
-}
-
-#[test]
-fn filesystem_not_a_directory() {
-    Playground::setup("cd_test_10", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("ferris_did_it.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "cd ferris_did_it.txt"
-        );
-
-        assert!(
-            actual.err.contains("ferris_did_it.txt"),
-            "actual={:?}",
-            actual.err
-        );
-        assert!(
-            actual.err.contains("is not a directory"),
-            "actual={:?}",
-            actual.err
-        );
-    })
-}
-
-#[test]
-fn filesystem_directory_not_found() {
-    Playground::setup("cd_test_11", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "cd dir_that_does_not_exist"
-
-        );
-
-        assert!(
-            actual.err.contains("dir_that_does_not_exist"),
-            "actual={:?}",
-            actual.err
-        );
-        assert!(
-            actual.err.contains("directory not found"),
-            "actual={:?}",
-            actual.err
-        );
-    })
-}
-
-#[test]
-fn filesystem_change_directory_to_symlink_relative() {
-    Playground::setup("cd_test_12", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("boo");
-        sandbox.symlink("foo", "foo_link");
-
-        let actual = nu!(
-            cwd: dirs.test().join("boo"),
-            r#"
-                cd ../foo_link
-                echo (pwd)
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), dirs.test().join("foo"));
-    })
-}
-
-#[test]
-fn valuesystem_change_from_current_path_using_relative_path() {
-    Playground::setup("cd_test_13", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [[bin]]
-                    path = "src/plugins/turner.rs"
-
-                    [[bin]]
-                    path = "src/plugins/robalino.rs"
-
-                    [[bin]]
-                    path = "src/plugins/katz.rs"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd bin
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), PathBuf::from("/bin"));
-    })
-}
-
-#[test]
-fn valuesystem_change_from_current_path_using_absolute_path() {
-    Playground::setup("cd_test_14", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependencies]
-                    turner-ts = "0.1.1"
-                    robalino-tkd = "0.0.1"
-                    katz-ember = "0.2.3"
-
-                    [[bin]]
-                    path = "src/plugins/arepa.rs"
-
-                    [[bin]]
-                    path = "src/plugins/bbq.rs"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd bin
-                cd /dependencies
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), PathBuf::from("/dependencies"));
-    })
-}
-
-#[test]
-fn valuesystem_switch_back_to_previous_working_path() {
-    Playground::setup("cd_test_15", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependencies]
-                    turner-ts = "0.1.1"
-                    robalino-tkd = "0.0.1"
-                    katz-ember = "0.2.3"
-                    odin-gf = "0.2.1"
-
-                    [[bin]]
-                    path = "src/plugins/arepa.rs"
-
-                    [[bin]]
-                    path = "src/plugins/bbq.rs"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd dependencies
-                cd /bin
-                cd -
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), PathBuf::from("/dependencies"));
-    })
-}
-
-#[test]
-fn valuesystem_change_from_current_path_using_relative_path_and_dash() {
-    Playground::setup("cd_test_16", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![FileWithContent(
-                "sample.toml",
-                r#"
-                    [package]
-                    - = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"]
-
-                    [[bin]]
-                    path = "src/plugins/arepa.rs"
-
-                    [[bin]]
-                    path = "src/plugins/bbq.rs"
-                "#
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd package/-
-                cd /bin
-                cd -
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), PathBuf::from("/package/-"));
-    })
-}
-
-#[test]
-fn valuesystem_change_current_path_to_parent_path() {
-    Playground::setup("cd_test_17", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![FileWithContent(
-                "sample.toml",
-                r#"
-                    [package]
-                    emberenios = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"]
-                "#
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd package/emberenios
-                cd ..
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(PathBuf::from(actual.out), PathBuf::from("/package"));
-    })
-}
-
-#[test]
-fn valuesystem_change_to_a_path_containing_spaces() {
-    Playground::setup("cd_test_18", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    ["pa que te"]
-                    el = "pollo loco"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                enter sample.toml
-                cd "pa que te"
-                pwd
-                exit
-            "#
-        );
-
-        assert_eq!(
-            PathBuf::from(actual.out),
-            PathBuf::from("/").join("pa que te")
-        );
-    })
-}
-
-#[test]
-fn valuesystem_path_not_found() {
-    Playground::setup("cd_test_19", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.formats(),
-            r#"
-            enter cargo_sample.toml
-            cd im_a_path_that_does_not_exist
-            exit
-        "#
-        );
-
-        assert!(actual.err.contains("Can not change to path inside"));
-        assert!(actual.err.contains("No such path exists"));
-    })
-}
-
-#[cfg(target_os = "windows")]
-#[test]
-fn test_change_windows_drive() {
-    Playground::setup("cd_test_20", |dirs, sandbox| {
-        sandbox.mkdir("test_folder");
-
-        let _actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                subst Z: test_folder
-                Z:
-                echo "some text" | save test_file.txt
-                cd ~
-                subst Z: /d
-            "#
-        );
-        assert!(dirs
-            .test()
-            .join("test_folder")
-            .join("test_file.txt")
-            .exists());
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/compact.rs b/old_nushell/crates/nu-command/tests/commands/compact.rs
deleted file mode 100644
index 21b4db674..000000000
--- a/old_nushell/crates/nu-command/tests/commands/compact.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn discards_rows_where_given_column_is_empty() {
-    Playground::setup("compact_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_amigos.json",
-            r#"
-                {
-                    "amigos": [
-                        {"name":   "Yehuda", "rusty_luck": 1},
-                        {"name": "Jonathan", "rusty_luck": 1},
-                        {"name":   "Andres", "rusty_luck": 1},
-                        {"name":"GorbyPuff"}
-                    ]
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_amigos.json
-                | get amigos
-                | compact rusty_luck
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    });
-}
-#[test]
-fn discards_empty_rows_by_default() {
-    Playground::setup("compact_test_2", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo "[1,2,3,14,null]"
-                | from json
-                | compact
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/config.rs b/old_nushell/crates/nu-command/tests/commands/config.rs
deleted file mode 100644
index abce38a7a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/config.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use nu_test_support::fs::AbsolutePath;
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn clearing_config_clears_config() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config clear | ignore; config get skip_welcome_message"),
-            says().stdout("")
-        );
-        let config_contents = std::fs::read_to_string(file).expect("Could not read file");
-        assert!(config_contents.is_empty());
-    });
-}
-
-#[test]
-fn config_get_returns_value() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            //Clears config
-            nu.pipeline("config get skip_welcome_message"),
-            says().stdout("true")
-        );
-    });
-}
-
-#[test]
-fn config_set_sets_value() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            //Clears config
-            nu.pipeline("config set key value | ignore; config get key"),
-            says().stdout("value")
-        );
-        let config_contents = std::fs::read_to_string(file).expect("Could not read file");
-        assert!(config_contents.contains("key = \"value\""));
-    });
-}
-
-#[test]
-fn config_set_into_sets_value() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            //Clears config
-            nu.pipeline("echo value | config set_into key | ignore; config get key"),
-            says().stdout("value")
-        );
-        let config_contents = std::fs::read_to_string(file).expect("Could not read file");
-        assert!(config_contents.contains("key = \"value\""));
-    });
-}
-
-#[test]
-fn config_rm_removes_value() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                key = "value"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config remove key | ignore; config get key"),
-            says().stdout("")
-        );
-        let config_contents = std::fs::read_to_string(file).expect("Could not read file");
-        assert!(!config_contents.contains("key = \"value\""));
-    });
-}
-
-#[test]
-fn config_path_returns_correct_path() {
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config path"),
-            says().stdout(&file.inner.to_string_lossy().to_string())
-        );
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/cp.rs b/old_nushell/crates/nu-command/tests/commands/cp.rs
deleted file mode 100644
index 9fe1272b7..000000000
--- a/old_nushell/crates/nu-command/tests/commands/cp.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-use nu_test_support::fs::{files_exist_at, AbsoluteFile, Stub::EmptyFile};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-use std::path::Path;
-
-#[test]
-fn copies_a_file() {
-    Playground::setup("cp_test_1", |dirs, _| {
-        nu!(
-            cwd: dirs.root(),
-            "cp \"{}\" cp_test_1/sample.ini",
-            dirs.formats().join("sample.ini")
-        );
-
-        assert!(dirs.test().join("sample.ini").exists());
-    });
-}
-
-#[test]
-fn copies_the_file_inside_directory_if_path_to_copy_is_directory() {
-    Playground::setup("cp_test_2", |dirs, _| {
-        let expected_file = AbsoluteFile::new(dirs.test().join("sample.ini"));
-
-        nu!(
-            cwd: dirs.formats(),
-            "cp ../formats/sample.ini {}",
-            expected_file.dir()
-        );
-
-        assert!(dirs.test().join("sample.ini").exists());
-    })
-}
-
-#[test]
-fn error_if_attempting_to_copy_a_directory_to_another_directory() {
-    Playground::setup("cp_test_3", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.formats(),
-            "cp ../formats {}", dirs.test()
-        );
-
-        assert!(actual.err.contains("../formats"));
-        assert!(actual.err.contains("resolves to a directory (not copied)"));
-    });
-}
-
-#[test]
-fn copies_the_directory_inside_directory_if_path_to_copy_is_directory_and_with_recursive_flag() {
-    Playground::setup("cp_test_4", |dirs, sandbox| {
-        sandbox
-            .within("originals")
-            .with_files(vec![
-                EmptyFile("yehuda.txt"),
-                EmptyFile("jonathan.txt"),
-                EmptyFile("andres.txt"),
-            ])
-            .mkdir("expected");
-
-        let expected_dir = dirs.test().join("expected").join("originals");
-
-        nu!(
-            cwd: dirs.test(),
-            "cp originals expected -r"
-        );
-
-        assert!(expected_dir.exists());
-        assert!(files_exist_at(
-            vec![
-                Path::new("yehuda.txt"),
-                Path::new("jonathan.txt"),
-                Path::new("andres.txt")
-            ],
-            expected_dir
-        ));
-    })
-}
-
-#[test]
-fn deep_copies_with_recursive_flag() {
-    Playground::setup("cp_test_5", |dirs, sandbox| {
-        sandbox
-            .within("originals")
-            .with_files(vec![EmptyFile("manifest.txt")])
-            .within("originals/contributors")
-            .with_files(vec![
-                EmptyFile("yehuda.txt"),
-                EmptyFile("jonathan.txt"),
-                EmptyFile("andres.txt"),
-            ])
-            .within("originals/contributors/jonathan")
-            .with_files(vec![EmptyFile("errors.txt"), EmptyFile("multishells.txt")])
-            .within("originals/contributors/andres")
-            .with_files(vec![EmptyFile("coverage.txt"), EmptyFile("commands.txt")])
-            .within("originals/contributors/yehuda")
-            .with_files(vec![EmptyFile("defer-evaluation.txt")])
-            .mkdir("expected");
-
-        let expected_dir = dirs.test().join("expected").join("originals");
-
-        let jonathans_expected_copied_dir = expected_dir.join("contributors").join("jonathan");
-        let andres_expected_copied_dir = expected_dir.join("contributors").join("andres");
-        let yehudas_expected_copied_dir = expected_dir.join("contributors").join("yehuda");
-
-        nu!(
-            cwd: dirs.test(),
-            "cp originals expected --recursive"
-        );
-
-        assert!(expected_dir.exists());
-        assert!(files_exist_at(
-            vec![Path::new("errors.txt"), Path::new("multishells.txt")],
-            jonathans_expected_copied_dir
-        ));
-        assert!(files_exist_at(
-            vec![Path::new("coverage.txt"), Path::new("commands.txt")],
-            andres_expected_copied_dir
-        ));
-        assert!(files_exist_at(
-            vec![Path::new("defer-evaluation.txt")],
-            yehudas_expected_copied_dir
-        ));
-    })
-}
-
-#[test]
-fn copies_using_path_with_wildcard() {
-    Playground::setup("cp_test_6", |dirs, _| {
-        nu!(
-            cwd: dirs.formats(),
-            "cp ../formats/* {}", dirs.test()
-        );
-
-        assert!(files_exist_at(
-            vec![
-                Path::new("caco3_plastics.csv"),
-                Path::new("cargo_sample.toml"),
-                Path::new("jonathan.xml"),
-                Path::new("sample.ini"),
-                Path::new("sgml_description.json"),
-                Path::new("utf16.ini"),
-            ],
-            dirs.test()
-        ));
-    })
-}
-
-#[test]
-fn copies_using_a_glob() {
-    Playground::setup("cp_test_7", |dirs, _| {
-        nu!(
-            cwd: dirs.formats(),
-            "cp * {}", dirs.test()
-        );
-
-        assert!(files_exist_at(
-            vec![
-                Path::new("caco3_plastics.csv"),
-                Path::new("cargo_sample.toml"),
-                Path::new("jonathan.xml"),
-                Path::new("sample.ini"),
-                Path::new("sgml_description.json"),
-                Path::new("utf16.ini"),
-            ],
-            dirs.test()
-        ));
-    });
-}
-
-#[test]
-fn copies_same_file_twice() {
-    Playground::setup("cp_test_8", |dirs, _| {
-        nu!(
-            cwd: dirs.root(),
-            "cp \"{}\" cp_test_8/sample.ini",
-            dirs.formats().join("sample.ini")
-        );
-
-        nu!(
-            cwd: dirs.root(),
-            "cp \"{}\" cp_test_8/sample.ini",
-            dirs.formats().join("sample.ini")
-        );
-
-        assert!(dirs.test().join("sample.ini").exists());
-    });
-}
-
-#[test]
-fn copy_files_using_glob_two_parents_up_using_multiple_dots() {
-    Playground::setup("cp_test_9", |dirs, sandbox| {
-        sandbox.within("foo").within("bar").with_files(vec![
-            EmptyFile("jonathan.json"),
-            EmptyFile("andres.xml"),
-            EmptyFile("yehuda.yaml"),
-            EmptyFile("kevin.txt"),
-            EmptyFile("many_more.ppl"),
-        ]);
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                cp * ...
-            "#
-        );
-
-        assert!(files_exist_at(
-            vec![
-                "yehuda.yaml",
-                "jonathan.json",
-                "andres.xml",
-                "kevin.txt",
-                "many_more.ppl",
-            ],
-            dirs.test()
-        ));
-    })
-}
-
-#[test]
-fn copy_file_and_dir_from_two_parents_up_using_multiple_dots_to_current_dir_recursive() {
-    Playground::setup("cp_test_10", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("hello_there")]);
-        sandbox.mkdir("hello_again");
-        sandbox.within("foo").mkdir("bar");
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                cp -r .../hello* .
-            "#
-        );
-
-        let expected = dirs.test().join("foo/bar");
-
-        assert!(files_exist_at(vec!["hello_there", "hello_again"], expected));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/def.rs b/old_nushell/crates/nu-command/tests/commands/def.rs
deleted file mode 100644
index e0f218b1e..000000000
--- a/old_nushell/crates/nu-command/tests/commands/def.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-use std::fs;
-#[test]
-fn def_with_comment() {
-    Playground::setup("def_with_comment", |dirs, _| {
-        let data = r#"
-#My echo
-def e [arg] {echo $arg}
-            "#;
-        fs::write(dirs.root().join("def_test"), data).expect("Unable to write file");
-        let actual = nu!(
-            cwd: dirs.root(),
-            "source def_test; help e | to json"
-        );
-
-        assert!(actual.out.contains("My echo\\n\\n"));
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/default.rs b/old_nushell/crates/nu-command/tests/commands/default.rs
deleted file mode 100644
index 334b45ee6..000000000
--- a/old_nushell/crates/nu-command/tests/commands/default.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn adds_row_data_if_column_missing() {
-    Playground::setup("default_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_amigos.json",
-            r#"
-                {
-                    "amigos": [
-                        {"name":   "Yehuda"},
-                        {"name": "Jonathan", "rusty_luck": 0},
-                        {"name":   "Andres", "rusty_luck": 0},
-                        {"name":"GorbyPuff"}
-                    ]
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_amigos.json
-                | get amigos
-                | default rusty_luck 1
-                | where rusty_luck == 1
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/drop.rs b/old_nushell/crates/nu-command/tests/commands/drop.rs
deleted file mode 100644
index e723ba769..000000000
--- a/old_nushell/crates/nu-command/tests/commands/drop.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn columns() {
-    let actual = nu!(
-        cwd: ".", pipeline(r#"
-            echo [
-              [arepas, color];
-
-              [3,  white]
-              [8, yellow]
-              [4,  white]
-            ]
-            | drop column
-            | get
-            | length
-        "#)
-    );
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn more_columns_than_table_has() {
-    let actual = nu!(
-        cwd: ".", pipeline(r#"
-            echo [
-              [arepas, color];
-
-              [3,  white]
-              [8, yellow]
-              [4,  white]
-            ]
-            | drop column 3
-            | get
-            | empty?
-        "#)
-    );
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn rows() {
-    let actual = nu!(
-        cwd: ".", pipeline(r#"
-            echo [
-              [arepas];
-
-              [3]
-              [8]
-              [4]
-            ]
-            | drop 2
-            | get arepas
-            | math sum
-        "#)
-    );
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn more_rows_than_table_has() {
-    let actual = nu!(cwd: ".", "date | drop 50 | length");
-
-    assert_eq!(actual.out, "0");
-}
-
-#[test]
-fn nth_range_inclusive() {
-    let actual = nu!(cwd: ".", "echo 10..15 | drop nth (2..3) | to json");
-
-    assert_eq!(actual.out, "[10,11,14,15]");
-}
-
-#[test]
-fn nth_range_exclusive() {
-    let actual = nu!(cwd: ".", "echo 10..15 | drop nth (1..<3) | to json");
-
-    assert_eq!(actual.out, "[10,13,14,15]");
-}
-
-#[test]
-fn nth_missing_first_argument() {
-    let actual = nu!(cwd: ".", "echo 10..15 | drop nth \"\"");
-
-    assert!(actual.err.contains("Expected int or range"));
-    assert!(actual.err.contains("found string"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/each.rs b/old_nushell/crates/nu-command/tests/commands/each.rs
deleted file mode 100644
index c4d7edb02..000000000
--- a/old_nushell/crates/nu-command/tests/commands/each.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn each_works_separately() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [1 2 3] | each { echo $it 10 | math sum } | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[11,12,13]");
-}
-
-#[test]
-fn each_group_works() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [1 2 3 4 5 6] | each group 3 { $it } | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[[1,2,3],[4,5,6]]");
-}
-
-#[test]
-fn each_window() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [1 2 3 4] | each window 3 { $it } | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[[1,2,3],[2,3,4]]");
-}
-
-#[test]
-fn each_window_stride() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [1 2 3 4 5 6] | each window 3 -s 2 { echo $it } | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[[1,2,3],[3,4,5]]");
-}
-
-#[test]
-fn each_no_args_in_block() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [[foo bar]; [a b] [c d] [e f]] | each { to json } | nth 1 | str collect
-        "#
-    ));
-
-    assert_eq!(actual.out, r#"{"foo":"c","bar":"d"}"#);
-}
-
-#[test]
-fn each_implicit_it_in_block() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [[foo bar]; [a b] [c d] [e f]] | each { nu --testbin cococo $it.foo }
-        "#
-    ));
-
-    assert_eq!(actual.out, "ace");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/echo.rs b/old_nushell/crates/nu-command/tests/commands/echo.rs
deleted file mode 100644
index e23609f9a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/echo.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn echo_range_is_lazy() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo 1..10000000000 | first 3 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1,2,3]");
-}
-
-#[test]
-fn echo_range_handles_inclusive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo 1..3 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1,2,3]");
-}
-
-#[test]
-fn echo_range_handles_exclusive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo 1..<3 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[1,2]");
-}
-
-#[test]
-fn echo_range_handles_inclusive_down() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo 3..1 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[3,2,1]");
-}
-
-#[test]
-fn echo_range_handles_exclusive_down() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo 3..<1 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[3,2]");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/empty.rs b/old_nushell/crates/nu-command/tests/commands/empty.rs
deleted file mode 100644
index f5ec14cf8..000000000
--- a/old_nushell/crates/nu-command/tests/commands/empty.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn reports_emptiness() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[are_empty];
-                     [([[check]; [[]]      ])]
-                     [([[check]; [""]      ])]
-                     [([[check]; [(wrap)] ])]
-            ]
-            | get are_empty
-            | empty? check
-            | where check
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn sets_block_run_value_for_an_empty_column() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [
-                     [  first_name, last_name,   rusty_at, likes  ];
-                     [      Andrés,  Robalino, 10/11/2013,   1    ]
-                     [    Jonathan,    Turner, 10/12/2013,   1    ]
-                     [       Jason,     Gedge, 10/11/2013,   1    ]
-                     [      Yehuda,      Katz, 10/11/2013,  ''    ]
-            ]
-            | empty? likes -b { 1 }
-            | get likes
-            | math sum
-        "#
-    ));
-
-    assert_eq!(actual.out, "4");
-}
-
-#[test]
-fn sets_block_run_value_for_many_empty_columns() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [
-                     [  boost   check   ];
-                     [     1,    []     ]
-                     [     1,    ""     ]
-                     [     1,  (wrap)  ]
-            ]
-            | empty? boost check -b { 1 }
-            | get boost check
-            | math sum
-        "#
-    ));
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn passing_a_block_will_set_contents_on_empty_cells_and_leave_non_empty_ones_untouched() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [
-                     [      NAME, LVL,   HP ];
-                     [    Andrés,  30, 3000 ]
-                     [  Alistair,  29, 2900 ]
-                     [    Arepas,  "",   "" ]
-                     [     Jorge,  30, 3000 ]
-            ]
-            | empty? LVL -b { 9 }
-            | empty? HP -b {
-                $it.LVL * 1000
-              }
-            | math sum
-            | get HP
-        "#
-    ));
-
-    assert_eq!(actual.out, "17900");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/enter.rs b/old_nushell/crates/nu-command/tests/commands/enter.rs
deleted file mode 100644
index d7377eade..000000000
--- a/old_nushell/crates/nu-command/tests/commands/enter.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use nu_test_support::fs::{files_exist_at, Stub::EmptyFile};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-use std::path::Path;
-
-#[test]
-fn knows_the_filesystems_entered() {
-    Playground::setup("enter_test_1", |dirs, sandbox| {
-        sandbox
-            .within("red_pill")
-            .with_files(vec![
-                EmptyFile("andres.nu"),
-                EmptyFile("jonathan.nu"),
-                EmptyFile("yehuda.nu"),
-            ])
-            .within("blue_pill")
-            .with_files(vec![
-                EmptyFile("bash.nxt"),
-                EmptyFile("korn.nxt"),
-                EmptyFile("powedsh.nxt"),
-            ])
-            .mkdir("expected");
-
-        let red_pill_dir = dirs.test().join("red_pill");
-        let blue_pill_dir = dirs.test().join("blue_pill");
-        let expected = dirs.test().join("expected");
-        let expected_recycled = expected.join("recycled");
-
-        nu!(
-            cwd: dirs.test(),
-            r#"
-                enter expected
-                mkdir recycled
-                enter ../red_pill
-                mv jonathan.nu ../expected
-                enter ../blue_pill
-                cp *.nxt ../expected/recycled
-                p
-                p
-                mv ../red_pill/yehuda.nu .
-                n
-                mv andres.nu ../expected/andres.nu
-                exit
-                cd ..
-                rm red_pill --recursive
-                exit
-                n
-                rm blue_pill --recursive
-                exit
-            "#
-        );
-
-        assert!(!red_pill_dir.exists());
-        assert!(files_exist_at(
-            vec![
-                Path::new("andres.nu"),
-                Path::new("jonathan.nu"),
-                Path::new("yehuda.nu"),
-            ],
-            expected
-        ));
-
-        assert!(!blue_pill_dir.exists());
-        assert!(files_exist_at(
-            vec![
-                Path::new("bash.nxt"),
-                Path::new("korn.nxt"),
-                Path::new("powedsh.nxt"),
-            ],
-            expected_recycled
-        ));
-    })
-}
-
-#[test]
-fn errors_if_file_not_found() {
-    Playground::setup("enter_test_2", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "enter i_dont_exist.csv"
-        );
-
-        assert!(actual.err.contains("Cannot find file"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/every.rs b/old_nushell/crates/nu-command/tests/commands/every.rs
deleted file mode 100644
index f48b2bf2a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/every.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn gets_all_rows_by_every_zero() {
-    Playground::setup("every_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 0
-                | to json
-            "#
-        ));
-
-        assert_eq!(
-            actual.out,
-            r#"["amigos.txt","arepas.clu","los.txt","tres.txt"]"#
-        );
-    })
-}
-
-#[test]
-fn gets_no_rows_by_every_skip_zero() {
-    Playground::setup("every_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 0 --skip
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, "");
-    })
-}
-
-#[test]
-fn gets_all_rows_by_every_one() {
-    Playground::setup("every_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 1
-                | to json
-            "#
-        ));
-
-        assert_eq!(
-            actual.out,
-            r#"["amigos.txt","arepas.clu","los.txt","tres.txt"]"#
-        );
-    })
-}
-
-#[test]
-fn gets_no_rows_by_every_skip_one() {
-    Playground::setup("every_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 1 --skip
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, "");
-    })
-}
-
-#[test]
-fn gets_first_row_by_every_too_much() {
-    Playground::setup("every_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 999
-            "#
-        ));
-
-        let expected = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo [ amigos.txt ]
-            "#
-        ));
-
-        assert_eq!(actual.out, expected.out);
-    })
-}
-
-#[test]
-fn gets_all_rows_except_first_by_every_skip_too_much() {
-    Playground::setup("every_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 999 --skip
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, r#"["arepas.clu","los.txt","tres.txt"]"#);
-    })
-}
-
-#[test]
-fn gets_every_third_row() {
-    Playground::setup("every_test_7", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("quatro.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 3
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, r#"["amigos.txt","quatro.txt"]"#);
-    })
-}
-
-#[test]
-fn skips_every_third_row() {
-    Playground::setup("every_test_8", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("quatro.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | every 3 --skip
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, r#"["arepas.clu","los.txt","tres.txt"]"#);
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/find.rs b/old_nushell/crates/nu-command/tests/commands/find.rs
deleted file mode 100644
index 0c8b04fe4..000000000
--- a/old_nushell/crates/nu-command/tests/commands/find.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn find_with_list_search_with_string() {
-    let actual = nu!(
-    cwd: ".", pipeline(
-    r#"
-        [moe larry curly] | find moe
-    "#
-    ));
-
-    assert_eq!(actual.out, "moe");
-}
-
-#[test]
-fn find_with_list_search_with_char() {
-    let actual = nu!(
-    cwd: ".", pipeline(
-    r#"
-        [moe larry curly] | find l | to json
-    "#
-    ));
-
-    assert_eq!(actual.out, r#"["larry","curly"]"#);
-}
-
-#[test]
-fn find_with_list_search_with_number() {
-    let actual = nu!(
-    cwd: ".", pipeline(
-    r#"
-        [1 2 3 4 5] | find 3
-    "#
-    ));
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn find_with_string_search_with_string() {
-    let actual = nu!(
-    cwd: ".", pipeline(
-    r#"
-        echo Cargo.toml | find toml
-    "#
-    ));
-
-    assert_eq!(actual.out, "Cargo.toml");
-}
-
-#[test]
-fn find_with_string_search_with_string_not_found() {
-    let actual = nu!(
-    cwd: ".", pipeline(
-    r#"
-        [moe larry curly] | find shemp
-    "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn find_with_filepath_search_with_string() {
-    Playground::setup("filepath_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | find arep
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, r#""arepas.clu""#);
-    })
-}
-
-#[test]
-fn find_with_filepath_search_with_multiple_patterns() {
-    Playground::setup("filepath_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | find arep ami
-                | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, r#"["amigos.txt","arepas.clu"]"#);
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/first.rs b/old_nushell/crates/nu-command/tests/commands/first.rs
deleted file mode 100644
index 686fc6565..000000000
--- a/old_nushell/crates/nu-command/tests/commands/first.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn gets_first_rows_by_amount() {
-    Playground::setup("first_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | first 3
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn gets_all_rows_if_amount_higher_than_all_rows() {
-    Playground::setup("first_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | first 99
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn gets_first_row_when_no_amount_given() {
-    Playground::setup("first_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | first
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "1");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/flatten.rs b/old_nushell/crates/nu-command/tests/commands/flatten.rs
deleted file mode 100644
index 2e36a4e70..000000000
--- a/old_nushell/crates/nu-command/tests/commands/flatten.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn flatten_nested_tables_with_columns() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[origin, people]; [Ecuador, ('Andres' | wrap name)]]
-                 [[origin, people]; [Nu, ('nuno' | wrap name)]]
-            | flatten
-            | get name
-            | str collect ','
-        "#
-    ));
-
-    assert_eq!(actual.out, "Andres,nuno");
-}
-
-#[test]
-fn flatten_nested_tables_that_have_many_columns() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[origin, people]; [Ecuador, (echo [[name, meal]; ['Andres', 'arepa']])]]
-                 [[origin, people]; [USA, (echo [[name, meal]; ['Katz', 'nurepa']])]] 
-            | flatten
-            | get meal
-            | str collect ','
-        "#
-    ));
-
-    assert_eq!(actual.out, "arepa,nurepa");
-}
-
-#[test]
-fn flatten_nested_tables() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[Andrés, Nicolás, Robalino]] | flatten | nth 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "Nicolás");
-}
-
-#[test]
-fn flatten_row_column_explicitly() {
-    Playground::setup("flatten_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.json",
-            r#"
-                [
-                    {
-                        "people": {
-                            "name": "Andres",
-                            "meal": "arepa"
-                        }
-                    },
-                    {
-                        "people": {
-                            "name": "Katz",
-                            "meal": "nurepa"
-                        }
-                    }
-                ]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open katz.json | flatten people | where name == Andres | length"
-        );
-
-        assert_eq!(actual.out, "1");
-    })
-}
-
-#[test]
-fn flatten_row_columns_having_same_column_names_flats_separately() {
-    Playground::setup("flatten_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.json",
-            r#"
-                [
-                    {
-                        "people": {
-                            "name": "Andres",
-                            "meal": "arepa"
-                        },
-                        "city": [{"name": "Guayaquil"}, {"name": "Samborondón"}]
-                    },
-                    {
-                        "people": {
-                            "name": "Katz",
-                            "meal": "nurepa"
-                        },
-                        "city": [{"name": "Oregon"}, {"name": "Brooklin"}]
-                    }
-                ]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open katz.json | flatten | flatten people city | get city_name | length"
-        );
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn flatten_table_columns_explicitly() {
-    Playground::setup("flatten_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.json",
-            r#"
-                [
-                    {
-                        "people": {
-                            "name": "Andres",
-                            "meal": "arepa"
-                        },
-                        "city": ["Guayaquil", "Samborondón"]
-                    },
-                    {
-                        "people": {
-                            "name": "Katz",
-                            "meal": "nurepa"
-                        },
-                        "city": ["Oregon", "Brooklin"]
-                    }
-                ]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open katz.json | flatten city | where people.name == Katz | length"
-        );
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn flatten_more_than_one_column_that_are_subtables_not_supported() {
-    Playground::setup("flatten_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.json",
-            r#"
-                [
-                    {
-                        "people": {
-                            "name": "Andres",
-                            "meal": "arepa"
-                        }
-                        "tags": ["carbohydrate", "corn", "maiz"],
-                        "city": ["Guayaquil", "Samborondón"]
-                    },
-                    {
-                        "people": {
-                            "name": "Katz",
-                            "meal": "nurepa"
-                        },
-                        "tags": ["carbohydrate", "shell food", "amigos flavor"],
-                        "city": ["Oregon", "Brooklin"]
-                    }
-                ]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open katz.json | flatten tags city"
-        );
-
-        assert!(actual.err.contains("tried flattening"));
-        assert!(actual.err.contains("but is flattened already"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/format.rs b/old_nushell/crates/nu-command/tests/commands/format.rs
deleted file mode 100644
index d3b585ecf..000000000
--- a/old_nushell/crates/nu-command/tests/commands/format.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use nu_test_support::fs::Stub::{EmptyFile, FileWithContentToBeTrimmed};
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn creates_the_resulting_string_from_the_given_fields() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        open cargo_sample.toml
-            | get package
-            | format "{name} has license {license}"
-        "#
-    ));
-
-    assert_eq!(actual.out, "nu has license ISC");
-}
-
-#[test]
-fn given_fields_can_be_column_paths() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        open cargo_sample.toml
-            | format "{package.name} is {package.description}"
-        "#
-    ));
-
-    assert_eq!(actual.out, "nu is a new type of shell");
-}
-
-#[test]
-fn can_use_variables() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        open cargo_sample.toml
-            | format "{$it.package.name} is {$it.package.description}"
-        "#
-    ));
-
-    assert_eq!(actual.out, "nu is a new type of shell");
-}
-
-#[test]
-fn format_filesize_works() {
-    Playground::setup("format_filesize_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | format filesize size KB
-                | get size
-                | first
-            "#
-        ));
-
-        assert_eq!(actual.out, "0.0 KB");
-    })
-}
-
-#[test]
-fn format_filesize_works_with_nonempty_files() {
-    Playground::setup(
-        "format_filesize_works_with_nonempty_files",
-        |dirs, sandbox| {
-            sandbox.with_files(vec![FileWithContentToBeTrimmed(
-                "sample.toml",
-                r#"
-                    [dependency]
-                    name = "nu"
-                "#,
-            )]);
-
-            let actual = nu!(
-                cwd: dirs.test(),
-                "ls sample.toml | format filesize size B | get size | first"
-            );
-
-            #[cfg(not(windows))]
-            assert_eq!(actual.out, "25");
-
-            #[cfg(windows)]
-            assert_eq!(actual.out, "27");
-        },
-    )
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/get.rs b/old_nushell/crates/nu-command/tests/commands/get.rs
deleted file mode 100644
index 667acf94d..000000000
--- a/old_nushell/crates/nu-command/tests/commands/get.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn fetches_a_row() {
-    Playground::setup("get_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                nu_party_venue = "zion"
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get nu_party_venue
-            "#
-        ));
-
-        assert_eq!(actual.out, "zion");
-    })
-}
-
-#[test]
-fn fetches_by_index() {
-    Playground::setup("get_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [package]
-                name = "nu"
-                version = "0.4.1"
-                authors = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"]
-                description = "When arepas shells are tasty and fun."
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get package.authors.2
-            "#
-        ));
-
-        assert_eq!(actual.out, "Andrés N. Robalino <andres@androbtech.com>");
-    })
-}
-#[test]
-fn fetches_by_column_path() {
-    Playground::setup("get_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [package]
-                name = "nu"
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get package.name
-            "#
-        ));
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-
-#[test]
-fn column_paths_are_either_double_quoted_or_regular_unquoted_words_separated_by_dot() {
-    Playground::setup("get_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [package]
-                9999 = ["Yehuda Katz <wycats@gmail.com>", "Jonathan Turner <jonathan.d.turner@gmail.com>", "Andrés N. Robalino <andres@androbtech.com>"]
-                description = "When arepas shells are tasty and fun."
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get package."9999"
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn fetches_more_than_one_column_path() {
-    Playground::setup("get_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [[fortune_tellers]]
-                name = "Andrés N. Robalino"
-                arepas = 1
-
-                [[fortune_tellers]]
-                name = "Jonathan Turner"
-                arepas = 1
-
-                [[fortune_tellers]]
-                name = "Yehuda Katz"
-                arepas = 1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get fortune_tellers.2.name fortune_tellers.0.name fortune_tellers.1.name
-                | nth 2
-            "#
-        ));
-
-        assert_eq!(actual.out, "Jonathan Turner");
-    })
-}
-
-#[test]
-fn errors_fetching_by_column_not_present() {
-    Playground::setup("get_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [taconushell]
-                sentence_words = ["Yo", "quiero", "taconushell"]
-                [pizzanushell]
-                sentence-words = ["I", "want", "pizza"]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get taco
-            "#
-        ));
-
-        assert!(actual.err.contains("Unknown column"),);
-        assert!(actual.err.contains("There isn't a column named 'taco'"),);
-        assert!(actual.err.contains("Perhaps you meant 'taconushell'?"),);
-        assert!(actual
-            .err
-            .contains("Columns available: pizzanushell, taconushell"),);
-    })
-}
-
-#[test]
-fn errors_fetching_by_column_using_a_number() {
-    Playground::setup("get_test_7", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [spanish_lesson]
-                0 = "can only be fetched with 0 double quoted."
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get spanish_lesson.0
-            "#
-        ));
-
-        assert!(actual.err.contains("No rows available"),);
-        assert!(actual.err.contains("A row at '0' can't be indexed."),);
-        assert!(actual
-            .err
-            .contains("Appears to contain columns. Columns available: 0"),)
-    })
-}
-#[test]
-fn errors_fetching_by_index_out_of_bounds() {
-    Playground::setup("get_test_8", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                [spanish_lesson]
-                sentence_words = ["Yo", "quiero", "taconushell"]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.toml
-                | get spanish_lesson.sentence_words.3
-            "#
-        ));
-
-        assert!(actual.err.contains("Row not found"),);
-        assert!(actual.err.contains("There isn't a row indexed at 3"),);
-        assert!(actual.err.contains("The table only has 3 rows (0 to 2)"),)
-    })
-}
-
-#[test]
-fn quoted_column_access() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"echo '[{"foo bar": {"baz": 4}}]' | from json | get "foo bar".baz "#
-    );
-
-    assert_eq!(actual.out, "4");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/group_by.rs b/old_nushell/crates/nu-command/tests/commands/group_by.rs
deleted file mode 100644
index 690a5ddd2..000000000
--- a/old_nushell/crates/nu-command/tests/commands/group_by.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn groups() {
-    Playground::setup("group_by_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at,type
-                Andrés,Robalino,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | group-by rusty_at
-                | get "10/11/2013"
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn errors_if_given_unknown_column_name() {
-    Playground::setup("group_by_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.json",
-            r#"
-                {
-                    "nu": {
-                        "committers": [
-                            {"name": "Andrés N. Robalino"},
-                            {"name": "Jonathan Turner"},
-                            {"name": "Yehuda Katz"}
-                        ],
-                        "releases": [
-                            {"version": "0.2"}
-                            {"version": "0.8"},
-                            {"version": "0.9999999"}
-                        ],
-                        "0xATYKARNU": [
-                            ["Th", "e", " "],
-                            ["BIG", " ", "UnO"],
-                            ["punto", "cero"]
-                        ]
-                    }
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.json
-                | group-by { get nu.releases.version }
-            "#
-        ));
-
-        assert!(actual
-            .err
-            .contains("requires a table with one value for grouping"));
-    })
-}
-
-#[test]
-fn errors_if_block_given_evaluates_more_than_one_row() {
-    Playground::setup("group_by_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at,type
-                Andrés,Robalino,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | group-by ttype
-            "#
-        ));
-
-        assert!(actual.err.contains("Unknown column"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/hash_/mod.rs b/old_nushell/crates/nu-command/tests/commands/hash_/mod.rs
deleted file mode 100644
index 61ad8f155..000000000
--- a/old_nushell/crates/nu-command/tests/commands/hash_/mod.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn base64_defaults_to_encoding_with_standard_character_type() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 'username:password' | hash base64 
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "dXNlcm5hbWU6cGFzc3dvcmQ=");
-}
-
-#[test]
-fn base64_encode_characterset_binhex() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 'username:password' | hash base64 --character_set binhex --encode
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "F@0NEPjJD97kE\'&bEhFZEP3");
-}
-
-#[test]
-fn error_when_invalid_character_set_given() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 'username:password' | hash base64 --character_set 'this is invalid' --encode
-        "#
-        )
-    );
-
-    assert!(actual
-        .err
-        .contains("this is invalid is not a valid character-set"));
-}
-
-#[test]
-fn base64_decode_characterset_binhex() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "F@0NEPjJD97kE'&bEhFZEP3" | hash base64 --character_set binhex --decode
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "username:password");
-}
-
-#[test]
-fn error_invalid_decode_value() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "this should not be a valid encoded value" | hash base64 --character_set url-safe --decode
-        "#
-        )
-    );
-
-    assert!(actual
-        .err
-        .contains("invalid base64 input for character set url-safe"));
-}
-
-#[test]
-fn error_use_both_flags() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 'username:password' | hash base64 --encode --decode
-        "#
-        )
-    );
-
-    assert!(actual
-        .err
-        .contains("only one of --decode and --encode flags can be used"));
-}
-
-#[test]
-fn md5_works_with_file() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        open sample.db | hash md5 
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "4de97601d232c427977ef11db396c951");
-}
-
-#[test]
-fn sha256_works_with_file() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        open sample.db | hash sha256
-        "#
-        )
-    );
-
-    assert_eq!(
-        actual.out,
-        "2f5050e7eea415c1f3d80b5d93355efd15043ec9157a2bb167a9e73f2ae651f2"
-    );
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/headers.rs b/old_nushell/crates/nu-command/tests/commands/headers.rs
deleted file mode 100644
index 1eadf754a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/headers.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn headers_uses_first_row_as_header() {
-    let actual = nu!(
-    cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_headers.xlsx
-            | get Sheet1
-            | headers
-            | get header0
-            | from json"#
-    ));
-
-    assert_eq!(actual.out, "r1c0r2c0")
-}
-
-#[test]
-fn headers_adds_missing_column_name() {
-    let actual = nu!(
-    cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_headers.xlsx
-            | get Sheet1
-            | headers
-            | get Column1
-            | from json"#
-    ));
-
-    assert_eq!(actual.out, "r1c1r2c1")
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/help.rs b/old_nushell/crates/nu-command/tests/commands/help.rs
deleted file mode 100644
index bab3102f0..000000000
--- a/old_nushell/crates/nu-command/tests/commands/help.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn help_commands_length() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        help commands | length
-        "#
-    ));
-
-    let output = actual.out;
-    let output_int: i32 = output.parse().unwrap();
-    let is_positive = output_int.is_positive();
-    assert!(is_positive);
-}
-
-#[test]
-fn help_generate_docs_length() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        help generate_docs | flatten | length
-        "#
-    ));
-
-    let output = actual.out;
-    let output_int: i32 = output.parse().unwrap();
-    let is_positive = output_int.is_positive();
-    assert!(is_positive);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/histogram.rs b/old_nushell/crates/nu-command/tests/commands/histogram.rs
deleted file mode 100644
index 1ff4fef31..000000000
--- a/old_nushell/crates/nu-command/tests/commands/histogram.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn summarizes_by_column_given() {
-    Playground::setup("histogram_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at
-                Andrés,Robalino,Ecuador
-                Jonathan,Turner,Estados Unidos
-                Yehuda,Katz,Estados Unidos
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | histogram rusty_at countries
-                | where rusty_at == "Ecuador"
-                | get countries
-            "#
-        ));
-
-        assert_eq!(
-            actual.out,
-            "**************************************************"
-        );
-        // 50%
-    })
-}
-
-#[test]
-fn summarizes_by_values() {
-    Playground::setup("histogram_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at
-                Andrés,Robalino,Ecuador
-                Jonathan,Turner,Estados Unidos
-                Yehuda,Katz,Estados Unidos
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | get rusty_at
-                | histogram
-                | where value == "Estados Unidos"
-                | get count
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn help() {
-    Playground::setup("histogram_test_3", |dirs, _sandbox| {
-        let help_command = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-                help histogram
-            "#
-        ));
-
-        let help_short = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-                histogram -h
-            "#
-        ));
-
-        let help_long = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-                histogram --help
-            "#
-        ));
-
-        assert_eq!(help_short.out, help_command.out);
-        assert_eq!(help_long.out, help_command.out);
-    })
-}
-
-#[test]
-fn count() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[bit];  [1] [0] [0] [0] [0] [0] [0] [1]]
-            | histogram bit
-            | sort-by count
-            | reject frequency
-            | to json
-        "#
-    ));
-
-    let bit_json = r#"[{"bit":"1","count":2,"percentage":"33.33%"},{"bit":"0","count":6,"percentage":"100.00%"}]"#;
-
-    assert_eq!(actual.out, bit_json);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/insert.rs b/old_nushell/crates/nu-command/tests/commands/insert.rs
deleted file mode 100644
index 4d162de95..000000000
--- a/old_nushell/crates/nu-command/tests/commands/insert.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn sets_the_column_from_a_block_run_output() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml
-            | insert dev-dependencies.newdep "1"
-            | get dev-dependencies.newdep
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn sets_the_column_from_a_block_full_stream_output() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            wrap _
-            | insert content { open --raw cargo_sample.toml | lines | first 5 }
-            | get content.1
-            | str contains "nu"
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn sets_the_column_from_a_subexpression() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            wrap content
-            | insert content (open --raw cargo_sample.toml | lines | first 5)
-            | get content.1
-            | str contains "nu"
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/into_filesize.rs b/old_nushell/crates/nu-command/tests/commands/into_filesize.rs
deleted file mode 100644
index b6919e4bd..000000000
--- a/old_nushell/crates/nu-command/tests/commands/into_filesize.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn into_filesize_int() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        1 | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("1 B"));
-}
-
-#[test]
-fn into_filesize_decimal() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        1.2 | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("1 B"));
-}
-
-#[test]
-fn into_filesize_str() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        '2000' | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("2.0 KB"));
-}
-
-#[test]
-fn into_filesize_str_newline() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        '2000
-' | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("2.0 KB"));
-}
-
-#[test]
-fn into_filesize_str_many_newlines() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        '2000
-
-' | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("2.0 KB"));
-}
-
-#[test]
-fn into_filesize_filesize() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        3kb | into filesize
-        "#
-    ));
-
-    assert!(actual.out.contains("3.0 KB"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/into_int.rs b/old_nushell/crates/nu-command/tests/commands/into_int.rs
deleted file mode 100644
index dbb20a1c7..000000000
--- a/old_nushell/crates/nu-command/tests/commands/into_int.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn into_int_filesize() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1kb | into int | each { $it / 1000 }
-        "#
-    ));
-
-    assert!(actual.out.contains('1'));
-}
-
-#[test]
-fn into_int_filesize2() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1kib | into int | each { $it / 1024 }
-        "#
-    ));
-
-    assert!(actual.out.contains('1'));
-}
-
-#[test]
-fn into_int_int() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1024 | into int | each { $it / 1024 }
-        "#
-    ));
-
-    assert!(actual.out.contains('1'));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/keep/mod.rs b/old_nushell/crates/nu-command/tests/commands/keep/mod.rs
deleted file mode 100644
index a267c2352..000000000
--- a/old_nushell/crates/nu-command/tests/commands/keep/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod rows;
-mod until;
-mod while_;
diff --git a/old_nushell/crates/nu-command/tests/commands/keep/rows.rs b/old_nushell/crates/nu-command/tests/commands/keep/rows.rs
deleted file mode 100644
index 84df11377..000000000
--- a/old_nushell/crates/nu-command/tests/commands/keep/rows.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn rows() {
-    Playground::setup("keep_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "caballeros.csv",
-            r#"
-                name,lucky_code
-                Andrés,1
-                Jonathan,1
-                Jason,2
-                Yehuda,1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open caballeros.csv
-                | keep 3
-                | get lucky_code
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/keep/until.rs b/old_nushell/crates/nu-command/tests/commands/keep/until.rs
deleted file mode 100644
index 36e2783ee..000000000
--- a/old_nushell/crates/nu-command/tests/commands/keep/until.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn condition_is_met() {
-    Playground::setup("keep_until_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "caballeros.txt",
-            r#"
-                CHICKEN SUMMARY                        report date: April 29th, 2020
-                --------------------------------------------------------------------
-                Chicken Collection,29/04/2020,30/04/2020,31/04/2020,
-                Yellow Chickens,,,
-                Andrés,1,1,1
-                Jonathan,1,1,1
-                Jason,1,1,1
-                Yehuda,1,1,1
-                Blue Chickens,,,
-                Andrés,1,1,2
-                Jonathan,1,1,2
-                Jason,1,1,2
-                Yehuda,1,1,2
-                Red Chickens,,,
-                Andrés,1,1,3
-                Jonathan,1,1,3
-                Jason,1,1,3
-                Yehuda,1,1,3
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open --raw caballeros.txt
-                | lines
-                | skip 2
-                | split column ','
-                | headers
-                | skip while "Chicken Collection" != "Blue Chickens"
-                | keep until "Chicken Collection" == "Red Chickens"
-                | skip 1
-                | str to-int "31/04/2020"
-                | get "31/04/2020"
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "8");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/keep/while_.rs b/old_nushell/crates/nu-command/tests/commands/keep/while_.rs
deleted file mode 100644
index 713fc41c8..000000000
--- a/old_nushell/crates/nu-command/tests/commands/keep/while_.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn condition_is_met() {
-    Playground::setup("keep_while_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "caballeros.txt",
-            r#"
-                CHICKEN SUMMARY                        report date: April 29th, 2020
-                --------------------------------------------------------------------
-                Chicken Collection,29/04/2020,30/04/2020,31/04/2020,
-                Yellow Chickens,,,
-                Andrés,1,1,1
-                Jonathan,1,1,1
-                Jason,1,1,1
-                Yehuda,1,1,1
-                Blue Chickens,,,
-                Andrés,1,1,2
-                Jonathan,1,1,2
-                Jason,1,1,2
-                Yehuda,1,1,2
-                Red Chickens,,,
-                Andrés,1,1,3
-                Jonathan,1,1,3
-                Jason,1,1,3
-                Yehuda,1,1,3
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open --raw caballeros.txt
-                | lines
-                | skip 2
-                | split column ','
-                | headers
-                | skip 1
-                | keep while "Chicken Collection" != "Blue Chickens"
-                | str to-int "31/04/2020"
-                | get "31/04/2020"
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/last.rs b/old_nushell/crates/nu-command/tests/commands/last.rs
deleted file mode 100644
index b5acbb99e..000000000
--- a/old_nushell/crates/nu-command/tests/commands/last.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn gets_the_last_row() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "ls | sort-by name | last 1 | get name | str trim"
-    );
-
-    assert_eq!(actual.out, "utf16.ini");
-}
-
-#[test]
-fn gets_last_rows_by_amount() {
-    Playground::setup("last_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | last 3
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn gets_last_row_when_no_amount_given() {
-    Playground::setup("last_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | last
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "1");
-    })
-}
-
-#[test]
-fn requests_more_rows_than_table_has() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        date | last 50 | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/length.rs b/old_nushell/crates/nu-command/tests/commands/length.rs
deleted file mode 100644
index 9c5f51e9d..000000000
--- a/old_nushell/crates/nu-command/tests/commands/length.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn length_columns_in_cal_table() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        cal | length -c
-        "#
-    ));
-
-    assert_eq!(actual.out, "7");
-}
-
-#[test]
-fn length_columns_no_rows() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo [] | length -c
-        "#
-    ));
-
-    assert_eq!(actual.out, "0");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/lines.rs b/old_nushell/crates/nu-command/tests/commands/lines.rs
deleted file mode 100644
index e03b5ad4b..000000000
--- a/old_nushell/crates/nu-command/tests/commands/lines.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn lines() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml -r
-            | lines
-            | skip while $it != "[dependencies]"
-            | skip 1
-            | first 1
-            | split column "="
-            | get Column1
-            | str trim
-        "#
-    ));
-
-    assert_eq!(actual.out, "rustyline");
-}
-
-#[test]
-fn lines_proper_buffering() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open lines_test.txt -r
-            | lines
-            | str length
-            | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, "[8193,3]");
-}
-
-#[test]
-fn lines_multi_value_split() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample-simple.json
-            | get first second
-            | lines
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "5");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/ls.rs b/old_nushell/crates/nu-command/tests/commands/ls.rs
deleted file mode 100644
index a6f52a037..000000000
--- a/old_nushell/crates/nu-command/tests/commands/ls.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn lists_regular_files() {
-    Playground::setup("ls_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn lists_regular_files_using_asterisk_wildcard() {
-    Playground::setup("ls_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls *.txt
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn lists_regular_files_using_question_mark_wildcard() {
-    Playground::setup("ls_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.10.txt"),
-            EmptyFile("jonathan.10.txt"),
-            EmptyFile("andres.10.txt"),
-            EmptyFile("chicken_not_to_be_picked_up.100.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls *.??.txt
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn lists_all_files_in_directories_from_stream() {
-    Playground::setup("ls_test_4", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![EmptyFile("root1.txt"), EmptyFile("root2.txt")])
-            .within("dir_a")
-            .with_files(vec![
-                EmptyFile("yehuda.10.txt"),
-                EmptyFile("jonathan.10.txt"),
-            ])
-            .within("dir_b")
-            .with_files(vec![
-                EmptyFile("andres.10.txt"),
-                EmptyFile("chicken_not_to_be_picked_up.100.txt"),
-            ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo dir_a dir_b
-                | each { ls $it }
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn does_not_fail_if_glob_matches_empty_directory() {
-    Playground::setup("ls_test_5", |dirs, sandbox| {
-        sandbox.within("dir_a");
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls dir_a
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-fn fails_when_glob_doesnt_match() {
-    Playground::setup("ls_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("root1.txt"), EmptyFile("root2.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "ls root3*"
-        );
-
-        assert!(actual.err.contains("no matches found"));
-    })
-}
-
-#[test]
-fn list_files_from_two_parents_up_using_multiple_dots() {
-    Playground::setup("ls_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yahuda.yaml"),
-            EmptyFile("jonathan.json"),
-            EmptyFile("andres.xml"),
-            EmptyFile("kevin.txt"),
-        ]);
-
-        sandbox.within("foo").mkdir("bar");
-
-        let actual = nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                ls ... | length
-            "#
-        );
-
-        assert_eq!(actual.out, "5");
-    })
-}
-
-#[test]
-fn lists_hidden_file_when_explicitly_specified() {
-    Playground::setup("ls_test_7", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-            EmptyFile(".testdotfile"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls .testdotfile
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "1");
-    })
-}
-
-#[test]
-fn lists_all_hidden_files_when_glob_contains_dot() {
-    Playground::setup("ls_test_8", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![
-                EmptyFile("root1.txt"),
-                EmptyFile("root2.txt"),
-                EmptyFile(".dotfile1"),
-            ])
-            .within("dir_a")
-            .with_files(vec![
-                EmptyFile("yehuda.10.txt"),
-                EmptyFile("jonathan.10.txt"),
-                EmptyFile(".dotfile2"),
-            ])
-            .within("dir_b")
-            .with_files(vec![
-                EmptyFile("andres.10.txt"),
-                EmptyFile("chicken_not_to_be_picked_up.100.txt"),
-                EmptyFile(".dotfile3"),
-            ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls **/.*
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-// TODO Remove this cfg value when we have an OS-agnostic way
-// of creating hidden files using the playground.
-#[cfg(unix)]
-fn lists_all_hidden_files_when_glob_does_not_contain_dot() {
-    Playground::setup("ls_test_8", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![
-                EmptyFile("root1.txt"),
-                EmptyFile("root2.txt"),
-                EmptyFile(".dotfile1"),
-            ])
-            .within("dir_a")
-            .with_files(vec![
-                EmptyFile("yehuda.10.txt"),
-                EmptyFile("jonathan.10.txt"),
-                EmptyFile(".dotfile2"),
-            ])
-            .within(".dir_b")
-            .with_files(vec![
-                EmptyFile("andres.10.txt"),
-                EmptyFile("chicken_not_to_be_picked_up.100.txt"),
-                EmptyFile(".dotfile3"),
-            ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls **/*
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "5");
-    })
-}
-
-#[test]
-#[cfg(unix)]
-fn fails_with_ls_to_dir_without_permission() {
-    Playground::setup("ls_test_1", |dirs, sandbox| {
-        sandbox.within("dir_a").with_files(vec![
-            EmptyFile("yehuda.11.txt"),
-            EmptyFile("jonathan.10.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                chmod 000 dir_a; ls dir_a
-            "#
-        ));
-        assert!(actual
-            .err
-            .contains("The permissions of 0 do not allow access for this user"));
-    })
-}
-
-#[test]
-fn lists_files_including_starting_with_dot() {
-    Playground::setup("ls_test_9", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-            EmptyFile(".hidden1.txt"),
-            EmptyFile(".hidden2.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls -a
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "5");
-    })
-}
-
-#[test]
-fn list_all_columns() {
-    Playground::setup("ls_test_all_columns", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("Leonardo.yaml"),
-            EmptyFile("Raphael.json"),
-            EmptyFile("Donatello.xml"),
-            EmptyFile("Michelangelo.txt"),
-        ]);
-        // Normal Operation
-        let actual = nu!(
-            cwd: dirs.test(),
-            "ls | get | to md"
-        );
-        let expected = ["name", "type", "size", "modified"].join("");
-        assert_eq!(actual.out, expected, "column names are incorrect for ls");
-        // Long
-        let actual = nu!(
-            cwd: dirs.test(),
-            "ls -l | get | to md"
-        );
-        let expected = {
-            #[cfg(unix)]
-            {
-                [
-                    "name",
-                    "type",
-                    "target",
-                    "num_links",
-                    "inode",
-                    "readonly",
-                    "mode",
-                    "uid",
-                    "group",
-                    "size",
-                    "created",
-                    "accessed",
-                    "modified",
-                ]
-                .join("")
-            }
-
-            #[cfg(windows)]
-            {
-                [
-                    "name", "type", "target", "readonly", "size", "created", "accessed", "modified",
-                ]
-                .join("")
-            }
-        };
-        assert_eq!(
-            actual.out, expected,
-            "column names are incorrect for ls long"
-        );
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/avg.rs b/old_nushell/crates/nu-command/tests/commands/math/avg.rs
deleted file mode 100644
index e749192c4..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/avg.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn can_average_numbers() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-             open sgml_description.json
-             | get glossary.GlossDiv.GlossList.GlossEntry.Sections
-             | math avg
-         "#
-    ));
-
-    assert_eq!(actual.out, "101.5")
-}
-
-#[test]
-fn can_average_bytes() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "ls | sort-by name | skip 1 | first 2 | get size | math avg | format \"{$it}\" "
-    );
-
-    assert_eq!(actual.out, "1.6 KB");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/eval.rs b/old_nushell/crates/nu-command/tests/commands/math/eval.rs
deleted file mode 100644
index 736d1f641..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/eval.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn evaluates_two_plus_two() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        math eval "2 + 2"
-        "#
-    ));
-
-    assert!(actual.out.contains("4.0"));
-}
-
-#[test]
-fn evaluates_two_to_the_power_four() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "2 ^ 4" | math eval
-        "#
-    ));
-
-    assert!(actual.out.contains("16.0"));
-}
-
-#[test]
-fn evaluates_three_multiplied_by_five() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "3 * 5" | math eval
-        "#
-    ));
-
-    assert!(actual.out.contains("15.0"));
-}
-
-#[test]
-fn evaluates_twenty_four_divided_by_two() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "24 / 2" | math eval
-        "#
-    ));
-
-    assert!(actual.out.contains("12.0"));
-}
-
-#[test]
-fn evaluates_twenty_eight_minus_seven() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "28 - 7" | math eval
-        "#
-    ));
-
-    assert!(actual.out.contains("21"));
-}
-
-#[test]
-fn evaluates_pi() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        math eval pi
-        "#
-    ));
-
-    assert!(actual.out.contains("3.14"));
-}
-
-#[test]
-fn evaluates_tau() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        math eval tau
-        "#
-    ));
-
-    assert!(actual.out.contains("6.28"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/median.rs b/old_nushell/crates/nu-command/tests/commands/math/median.rs
deleted file mode 100644
index 7509fe8f4..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/median.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn median_numbers_with_even_rows() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-             echo [10 6 19 21 4]
-             | math median
-         "#
-    ));
-
-    assert_eq!(actual.out, "10")
-}
-
-#[test]
-fn median_numbers_with_odd_rows() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-             echo [3 8 9 12 12 15]
-             | math median
-         "#
-    ));
-
-    assert_eq!(actual.out, "10.5")
-}
-
-#[test]
-fn median_mixed_numbers() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-             echo [-11.5 -13.5 10]
-             | math median
-         "#
-    ));
-
-    assert_eq!(actual.out, "-11.5")
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/mod.rs b/old_nushell/crates/nu-command/tests/commands/math/mod.rs
deleted file mode 100644
index 21c4cab65..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/mod.rs
+++ /dev/null
@@ -1,296 +0,0 @@
-mod avg;
-mod eval;
-mod median;
-mod round;
-mod sqrt;
-mod sum;
-
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn one_arg() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn add() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 + 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "2");
-}
-
-#[test]
-fn add_compound() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 + 2 + 2
-        "#
-    ));
-
-    assert_eq!(actual.out, "5");
-}
-
-#[test]
-fn precedence_of_operators() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 + 2 * 2
-        "#
-    ));
-
-    assert_eq!(actual.out, "5");
-}
-
-#[test]
-fn precedence_of_operators2() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 + 2 * 2 + 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn division_of_ints() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            4 / 2
-        "#
-    ));
-
-    assert_eq!(actual.out, "2");
-}
-
-#[test]
-fn division_of_ints2() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 / 4
-        "#
-    ));
-
-    assert_eq!(actual.out, "0.25");
-}
-
-#[test]
-fn error_zero_division_int_int() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 / 0
-        "#
-    ));
-
-    assert!(actual.err.contains("division by zero"));
-}
-
-#[test]
-fn error_zero_division_decimal_int() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1.0 / 0
-        "#
-    ));
-
-    assert!(actual.err.contains("division by zero"));
-}
-
-#[test]
-fn error_zero_division_int_decimal() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1 / 0.0
-        "#
-    ));
-
-    assert!(actual.err.contains("division by zero"));
-}
-
-#[test]
-fn error_zero_division_decimal_decimal() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1.0 / 0.0
-        "#
-    ));
-
-    assert!(actual.err.contains("division by zero"));
-}
-
-#[test]
-fn proper_precedence_history() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            2 / 2 / 2 + 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "1.5");
-}
-
-#[test]
-fn parens_precedence() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            4 * (6 - 3)
-        "#
-    ));
-
-    assert_eq!(actual.out, "12");
-}
-
-#[test]
-fn modulo() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            9 mod 2
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn duration_math() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1wk + 1day
-        "#
-    ));
-
-    assert_eq!(actual.out, "8day");
-}
-
-#[test]
-fn duration_decimal_math() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            5.5day + 0.5day
-        "#
-    ));
-
-    assert_eq!(actual.out, "6day");
-}
-
-#[test]
-fn duration_math_with_nanoseconds() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1wk + 10ns
-        "#
-    ));
-
-    assert_eq!(actual.out, "7day 10ns");
-}
-
-#[test]
-fn duration_decimal_math_with_nanoseconds() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1.5wk + 10ns
-        "#
-    ));
-
-    assert_eq!(actual.out, "10day 10ns");
-}
-
-#[test]
-fn duration_math_with_negative() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            1day - 1wk
-        "#
-    ));
-
-    assert_eq!(actual.out, "-6day");
-}
-
-#[test]
-fn duration_math_shell_error_on_big_numbers() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-           (date now) + 100000000000000day
-        "#
-    ));
-
-    assert!(actual.err.contains("Duration overflow"));
-}
-
-#[test]
-fn compound_comparison() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            4 > 3 && 2 > 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn compound_comparison2() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            4 < 3 || 2 > 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn compound_where() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '[{"a": 1, "b": 1}, {"a": 2, "b": 1}, {"a": 2, "b": 2}]' | from json | where a == 2 && b == 1 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, r#"{"a":2,"b":1}"#);
-}
-
-#[test]
-fn compound_where_paren() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '[{"a": 1, "b": 1}, {"a": 2, "b": 1}, {"a": 2, "b": 2}]' | from json | where ($it.a == 2 && $it.b == 1) || $it.b == 2 | to json
-        "#
-    ));
-
-    assert_eq!(actual.out, r#"[{"a":2,"b":1},{"a":2,"b":2}]"#);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/round.rs b/old_nushell/crates/nu-command/tests/commands/math/round.rs
deleted file mode 100644
index 2bec436a6..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/round.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn can_round_very_large_numbers() {
-    let actual = nu!(
-        cwd: ".",
-        "echo 18.1372544780074142289927665486772012345 | math round"
-    );
-
-    assert_eq!(actual.out, "18")
-}
-
-#[test]
-fn can_round_very_large_numbers_with_precision() {
-    let actual = nu!(
-        cwd: ".",
-        "echo 18.13725447800741422899276654867720121457878988 | math round -p 10"
-    );
-
-    assert_eq!(actual.out, "18.137254478")
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/sqrt.rs b/old_nushell/crates/nu-command/tests/commands/math/sqrt.rs
deleted file mode 100644
index c8e7eb24a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/sqrt.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn can_sqrt_numbers() {
-    let actual = nu!(
-        cwd: ".",
-        "echo [0.25 2 4] | math sqrt | math sum"
-    );
-
-    assert_eq!(actual.out, "3.914213562373095048801688724209698078569671875376948073176679737990732478462107038850387534327641573");
-}
-
-#[test]
-fn can_sqrt_irrational() {
-    let actual = nu!(
-        cwd: ".",
-        "echo 2 | math sqrt"
-    );
-
-    assert_eq!(actual.out, "1.414213562373095048801688724209698078569671875376948073176679737990732478462107038850387534327641573");
-}
-
-#[test]
-fn can_sqrt_perfect_square() {
-    let actual = nu!(
-        cwd: ".",
-        "echo 4 | math sqrt"
-    );
-
-    assert_eq!(actual.out, "2");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/math/sum.rs b/old_nushell/crates/nu-command/tests/commands/math/sum.rs
deleted file mode 100644
index 4e3623d81..000000000
--- a/old_nushell/crates/nu-command/tests/commands/math/sum.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-use std::str::FromStr;
-
-#[test]
-fn all() {
-    Playground::setup("sum_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "meals.json",
-            r#"
-                {
-                    meals: [
-                        {description: "1 large egg", calories: 90},
-                        {description: "1 cup white rice", calories: 250},
-                        {description: "1 tablespoon fish oil", calories: 108}
-                    ]
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open meals.json
-                | get meals
-                | get calories
-                | math sum
-            "#
-        ));
-
-        assert_eq!(actual.out, "448");
-    })
-}
-
-#[test]
-#[allow(clippy::unreadable_literal)]
-#[allow(clippy::float_cmp)]
-fn compute_sum_of_individual_row() -> Result<(), String> {
-    let answers_for_columns = [
-        ("cpu", 88.257434),
-        ("mem", 3032375296.),
-        ("virtual", 102579965952.),
-    ];
-    for (column_name, expected_value) in answers_for_columns {
-        let actual = nu!(
-            cwd: "tests/fixtures/formats/",
-            format!("open sample-ps-output.json | select {} | math sum | get {}", column_name, column_name)
-        );
-        let result =
-            f64::from_str(&actual.out).map_err(|_| String::from("Failed to parse float."))?;
-        assert_eq!(result, expected_value);
-    }
-    Ok(())
-}
-
-#[test]
-#[allow(clippy::unreadable_literal)]
-#[allow(clippy::float_cmp)]
-fn compute_sum_of_table() -> Result<(), String> {
-    let answers_for_columns = [
-        ("cpu", 88.257434),
-        ("mem", 3032375296.),
-        ("virtual", 102579965952.),
-    ];
-    for (column_name, expected_value) in answers_for_columns {
-        let actual = nu!(
-            cwd: "tests/fixtures/formats/",
-            format!("open sample-ps-output.json | select cpu mem virtual | math sum | get {}", column_name)
-        );
-        let result =
-            f64::from_str(&actual.out).map_err(|_| String::from("Failed to parse float."))?;
-        assert_eq!(result, expected_value);
-    }
-    Ok(())
-}
-
-#[test]
-fn sum_of_a_row_containing_a_table_is_an_error() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats/",
-        "open sample-sys-output.json | math sum"
-    );
-    assert!(actual
-        .err
-        .contains("Attempted to compute values that can't be operated on"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/merge.rs b/old_nushell/crates/nu-command/tests/commands/merge.rs
deleted file mode 100644
index 92ec3fe5d..000000000
--- a/old_nushell/crates/nu-command/tests/commands/merge.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn row() {
-    Playground::setup("merge_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            FileWithContentToBeTrimmed(
-                "caballeros.csv",
-                r#"
-                name,country,luck
-                Andrés,Ecuador,0
-                Jonathan,USA,0
-                Jason,Canada,0
-                Yehuda,USA,0
-            "#,
-            ),
-            FileWithContentToBeTrimmed(
-                "new_caballeros.csv",
-                r#"
-                name,country,luck
-                Andrés Robalino,Guayaquil Ecuador,1
-                Jonathan Turner,New Zealand,1
-            "#,
-            ),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open caballeros.csv
-                | merge { open new_caballeros.csv }
-                | where country in ["Guayaquil Ecuador" "New Zealand"]
-                | get luck
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/mkdir.rs b/old_nushell/crates/nu-command/tests/commands/mkdir.rs
deleted file mode 100644
index ddb3b0856..000000000
--- a/old_nushell/crates/nu-command/tests/commands/mkdir.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use nu_test_support::fs::files_exist_at;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-use std::path::Path;
-
-#[test]
-fn creates_directory() {
-    Playground::setup("mkdir_test_1", |dirs, _| {
-        nu!(
-            cwd: dirs.test(),
-            "mkdir my_new_directory"
-        );
-
-        let expected = dirs.test().join("my_new_directory");
-
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn accepts_and_creates_directories() {
-    Playground::setup("mkdir_test_2", |dirs, _| {
-        nu!(
-            cwd: dirs.test(),
-            "mkdir dir_1 dir_2 dir_3"
-        );
-
-        assert!(files_exist_at(
-            vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
-            dirs.test()
-        ));
-    })
-}
-
-#[test]
-fn creates_intermediary_directories() {
-    Playground::setup("mkdir_test_3", |dirs, _| {
-        nu!(
-            cwd: dirs.test(),
-            "mkdir some_folder/another/deeper_one"
-        );
-
-        let expected = dirs.test().join("some_folder/another/deeper_one");
-
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn create_directory_two_parents_up_using_multiple_dots() {
-    Playground::setup("mkdir_test_4", |dirs, sandbox| {
-        sandbox.within("foo").mkdir("bar");
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            "mkdir .../boo"
-        );
-
-        let expected = dirs.test().join("boo");
-
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn show_created_paths() {
-    Playground::setup("mkdir_test_2", |dirs, _| {
-        let actual = nu!(
-         cwd: dirs.test(),
-         pipeline(
-             r#"
-                 mkdir -s dir_1 dir_2 dir_3
-                 | length
-             "#
-        ));
-
-        assert!(files_exist_at(
-            vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
-            dirs.test()
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/mod.rs b/old_nushell/crates/nu-command/tests/commands/mod.rs
deleted file mode 100644
index eaf8f6bbe..000000000
--- a/old_nushell/crates/nu-command/tests/commands/mod.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-mod all;
-mod any;
-mod append;
-mod cal;
-mod cd;
-mod compact;
-mod config;
-mod cp;
-mod def;
-mod default;
-mod drop;
-mod each;
-mod echo;
-mod empty;
-mod enter;
-mod every;
-mod find;
-mod first;
-mod flatten;
-mod format;
-mod get;
-mod group_by;
-mod hash_;
-mod headers;
-mod help;
-mod histogram;
-mod insert;
-mod into_filesize;
-mod into_int;
-mod keep;
-mod last;
-mod length;
-mod lines;
-mod ls;
-mod math;
-mod merge;
-mod mkdir;
-mod move_;
-mod open;
-mod parse;
-mod path;
-mod pathvar;
-mod prepend;
-mod random;
-mod range;
-mod reduce;
-mod rename;
-mod reverse;
-mod rm;
-mod roll;
-mod rotate;
-mod save;
-mod select;
-mod semicolon;
-mod skip;
-mod sort_by;
-mod source;
-mod split_by;
-mod split_column;
-mod split_row;
-mod str_;
-mod touch;
-mod uniq;
-mod update;
-mod where_;
-mod which;
-mod with_env;
-mod wrap;
-mod zip;
diff --git a/old_nushell/crates/nu-command/tests/commands/move_/column.rs b/old_nushell/crates/nu-command/tests/commands/move_/column.rs
deleted file mode 100644
index caf1b2fd4..000000000
--- a/old_nushell/crates/nu-command/tests/commands/move_/column.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn moves_a_column_before() {
-    Playground::setup("move_column_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.csv",
-            r#"
-                column1,column2,column3,...,column98,column99,column100
-                -------,-------,-------,---,--------,   A    ,---------
-                -------,-------,-------,---,--------,   N    ,---------
-                -------,-------,-------,---,--------,   D    ,---------
-                -------,-------,-------,---,--------,   R    ,---------
-                -------,-------,-------,---,--------,   E    ,---------
-                -------,-------,-------,---,--------,   S    ,---------
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.csv
-                | move column99 --before column1
-                | rename chars
-                | get chars
-                | str trim
-                | str collect
-            "#
-        ));
-
-        assert!(actual.out.contains("ANDRES"));
-    })
-}
-
-#[test]
-fn moves_columns_before() {
-    Playground::setup("move_column_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.csv",
-            r#"
-                column1,column2,column3,...,column98,column99,column100
-                -------,-------,   A   ,---,--------,   N    ,---------
-                -------,-------,   D   ,---,--------,   R    ,---------
-                -------,-------,   E   ,---,--------,   S    ,---------
-                -------,-------,   :   ,---,--------,   :    ,---------
-                -------,-------,   J   ,---,--------,   O    ,---------
-                -------,-------,   N   ,---,--------,   A    ,---------
-                -------,-------,   T   ,---,--------,   H    ,---------
-                -------,-------,   A   ,---,--------,   N    ,---------
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.csv
-                | move column99 column3 --before column2
-                | rename _ chars_1 chars_2
-                | get chars_2 chars_1
-                | str trim
-                | str collect
-            "#
-        ));
-
-        assert!(actual.out.contains("ANDRES::JONATHAN"));
-    })
-}
-
-#[test]
-fn moves_a_column_after() {
-    Playground::setup("move_column_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.csv",
-            r#"
-                column1,column2,letters,...,column98,and_more,column100
-                -------,-------,   A   ,---,--------,   N    ,---------
-                -------,-------,   D   ,---,--------,   R    ,---------
-                -------,-------,   E   ,---,--------,   S    ,---------
-                -------,-------,   :   ,---,--------,   :    ,---------
-                -------,-------,   J   ,---,--------,   O    ,---------
-                -------,-------,   N   ,---,--------,   A    ,---------
-                -------,-------,   T   ,---,--------,   H    ,---------
-                -------,-------,   A   ,---,--------,   N    ,---------
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.csv
-                | move letters --after and_more
-                | move letters and_more --before column2
-                | rename _ chars_1 chars_2
-                | get chars_1 chars_2
-                | str trim
-                | str collect
-            "#
-        ));
-
-        assert!(actual.out.contains("ANDRES::JONATHAN"));
-    })
-}
-
-#[test]
-fn moves_columns_after() {
-    Playground::setup("move_column_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.csv",
-            r#"
-                column1,column2,letters,...,column98,and_more,column100
-                -------,-------,   A   ,---,--------,   N    ,---------
-                -------,-------,   D   ,---,--------,   R    ,---------
-                -------,-------,   E   ,---,--------,   S    ,---------
-                -------,-------,   :   ,---,--------,   :    ,---------
-                -------,-------,   J   ,---,--------,   O    ,---------
-                -------,-------,   N   ,---,--------,   A    ,---------
-                -------,-------,   T   ,---,--------,   H    ,---------
-                -------,-------,   A   ,---,--------,   N    ,---------
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.csv
-                | move letters and_more --after column1
-                | get
-                | nth 1 2
-                | str collect
-            "#
-        ));
-
-        assert!(actual.out.contains("lettersand_more"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/move_/mod.rs b/old_nushell/crates/nu-command/tests/commands/move_/mod.rs
deleted file mode 100644
index 58d0a7f6c..000000000
--- a/old_nushell/crates/nu-command/tests/commands/move_/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod column;
-mod mv;
diff --git a/old_nushell/crates/nu-command/tests/commands/move_/mv.rs b/old_nushell/crates/nu-command/tests/commands/move_/mv.rs
deleted file mode 100644
index 5debb64b3..000000000
--- a/old_nushell/crates/nu-command/tests/commands/move_/mv.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-use nu_test_support::fs::{files_exist_at, Stub::EmptyFile};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn moves_a_file() {
-    Playground::setup("mv_test_1", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![EmptyFile("andres.txt")])
-            .mkdir("expected");
-
-        let original = dirs.test().join("andres.txt");
-        let expected = dirs.test().join("expected/yehuda.txt");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv andres.txt expected/yehuda.txt"
-        );
-
-        assert!(!original.exists());
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn overwrites_if_moving_to_existing_file() {
-    Playground::setup("mv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("andres.txt"), EmptyFile("jonathan.txt")]);
-
-        let original = dirs.test().join("andres.txt");
-        let expected = dirs.test().join("jonathan.txt");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv andres.txt jonathan.txt"
-        );
-
-        assert!(!original.exists());
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn moves_a_directory() {
-    Playground::setup("mv_test_3", |dirs, sandbox| {
-        sandbox.mkdir("empty_dir");
-
-        let original_dir = dirs.test().join("empty_dir");
-        let expected = dirs.test().join("renamed_dir");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv empty_dir renamed_dir"
-        );
-
-        assert!(!original_dir.exists());
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn moves_the_file_inside_directory_if_path_to_move_is_existing_directory() {
-    Playground::setup("mv_test_4", |dirs, sandbox| {
-        sandbox
-            .with_files(vec![EmptyFile("jonathan.txt")])
-            .mkdir("expected");
-
-        let original_dir = dirs.test().join("jonathan.txt");
-        let expected = dirs.test().join("expected/jonathan.txt");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv jonathan.txt expected"
-        );
-
-        assert!(!original_dir.exists());
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn moves_the_directory_inside_directory_if_path_to_move_is_existing_directory() {
-    Playground::setup("mv_test_5", |dirs, sandbox| {
-        sandbox
-            .within("contributors")
-            .with_files(vec![EmptyFile("jonathan.txt")])
-            .mkdir("expected");
-
-        let original_dir = dirs.test().join("contributors");
-        let expected = dirs.test().join("expected/contributors");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv contributors expected"
-        );
-
-        assert!(!original_dir.exists());
-        assert!(expected.exists());
-        assert!(files_exist_at(vec!["jonathan.txt"], expected))
-    })
-}
-
-#[test]
-fn moves_using_path_with_wildcard() {
-    Playground::setup("mv_test_7", |dirs, sandbox| {
-        sandbox
-            .within("originals")
-            .with_files(vec![
-                EmptyFile("andres.ini"),
-                EmptyFile("caco3_plastics.csv"),
-                EmptyFile("cargo_sample.toml"),
-                EmptyFile("jonathan.ini"),
-                EmptyFile("jonathan.xml"),
-                EmptyFile("sgml_description.json"),
-                EmptyFile("sample.ini"),
-                EmptyFile("utf16.ini"),
-                EmptyFile("yehuda.ini"),
-            ])
-            .mkdir("work_dir")
-            .mkdir("expected");
-
-        let work_dir = dirs.test().join("work_dir");
-        let expected = dirs.test().join("expected");
-
-        nu!(cwd: work_dir, "mv ../originals/*.ini ../expected");
-
-        assert!(files_exist_at(
-            vec!["yehuda.ini", "jonathan.ini", "sample.ini", "andres.ini",],
-            expected
-        ));
-    })
-}
-
-#[test]
-fn moves_using_a_glob() {
-    Playground::setup("mv_test_8", |dirs, sandbox| {
-        sandbox
-            .within("meals")
-            .with_files(vec![
-                EmptyFile("arepa.txt"),
-                EmptyFile("empanada.txt"),
-                EmptyFile("taquiza.txt"),
-            ])
-            .mkdir("work_dir")
-            .mkdir("expected");
-
-        let meal_dir = dirs.test().join("meals");
-        let work_dir = dirs.test().join("work_dir");
-        let expected = dirs.test().join("expected");
-
-        nu!(cwd: work_dir, "mv ../meals/* ../expected");
-
-        assert!(meal_dir.exists());
-        assert!(files_exist_at(
-            vec!["arepa.txt", "empanada.txt", "taquiza.txt",],
-            expected
-        ));
-    })
-}
-
-#[test]
-fn moves_a_directory_with_files() {
-    Playground::setup("mv_test_9", |dirs, sandbox| {
-        sandbox
-            .mkdir("vehicles/car")
-            .mkdir("vehicles/bicycle")
-            .with_files(vec![
-                EmptyFile("vehicles/car/car1.txt"),
-                EmptyFile("vehicles/car/car2.txt"),
-            ])
-            .with_files(vec![
-                EmptyFile("vehicles/bicycle/bicycle1.txt"),
-                EmptyFile("vehicles/bicycle/bicycle2.txt"),
-            ]);
-
-        let original_dir = dirs.test().join("vehicles");
-        let expected_dir = dirs.test().join("expected");
-
-        nu!(
-            cwd: dirs.test(),
-            "mv vehicles expected"
-        );
-
-        assert!(!original_dir.exists());
-        assert!(expected_dir.exists());
-        assert!(files_exist_at(
-            vec![
-                "car/car1.txt",
-                "car/car2.txt",
-                "bicycle/bicycle1.txt",
-                "bicycle/bicycle2.txt"
-            ],
-            expected_dir
-        ));
-    })
-}
-
-#[test]
-fn errors_if_source_doesnt_exist() {
-    Playground::setup("mv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("test_folder");
-        let actual = nu!(
-            cwd: dirs.test(),
-            "mv non-existing-file test_folder/"
-        );
-        assert!(actual.err.contains("Invalid file or pattern"));
-    })
-}
-
-#[test]
-fn errors_if_destination_doesnt_exist() {
-    Playground::setup("mv_test_10_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("empty.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "mv empty.txt does/not/exist"
-        );
-
-        assert!(actual.err.contains("Destination directory does not exist"));
-    })
-}
-
-#[test]
-fn errors_if_multiple_sources_but_destination_not_a_directory() {
-    Playground::setup("mv_test_10_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("file1.txt"),
-            EmptyFile("file2.txt"),
-            EmptyFile("file3.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "mv file?.txt not_a_dir"
-        );
-
-        assert!(actual
-            .err
-            .contains("Can only move multiple sources if destination is a directory"));
-    })
-}
-
-#[test]
-fn errors_if_renaming_directory_to_an_existing_file() {
-    Playground::setup("mv_test_10_3", |dirs, sandbox| {
-        sandbox
-            .mkdir("mydir")
-            .with_files(vec![EmptyFile("empty.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "mv mydir empty.txt"
-        );
-
-        assert!(actual.err.contains("Cannot rename a directory to a file"));
-    })
-}
-
-#[test]
-fn errors_if_moving_to_itself() {
-    Playground::setup("mv_test_10_4", |dirs, sandbox| {
-        sandbox.mkdir("mydir").mkdir("mydir/mydir_2");
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "mv mydir mydir/mydir_2/"
-        );
-
-        assert!(actual.err.contains("cannot move to itself"));
-    })
-}
-
-#[test]
-fn does_not_error_on_relative_parent_path() {
-    Playground::setup("mv_test_11", |dirs, sandbox| {
-        sandbox
-            .mkdir("first")
-            .with_files(vec![EmptyFile("first/william_hartnell.txt")]);
-
-        let original = dirs.test().join("first/william_hartnell.txt");
-        let expected = dirs.test().join("william_hartnell.txt");
-
-        nu!(
-            cwd: dirs.test().join("first"),
-            "mv william_hartnell.txt ./.."
-        );
-
-        assert!(!original.exists());
-        assert!(expected.exists());
-    })
-}
-
-#[test]
-fn move_files_using_glob_two_parents_up_using_multiple_dots() {
-    Playground::setup("mv_test_12", |dirs, sandbox| {
-        sandbox.within("foo").within("bar").with_files(vec![
-            EmptyFile("jonathan.json"),
-            EmptyFile("andres.xml"),
-            EmptyFile("yehuda.yaml"),
-            EmptyFile("kevin.txt"),
-            EmptyFile("many_more.ppl"),
-        ]);
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                mv * ...
-            "#
-        );
-
-        let files = vec![
-            "yehuda.yaml",
-            "jonathan.json",
-            "andres.xml",
-            "kevin.txt",
-            "many_more.ppl",
-        ];
-
-        let original_dir = dirs.test().join("foo/bar");
-        let destination_dir = dirs.test();
-
-        assert!(files_exist_at(files.clone(), destination_dir));
-        assert!(!files_exist_at(files, original_dir))
-    })
-}
-
-#[test]
-fn move_file_from_two_parents_up_using_multiple_dots_to_current_dir() {
-    Playground::setup("cp_test_10", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("hello_there")]);
-        sandbox.within("foo").mkdir("bar");
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            r#"
-                mv .../hello_there .
-            "#
-        );
-
-        let expected = dirs.test().join("foo/bar/hello_there");
-        let original = dirs.test().join("hello_there");
-
-        assert!(expected.exists());
-        assert!(!original.exists());
-    })
-}
-
-#[test]
-fn does_not_error_when_some_file_is_moving_into_itself() {
-    Playground::setup("mv_test_13", |dirs, sandbox| {
-        sandbox.mkdir("11").mkdir("12");
-
-        let original_dir = dirs.test().join("11");
-        let expected = dirs.test().join("12/11");
-        nu!(cwd: dirs.test(), "mv 1* 12");
-
-        assert!(!original_dir.exists());
-        assert!(expected.exists());
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/nth.rs b/old_nushell/crates/nu-command/tests/commands/nth.rs
deleted file mode 100644
index a65dcd7ed..000000000
--- a/old_nushell/crates/nu-command/tests/commands/nth.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-#[test]
-fn selects_a_row() {
-    Playground::setup("nth_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("notes.txt"), EmptyFile("arepas.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | sort-by name
-                | nth 0
-                | get name
-            "#
-        ));
-
-        assert_eq!(actual.out, "arepas.txt");
-    });
-}
-
-#[test]
-fn selects_many_rows() {
-    Playground::setup("nth_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("notes.txt"), EmptyFile("arepas.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | nth 1 0
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/open.rs b/old_nushell/crates/nu-command/tests/commands/open.rs
deleted file mode 100644
index 994d2699d..000000000
--- a/old_nushell/crates/nu-command/tests/commands/open.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn parses_csv() {
-    Playground::setup("open_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu.zion.csv",
-            r#"
-                    author,lang,source
-                    Jonathan Turner,Rust,New Zealand
-                    Andres N. Robalino,Rust,Ecuador
-                    Yehuda Katz,Rust,Estados Unidos
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open nu.zion.csv
-                | where author == "Andres N. Robalino"
-                | get source
-            "#
-        ));
-
-        assert_eq!(actual.out, "Ecuador");
-    })
-}
-
-// sample.bson has the following format:
-// ━━━━━━━━━━┯━━━━━━━━━━━
-//  _id      │ root
-// ──────────┼───────────
-//  [object] │ [9 items]
-// ━━━━━━━━━━┷━━━━━━━━━━━
-//
-// the root value is:
-// ━━━┯━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━┯━━━━━━━━━━┯━━━━━━━━━━
-//  # │ _id               │ a                       │ b        │ c
-// ───┼───────────────────┼─────────────────────────┼──────────┼──────────
-//  0 │ [object]          │       1.000000000000000 │ hello    │ [2 items]
-//  1 │ [object]          │       42.00000000000000 │ whel     │ hello
-//  2 │ [object]          │ [object]                │          │
-//  3 │ [object]          │                         │ [object] │
-//  4 │ [object]          │                         │          │ [object]
-//  5 │ [object]          │                         │          │ [object]
-//  6 │ [object]          │ [object]                │ [object] │
-//  7 │ [object]          │ <date value>            │ [object] │
-//  8 │ 1.000000          │ <decimal value>         │ [object] │
-//
-// The decimal value is supposed to be π, but is currently wrong due to
-// what appears to be an issue in the bson library that is under investigation.
-//
-
-#[cfg(feature = "bson")]
-#[test]
-fn parses_bson() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open sample.bson | get root | nth 0 | get b"
-    );
-
-    assert_eq!(actual.out, "hello");
-}
-
-#[cfg(feature = "bson")]
-#[test]
-fn parses_more_bson_complexity() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.bson
-            | get root
-            | nth 6
-            | get b
-            | get '$binary_subtype'
-        "#
-    ));
-
-    assert_eq!(actual.out, "function");
-}
-
-// sample.db has the following format:
-//
-// ━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━━━
-//  # │ table_name │ table_values
-// ───┼────────────┼──────────────
-//  0 │ strings    │ [6 items]
-//  1 │ ints       │ [5 items]
-//  2 │ floats     │ [4 items]
-// ━━━┷━━━━━━━━━━━━┷━━━━━━━━━━━━━━
-//
-// In this case, this represents a sqlite database
-// with three tables named `strings`, `ints`, and `floats`.
-// The table_values represent the values for the tables:
-//
-// ━━━━┯━━━━━━━┯━━━━━━━━━━┯━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-//  #  │ x     │ y        │ z    │ f
-// ────┼───────┼──────────┼──────┼──────────────────────────────────────────────────────────────────────
-//   0 │ hello │ <binary> │      │
-//   1 │ hello │ <binary> │      │
-//   2 │ hello │ <binary> │      │
-//   3 │ hello │ <binary> │      │
-//   4 │ world │ <binary> │      │
-//   5 │ world │ <binary> │      │
-//   6 │       │          │    1 │
-//   7 │       │          │   42 │
-//   8 │       │          │  425 │
-//   9 │       │          │ 4253 │
-//  10 │       │          │      │
-//  11 │       │          │      │                                                    3.400000000000000
-//  12 │       │          │      │                                                    3.141592650000000
-//  13 │       │          │      │                                                    23.00000000000000
-//  14 │       │          │      │ this string that doesn't really belong here but sqlite is what it is
-// ━━━━┷━━━━━━━┷━━━━━━━━━━┷━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-//
-// We can see here that each table has different columns. `strings` has `x` and `y`, while
-// `ints` has just `z`, and `floats` has only the column `f`. This means, in general, when working
-// with sqlite, one will want to select a single table, e.g.:
-//
-// open sample.db | nth 1 | get table_values
-// ━━━┯━━━━━━
-//  # │ z
-// ───┼──────
-//  0 │    1
-//  1 │   42
-//  2 │  425
-//  3 │ 4253
-//  4 │
-// ━━━┷━━━━━━
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn parses_sqlite() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | get table_values
-            | nth 2
-            | get x
-        "#
-    ));
-
-    assert_eq!(actual.out, "hello");
-}
-
-#[test]
-fn parses_toml() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open cargo_sample.toml | get package.edition"
-    );
-
-    assert_eq!(actual.out, "2018");
-}
-
-#[test]
-fn parses_tsv() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open caco3_plastics.tsv
-            | first 1
-            | get origin
-        "#
-    ));
-
-    assert_eq!(actual.out, "SPAIN")
-}
-
-#[test]
-fn parses_json() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sgml_description.json
-            | get glossary.GlossDiv.GlossList.GlossEntry.GlossSee
-        "#
-    ));
-
-    assert_eq!(actual.out, "markup")
-}
-
-#[test]
-fn parses_xml() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open jonathan.xml | get rss.children.channel.children | get item.children | get link.children.0"
-    );
-
-    assert_eq!(
-        actual.out,
-        "http://www.jonathanturner.org/2015/10/off-to-new-adventures.html"
-    )
-}
-
-#[test]
-fn parses_ini() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open sample.ini | get SectionOne.integer"
-    );
-
-    assert_eq!(actual.out, "1234")
-}
-
-#[test]
-fn parses_utf16_ini() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open utf16.ini | rename info | get info | get IconIndex"
-    );
-
-    assert_eq!(actual.out, "-236")
-}
-
-#[test]
-fn errors_if_file_not_found() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open i_dont_exist.txt"
-    );
-    let expected = "Cannot find file";
-    assert!(
-        actual.err.contains(expected),
-        "Error:\n{}\ndoes not contain{}",
-        actual.err,
-        expected
-    );
-}
-
-#[test]
-fn open_dir_is_ls() {
-    Playground::setup("open_dir", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open .
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/parse.rs b/old_nushell/crates/nu-command/tests/commands/parse.rs
deleted file mode 100644
index 3b9c9c527..000000000
--- a/old_nushell/crates/nu-command/tests/commands/parse.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use nu_test_support::fs::Stub;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-mod simple {
-    use super::*;
-
-    #[test]
-    fn extracts_fields_from_the_given_the_pattern() {
-        Playground::setup("parse_test_1", |dirs, sandbox| {
-            sandbox.with_files(vec![Stub::FileWithContentToBeTrimmed(
-                "key_value_separated_arepa_ingredients.txt",
-                r#"
-                    VAR1=Cheese
-                    VAR2=JonathanParsed
-                    VAR3=NushellSecretIngredient
-                "#,
-            )]);
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open key_value_separated_arepa_ingredients.txt
-                    | lines
-                    | each { echo $it | parse "{Name}={Value}" }
-                    | nth 1
-                    | get Value
-                "#
-            ));
-
-            assert_eq!(actual.out, "JonathanParsed");
-        })
-    }
-
-    #[test]
-    fn double_open_curly_evalutes_to_a_single_curly() {
-        Playground::setup("parse_test_regex_2", |dirs, _sandbox| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo "{abc}123"
-                    | parse "{{abc}{name}"
-                    | get name
-                "#
-            ));
-
-            assert_eq!(actual.out, "123");
-        })
-    }
-
-    #[test]
-    fn properly_escapes_text() {
-        Playground::setup("parse_test_regex_3", |dirs, _sandbox| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo "(abc)123"
-                    | parse "(abc){name}"
-                    | get name
-                "#
-            ));
-
-            assert_eq!(actual.out, "123");
-        })
-    }
-
-    #[test]
-    fn properly_captures_empty_column() {
-        Playground::setup("parse_test_regex_4", |dirs, _sandbox| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo ["1:INFO:component:all is well" "2:ERROR::something bad happened"]
-                    | parse "{timestamp}:{level}:{tag}:{entry}"
-                    | get entry
-                    | nth 1
-                "#
-            ));
-
-            assert_eq!(actual.out, "something bad happened");
-        })
-    }
-
-    #[test]
-    fn errors_when_missing_closing_brace() {
-        Playground::setup("parse_test_regex_5", |dirs, _sandbox| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo "(abc)123"
-                    | parse "(abc){name"
-                    | get name
-                "#
-            ));
-
-            assert!(actual.err.contains("invalid parse pattern"));
-        })
-    }
-}
-
-mod regex {
-    use super::*;
-
-    fn nushell_git_log_oneline<'a>() -> Vec<Stub<'a>> {
-        vec![Stub::FileWithContentToBeTrimmed(
-            "nushell_git_log_oneline.txt",
-            r#"
-                ae87582c Fix missing invocation errors (#1846)
-                b89976da let format access variables also (#1842)
-            "#,
-        )]
-    }
-
-    #[test]
-    fn extracts_fields_with_all_named_groups() {
-        Playground::setup("parse_test_regex_1", |dirs, sandbox| {
-            sandbox.with_files(nushell_git_log_oneline());
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open nushell_git_log_oneline.txt
-                    | parse --regex "(?P<Hash>\w+) (?P<Message>.+) \(#(?P<PR>\d+)\)"
-                    | nth 1
-                    | get PR
-                "#
-            ));
-
-            assert_eq!(actual.out, "1842");
-        })
-    }
-
-    #[test]
-    fn extracts_fields_with_all_unnamed_groups() {
-        Playground::setup("parse_test_regex_2", |dirs, sandbox| {
-            sandbox.with_files(nushell_git_log_oneline());
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open nushell_git_log_oneline.txt
-                    | parse --regex "(\w+) (.+) \(#(\d+)\)"
-                    | nth 1
-                    | get Capture1
-                "#
-            ));
-
-            assert_eq!(actual.out, "b89976da");
-        })
-    }
-
-    #[test]
-    fn extracts_fields_with_named_and_unnamed_groups() {
-        Playground::setup("parse_test_regex_3", |dirs, sandbox| {
-            sandbox.with_files(nushell_git_log_oneline());
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open nushell_git_log_oneline.txt
-                    | parse --regex "(?P<Hash>\w+) (.+) \(#(?P<PR>\d+)\)"
-                    | nth 1
-                    | get Capture2
-                "#
-            ));
-
-            assert_eq!(actual.out, "let format access variables also");
-        })
-    }
-
-    #[test]
-    fn errors_with_invalid_regex() {
-        Playground::setup("parse_test_regex_1", |dirs, sandbox| {
-            sandbox.with_files(nushell_git_log_oneline());
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open nushell_git_log_oneline.txt
-                    | parse --regex "(?P<Hash>\w+ unfinished capture group"
-                "#
-            ));
-
-            assert!(actual.err.contains("unclosed group"));
-        })
-    }
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/basename.rs b/old_nushell/crates/nu-command/tests/commands/path/basename.rs
deleted file mode 100644
index a16c8202c..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/basename.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-use super::join_path_sep;
-
-#[test]
-fn returns_basename_of_empty_input() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "" 
-            | path basename
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn replaces_basename_of_empty_input() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "" 
-            | path basename -r newname.txt
-        "#
-    ));
-
-    assert_eq!(actual.out, "newname.txt");
-}
-
-#[test]
-fn returns_basename_of_path_ending_with_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/file.txt/." 
-            | path basename 
-        "#
-    ));
-
-    assert_eq!(actual.out, "file.txt");
-}
-
-#[test]
-fn replaces_basename_of_path_ending_with_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/file.txt/." 
-            | path basename -r viking.txt
-        "#
-    ));
-
-    let expected = join_path_sep(&["some", "viking.txt"]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn returns_basename_of_path_ending_with_double_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/file.txt/.." 
-            | path basename 
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn replaces_basename_of_path_ending_with_double_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/file.txt/.." 
-            | path basename -r eggs
-        "#
-    ));
-
-    let expected = join_path_sep(&["some/file.txt/..", "eggs"]);
-    assert_eq!(actual.out, expected);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/dirname.rs b/old_nushell/crates/nu-command/tests/commands/path/dirname.rs
deleted file mode 100644
index a935c1fb3..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/dirname.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-use super::join_path_sep;
-
-#[test]
-fn returns_dirname_of_empty_input() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "" 
-            | path dirname
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn replaces_dirname_of_empty_input() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "" 
-            | path dirname -r newdir
-        "#
-    ));
-
-    assert_eq!(actual.out, "newdir");
-}
-
-#[test]
-fn returns_dirname_of_path_ending_with_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/." 
-            | path dirname 
-        "#
-    ));
-
-    assert_eq!(actual.out, "some");
-}
-
-#[test]
-fn replaces_dirname_of_path_ending_with_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/." 
-            | path dirname -r eggs
-        "#
-    ));
-
-    let expected = join_path_sep(&["eggs", "dir"]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn returns_dirname_of_path_ending_with_double_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/.." 
-            | path dirname 
-        "#
-    ));
-
-    assert_eq!(actual.out, "some/dir");
-}
-
-#[test]
-fn replaces_dirname_of_path_with_double_dot() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/.." 
-            | path dirname -r eggs
-        "#
-    ));
-
-    let expected = join_path_sep(&["eggs", ".."]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn returns_dirname_of_zero_levels() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/with/spam.txt"
-            | path dirname -n 0
-        "#
-    ));
-
-    assert_eq!(actual.out, "some/dir/with/spam.txt");
-}
-
-#[test]
-fn replaces_dirname_of_zero_levels_with_empty_string() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/with/spam.txt"
-            | path dirname -n 0 -r ""
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn replaces_dirname_of_more_levels() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/with/spam.txt"
-            | path dirname -r eggs -n 2
-        "#
-    ));
-
-    let expected = join_path_sep(&["eggs", "with/spam.txt"]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn replaces_dirname_of_way_too_many_levels() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "some/dir/with/spam.txt"
-            | path dirname -r eggs -n 999
-        "#
-    ));
-
-    let expected = join_path_sep(&["eggs", "some/dir/with/spam.txt"]);
-    assert_eq!(actual.out, expected);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/exists.rs b/old_nushell/crates/nu-command/tests/commands/path/exists.rs
deleted file mode 100644
index 9a1b496e0..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/exists.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn checks_if_existing_file_exists() {
-    Playground::setup("path_exists_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "echo spam.txt | path exists"
-        );
-
-        assert_eq!(actual.out, "true");
-    })
-}
-
-#[test]
-fn checks_if_missing_file_exists() {
-    Playground::setup("path_exists_2", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "echo spam.txt | path exists"
-        );
-
-        assert_eq!(actual.out, "false");
-    })
-}
-
-#[test]
-fn checks_if_dot_exists() {
-    Playground::setup("path_exists_3", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "echo '.' | path exists"
-        );
-
-        assert_eq!(actual.out, "true");
-    })
-}
-
-#[test]
-fn checks_if_double_dot_exists() {
-    Playground::setup("path_exists_4", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "echo '..' | path exists"
-        );
-
-        assert_eq!(actual.out, "true");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/expand.rs b/old_nushell/crates/nu-command/tests/commands/path/expand.rs
deleted file mode 100644
index 08ca9dc58..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/expand.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-use std::path::PathBuf;
-
-#[test]
-fn expands_path_with_dot() {
-    Playground::setup("path_expand_1", |dirs, sandbox| {
-        sandbox
-            .within("menu")
-            .with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo "menu/./spam.txt" 
-                | path expand
-            "#
-        ));
-
-        let expected = dirs.test.join("menu").join("spam.txt");
-        assert_eq!(PathBuf::from(actual.out), expected);
-    })
-}
-
-#[test]
-fn expands_path_with_double_dot() {
-    Playground::setup("path_expand_2", |dirs, sandbox| {
-        sandbox
-            .within("menu")
-            .with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo "menu/../menu/spam.txt" 
-                | path expand
-            "#
-        ));
-
-        let expected = dirs.test.join("menu").join("spam.txt");
-        assert_eq!(PathBuf::from(actual.out), expected);
-    })
-}
-
-#[cfg(windows)]
-mod windows {
-    use super::*;
-
-    #[test]
-    fn expands_path_with_tilde_backward_slash() {
-        Playground::setup("path_expand_2", |dirs, _| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo "~\tmp.txt" | path expand
-                "#
-            ));
-
-            assert!(!PathBuf::from(actual.out).starts_with("~"));
-        })
-    }
-
-    #[test]
-    fn win_expands_path_with_tilde_forward_slash() {
-        Playground::setup("path_expand_2", |dirs, _| {
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    echo "~/tmp.txt" | path expand
-                "#
-            ));
-
-            assert!(!PathBuf::from(actual.out).starts_with("~"));
-        })
-    }
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/join.rs b/old_nushell/crates/nu-command/tests/commands/path/join.rs
deleted file mode 100644
index b7ffa7353..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/join.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-use super::join_path_sep;
-
-#[test]
-fn returns_path_joined_with_column_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo [ [name]; [eggs] ]
-            | path join spam.txt -c [ name ]
-            | get name
-        "#
-    ));
-
-    let expected = join_path_sep(&["eggs", "spam.txt"]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn returns_path_joined_from_list() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo [ home viking spam.txt ]
-            | path join
-        "#
-    ));
-
-    let expected = join_path_sep(&["home", "viking", "spam.txt"]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn appends_slash_when_joined_with_empty_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "/some/dir"
-            | path join ''
-        "#
-    ));
-
-    let expected = join_path_sep(&["/some/dir", ""]);
-    assert_eq!(actual.out, expected);
-}
-
-#[test]
-fn returns_joined_path_when_joining_empty_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo ""
-            | path join foo.txt
-        "#
-    ));
-
-    assert_eq!(actual.out, "foo.txt");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/mod.rs b/old_nushell/crates/nu-command/tests/commands/path/mod.rs
deleted file mode 100644
index c836c5691..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/mod.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-mod basename;
-mod dirname;
-mod exists;
-mod expand;
-mod join;
-mod parse;
-mod split;
-mod type_;
-
-use std::path::MAIN_SEPARATOR;
-
-/// Helper function that joins string literals with '/' or '\', based on host OS
-fn join_path_sep(pieces: &[&str]) -> String {
-    let sep_string = String::from(MAIN_SEPARATOR);
-    pieces.join(&sep_string)
-}
-
-#[cfg(windows)]
-#[test]
-fn joins_path_on_windows() {
-    let pieces = ["sausage", "bacon", "spam"];
-    let actual = join_path_sep(&pieces);
-
-    assert_eq!(&actual, "sausage\\bacon\\spam");
-}
-
-#[cfg(not(windows))]
-#[test]
-fn joins_path_on_other_than_windows() {
-    let pieces = ["sausage", "bacon", "spam"];
-    let actual = join_path_sep(&pieces);
-
-    assert_eq!(&actual, "sausage/bacon/spam");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/parse.rs b/old_nushell/crates/nu-command/tests/commands/path/parse.rs
deleted file mode 100644
index b4ffb3b65..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/parse.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[cfg(windows)]
-#[test]
-fn parses_single_path_prefix() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'C:\users\viking\spam.txt'
-            | path parse
-            | get prefix
-        "#
-    ));
-
-    assert_eq!(actual.out, "C:");
-}
-
-#[test]
-fn parses_single_path_parent() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.txt'
-            | path parse
-            | get parent
-        "#
-    ));
-
-    assert_eq!(actual.out, "home/viking");
-}
-
-#[test]
-fn parses_single_path_stem() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.txt'
-            | path parse
-            | get stem
-        "#
-    ));
-
-    assert_eq!(actual.out, "spam");
-}
-
-#[test]
-fn parses_custom_extension_gets_extension() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.tar.gz'
-            | path parse -e tar.gz
-            | get extension
-        "#
-    ));
-
-    assert_eq!(actual.out, "tar.gz");
-}
-
-#[test]
-fn parses_custom_extension_gets_stem() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.tar.gz'
-            | path parse -e tar.gz
-            | get stem
-        "#
-    ));
-
-    assert_eq!(actual.out, "spam");
-}
-
-#[test]
-fn parses_ignoring_extension_gets_extension() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.tar.gz'
-            | path parse -e ''
-            | get extension
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn parses_ignoring_extension_gets_stem() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.tar.gz'
-            | path parse -e ""
-            | get stem
-        "#
-    ));
-
-    assert_eq!(actual.out, "spam.tar.gz");
-}
-
-#[test]
-fn parses_column_path_extension() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo [[home, barn]; ['home/viking/spam.txt', 'barn/cow/moo.png']]
-            | path parse -c [ home barn ]
-            | get barn
-            | get extension
-        "#
-    ));
-
-    assert_eq!(actual.out, "png");
-}
-
-#[test]
-fn parses_into_correct_number_of_columns() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo 'home/viking/spam.txt'
-            | path parse
-            | pivot
-            | get Column0
-            | length
-        "#
-    ));
-
-    #[cfg(windows)]
-    let expected = "4";
-    #[cfg(not(windows))]
-    let expected = "3";
-
-    assert_eq!(actual.out, expected);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/split.rs b/old_nushell/crates/nu-command/tests/commands/path/split.rs
deleted file mode 100644
index 97f1cbd37..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/split.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn splits_empty_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo '' | path split
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn splits_correctly_single_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo ['home/viking/spam.txt']
-            | path split
-            | last
-        "#
-    ));
-
-    assert_eq!(actual.out, "spam.txt");
-}
-
-#[test]
-fn splits_correctly_with_column_path() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo [
-                [home, barn];
-
-                ['home/viking/spam.txt', 'barn/cow/moo.png']
-                ['home/viking/eggs.txt', 'barn/goat/cheese.png']
-            ]
-            | path split -c [ home barn ]
-            | get barn
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "6");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/path/type_.rs b/old_nushell/crates/nu-command/tests/commands/path/type_.rs
deleted file mode 100644
index 0699767f8..000000000
--- a/old_nushell/crates/nu-command/tests/commands/path/type_.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn returns_type_of_missing_file() {
-    let actual = nu!(
-        cwd: "tests", pipeline(
-        r#"
-            echo "spam.txt" 
-            | path type
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn returns_type_of_existing_file() {
-    Playground::setup("path_expand_1", |dirs, sandbox| {
-        sandbox
-            .within("menu")
-            .with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo "menu" 
-                | path type
-            "#
-        ));
-
-        assert_eq!(actual.out, "Dir");
-    })
-}
-
-#[test]
-fn returns_type_of_existing_directory() {
-    Playground::setup("path_expand_1", |dirs, sandbox| {
-        sandbox
-            .within("menu")
-            .with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                echo "menu/spam.txt" 
-                | path type
-            "#
-        ));
-
-        assert_eq!(actual.out, "File");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/pathvar/mod.rs b/old_nushell/crates/nu-command/tests/commands/pathvar/mod.rs
deleted file mode 100644
index 2ac3fd138..000000000
--- a/old_nushell/crates/nu-command/tests/commands/pathvar/mod.rs
+++ /dev/null
@@ -1,380 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::fs::{AbsolutePath, DisplayPath};
-use nu_test_support::playground::{says, Playground};
-use nu_test_support::{nu, NATIVE_PATH_ENV_SEPARATOR};
-
-use std::path::PathBuf;
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-/// Helper function that joins string literals with ':' or ';', based on host OS
-fn join_env_sep(pieces: &[&str]) -> String {
-    let sep_string = String::from(NATIVE_PATH_ENV_SEPARATOR);
-    pieces.join(&sep_string)
-}
-
-// Helpers
-
-#[cfg(windows)]
-#[test]
-fn joins_env_on_windows() {
-    let pieces = ["sausage", "bacon", "spam"];
-    let actual = join_env_sep(&pieces);
-
-    assert_eq!(&actual, "sausage;bacon;spam");
-}
-
-#[cfg(not(windows))]
-#[test]
-fn joins_env_on_non_windows() {
-    let pieces = ["sausage", "bacon", "spam"];
-    let actual = join_env_sep(&pieces);
-
-    assert_eq!(&actual, "sausage:bacon:spam");
-}
-
-// The following tests don't work on Windows likely because of this issue:
-//   https://github.com/nushell/nushell/issues/3831
-//
-// fn pathvar_correctly_reads_path_from_config_and_env()
-// fn pathvar_correctly_reads_path_from_env()
-// fn pathvar_saves_new_path_to_config()
-//
-// Requires also auto-reading other-than-path env vars from config:
-// fn pathvar_correctly_reads_env_var_from_config_and_env()
-// fn pathvar_correctly_reads_env_var_from_config()
-
-// pathvar
-
-#[test]
-fn pathvar_correctly_reads_path_from_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/andresrobalino/.volta/bin", "/Users/mosqueteros/bin"]
-                "#,
-            )])
-            .with_config(&file);
-
-        let expected = "/Users/andresrobalino/.volta/bin-/Users/mosqueteros/bin";
-        let actual = sandbox.pipeline(r#" pathvar | first 2 | str collect '-' "#);
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_correctly_reads_env_var_from_env() {
-    Playground::setup("hi_there", |_, sandbox| {
-        sandbox.with_env("BREAKFAST", &join_env_sep(&["bacon", "spam"]));
-
-        let expected = "bacon-spam";
-        let actual = sandbox.pipeline(r#" pathvar -v BREAKFAST | str collect '-' "#);
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-// pathvar add
-
-#[test]
-fn pathvar_adds_to_path() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/mosquito/proboscis"]
-                "#,
-            )])
-            .with_config(&file);
-
-        let expected = "spam";
-        let actual = sandbox.pipeline(r#" pathvar add spam; pathvar | first "#);
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_adds_to_env_var() {
-    Playground::setup("hi_there", |_, sandbox| {
-        sandbox.with_env("BREAKFAST", &join_env_sep(&["egg", "sausage", "bacon"]));
-
-        let expected = join_env_sep(&["spam", "egg", "sausage", "bacon"]);
-        let actual = sandbox.pipeline(
-            r#" 
-                pathvar add -v BREAKFAST spam
-                $nu.env.BREAKFAST
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(&expected));
-    })
-}
-
-// pathvar append
-
-#[test]
-fn pathvar_appends_to_path() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/mosquito/proboscis"]
-                "#,
-            )])
-            .with_config(&file);
-
-        let expected = "spam";
-        let actual = sandbox.pipeline(r#" pathvar append spam; pathvar | last "#);
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_appends_to_env_var() {
-    Playground::setup("hi_there", |_, sandbox| {
-        sandbox.with_env("BREAKFAST", &join_env_sep(&["egg", "sausage", "bacon"]));
-
-        let expected = join_env_sep(&["egg", "sausage", "bacon", "spam"]);
-        let actual = sandbox.pipeline(
-            r#" 
-                pathvar append -v BREAKFAST spam
-                $nu.env.BREAKFAST
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(&expected));
-    })
-}
-
-// pathvar remove
-
-#[test]
-fn pathvar_removes_from_path() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/mosquito/proboscis", "spam"]
-                "#,
-            )])
-            .with_config(&file);
-
-        let expected = "/Users/mosquito/proboscis";
-        let actual = sandbox.pipeline(r#" pathvar remove 1; pathvar | first "#);
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_removes_from_env_var() {
-    Playground::setup("hi_there", |_, sandbox| {
-        sandbox.with_env(
-            "BREAKFAST",
-            &join_env_sep(&["egg", "sausage", "bacon", "spam"]),
-        );
-
-        let expected = join_env_sep(&["egg", "sausage", "bacon"]);
-        let actual = sandbox.pipeline(
-            r#" 
-                pathvar remove -v BREAKFAST 3
-                $nu.env.BREAKFAST
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(&expected));
-    })
-}
-
-// pathvar reset
-
-#[test]
-fn pathvar_resets_path_from_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/andresrobalino/.volta/bin", "/Users/mosqueteros/bin"]
-                "#,
-            )])
-            .with_config(&file)
-            .with_env(
-                nu_test_support::NATIVE_PATH_ENV_VAR,
-                &PathBuf::from("/Users/mosquito/proboscis").display_path(),
-            );
-
-        let expected = "/Users/andresrobalino/.volta/bin-/Users/mosqueteros/bin";
-        let actual = sandbox.pipeline(
-            r#"
-                pathvar reset
-                pathvar | str collect '-'
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_resets_env_var_from_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    breakfast = ["egg", "sausage", "bacon"]
-                "#,
-            )])
-            .with_config(&file)
-            .with_env(
-                "BREAKFAST",
-                &join_env_sep(&["egg", "sausage", "bacon", "spam"]),
-            );
-
-        let expected = "egg-sausage-bacon";
-        let actual = sandbox.pipeline(
-            r#"
-                pathvar reset -v BREAKFAST
-                pathvar -v BREAKFAST | str collect '-'
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-// pathvar save
-
-#[test]
-fn pathvar_saves_path_to_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    path = ["/Users/andresrobalino/.volta/bin", "/Users/mosqueteros/bin"]
-                "#,
-            )])
-            .with_config(&file);
-
-        let expected = "/Users/mosquito/proboscis";
-        let actual = sandbox.pipeline(
-            r#"
-                pathvar append "/Users/mosquito/proboscis"
-                pathvar save
-                (config).path | last
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_saves_env_var_to_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-
-                    breakfast = ["egg", "sausage", "bacon"]
-                "#,
-            )])
-            .with_config(&file)
-            .with_env("BREAKFAST", "spam");
-
-        let expected = "spam";
-        let actual = sandbox.pipeline(
-            r#"
-                pathvar save -v BREAKFAST
-                (config).breakfast | str collect '-'
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-#[test]
-fn pathvar_saves_new_env_var_to_config() {
-    Playground::setup("hi_there", |dirs, sandbox| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        sandbox
-            .with_files(vec![FileWithContent(
-                "config.toml",
-                r#"
-                    skip_welcome_message = true
-                "#,
-            )])
-            .with_config(&file)
-            .with_env("BREAKFAST", "spam");
-
-        let expected = "spam";
-        let actual = sandbox.pipeline(
-            r#"
-                pathvar save -v BREAKFAST
-                (config).breakfast | str collect '-'
-            "#,
-        );
-
-        assert_that!(actual, says().stdout(expected));
-    })
-}
-
-// test some errors
-
-#[test]
-fn pathvar_error_non_existent_env_var() {
-    Playground::setup("hi_there", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "pathvar -v EGGS_BACON_SPAM_SAUSAGE_SPAM_AND_SPAM_WITH_EXTRA_SPAM"
-        );
-
-        assert!(actual.err.contains("Error"));
-        assert!(actual.err.contains("not set"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/prepend.rs b/old_nushell/crates/nu-command/tests/commands/prepend.rs
deleted file mode 100644
index 1c872becb..000000000
--- a/old_nushell/crates/nu-command/tests/commands/prepend.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn adds_a_row_to_the_beginning() {
-    Playground::setup("prepend_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                Andrés N. Robalino
-                Jonathan Turner
-                Yehuda Katz
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | lines
-                | prepend "pollo loco"
-                | nth 0
-                "#
-        ));
-
-        assert_eq!(actual.out, "pollo loco");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/bool.rs b/old_nushell/crates/nu-command/tests/commands/random/bool.rs
deleted file mode 100644
index 862ba2840..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/bool.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn generates_a_bool() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random bool
-        "#
-    ));
-
-    let output = actual.out;
-    let is_boolean_output = output == "true" || output == "false";
-
-    assert!(is_boolean_output);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/chars.rs b/old_nushell/crates/nu-command/tests/commands/random/chars.rs
deleted file mode 100644
index c77f34736..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/chars.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn generates_chars_of_specified_length() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random chars -l 15 | size | get chars
-        "#
-    ));
-
-    let result = actual.out;
-    assert_eq!(result, "15");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/decimal.rs b/old_nushell/crates/nu-command/tests/commands/random/decimal.rs
deleted file mode 100644
index 0e78509a7..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/decimal.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn generates_an_decimal() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random decimal 42..43
-        "#
-    ));
-
-    assert!(actual.out.contains("42") || actual.out.contains("43"));
-}
-
-#[test]
-fn generates_55() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random decimal 55..55
-        "#
-    ));
-
-    assert!(actual.out.contains("55"));
-}
-
-#[test]
-fn generates_0() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random decimal ..<1
-        "#
-    ));
-
-    assert!(actual.out.contains('0'));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/dice.rs b/old_nushell/crates/nu-command/tests/commands/random/dice.rs
deleted file mode 100644
index a056f07c9..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/dice.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn rolls_4_roll() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random dice -d 4 -s 10 | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "4");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/integer.rs b/old_nushell/crates/nu-command/tests/commands/random/integer.rs
deleted file mode 100644
index 80cc8f5a2..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/integer.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn generates_an_integer() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random integer 42..43
-        "#
-    ));
-
-    assert!(actual.out.contains("42") || actual.out.contains("43"));
-}
-
-#[test]
-fn generates_55() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random integer 55..55
-        "#
-    ));
-
-    assert!(actual.out.contains("55"));
-}
-
-#[test]
-fn generates_0() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random integer ..<1
-        "#
-    ));
-
-    assert!(actual.out.contains('0'));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/random/mod.rs b/old_nushell/crates/nu-command/tests/commands/random/mod.rs
deleted file mode 100644
index 9b3bf6eb8..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod bool;
-mod chars;
-mod decimal;
-mod dice;
-mod integer;
-#[cfg(feature = "uuid_crate")]
-mod uuid;
diff --git a/old_nushell/crates/nu-command/tests/commands/random/uuid.rs b/old_nushell/crates/nu-command/tests/commands/random/uuid.rs
deleted file mode 100644
index 725081383..000000000
--- a/old_nushell/crates/nu-command/tests/commands/random/uuid.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-use uuid_crate::Uuid;
-
-#[test]
-fn generates_valid_uuid4() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        random uuid
-        "#
-    ));
-
-    let result = Uuid::parse_str(actual.out.as_str());
-
-    assert!(result.is_ok());
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/range.rs b/old_nushell/crates/nu-command/tests/commands/range.rs
deleted file mode 100644
index 7aa3e4e66..000000000
--- a/old_nushell/crates/nu-command/tests/commands/range.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn selects_a_row() {
-    Playground::setup("range_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("notes.txt"), EmptyFile("tests.txt")]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | sort-by name
-                | range 0..0
-                | get name
-            "#
-        ));
-
-        assert_eq!(actual.out, "notes.txt");
-    });
-}
-
-#[test]
-fn selects_some_rows() {
-    Playground::setup("range_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("notes.txt"),
-            EmptyFile("tests.txt"),
-            EmptyFile("persons.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | range 1..2
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    });
-}
-
-#[test]
-fn negative_indices() {
-    Playground::setup("range_test_negative_indices", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("notes.txt"),
-            EmptyFile("tests.txt"),
-            EmptyFile("persons.txt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | range (-1..)
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "1");
-    });
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/reduce.rs b/old_nushell/crates/nu-command/tests/commands/reduce.rs
deleted file mode 100644
index dee4cd224..000000000
--- a/old_nushell/crates/nu-command/tests/commands/reduce.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn reduce_table_column() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "[{month:2,total:30}, {month:3,total:10}, {month:4,total:3}, {month:5,total:60}]"
-        | from json
-        | get total
-        | reduce -f 20 { $it + (math eval $"($acc)^1.05")}
-        | into string -d 1
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "180.6");
-}
-
-#[test]
-fn reduce_table_column_with_path() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "[{month:2,total:30}, {month:3,total:10}, {month:4,total:3}, {month:5,total:60}]"
-        | from json
-        | reduce -f 20 { $it.total + (math eval $"($acc)^1.05")}
-        | into string -d 1
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "180.6");
-}
-
-#[test]
-fn reduce_rows_example() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo a,b 1,2 3,4
-        | split column ,
-        | headers
-        | reduce -f 1.6 { $acc * ($it.a | str to-int) + ($it.b | str to-int) }
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "14.8");
-}
-
-#[test]
-fn reduce_numbered_example() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo one longest three bar
-        | reduce -n { if ($it.item | str length) > ($acc.item | str length) {echo $it} {echo $acc}}
-        | get index
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn reduce_numbered_integer_addition_example() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo [1 2 3 4]
-        | reduce -n { $acc.item + $it.item }
-        | get item
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "10");
-}
-
-#[test]
-fn folding_with_tables() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo [10 20 30 40]
-        | reduce -f [] {
-            with-env [value $it] {
-              echo $acc | append (10 * ($nu.env.value | str to-int))
-            }
-          }
-        | math sum
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "1000");
-}
-
-#[test]
-fn error_reduce_fold_type_mismatch() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo a b c | reduce -f 0 { $acc + $it }
-        "#
-        )
-    );
-
-    assert!(actual.err.contains("Coercion"));
-}
-
-#[test]
-fn error_reduce_empty() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        reduce { $acc + $it }
-        "#
-        )
-    );
-
-    assert!(actual.err.contains("needs input"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/rename.rs b/old_nushell/crates/nu-command/tests/commands/rename.rs
deleted file mode 100644
index f4ea04b66..000000000
--- a/old_nushell/crates/nu-command/tests/commands/rename.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn changes_the_column_name() {
-    Playground::setup("rename_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_cuatro_mosqueteros.txt",
-            r#"
-                Andrés N. Robalino
-                Jonathan Turner
-                Yehuda Katz
-                Jason Gedge
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_cuatro_mosqueteros.txt
-                | lines
-                | wrap name
-                | rename mosqueteros
-                | get mosqueteros
-                | length
-                "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn keeps_remaining_original_names_given_less_new_names_than_total_original_names() {
-    Playground::setup("rename_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_cuatro_mosqueteros.txt",
-            r#"
-                Andrés N. Robalino
-                Jonathan Turner
-                Yehuda Katz
-                Jason Gedge
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_cuatro_mosqueteros.txt
-                | lines
-                | wrap name
-                | default hit "arepa!"
-                | rename mosqueteros
-                | get hit
-                | length
-                "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn errors_if_no_columns_present() {
-    Playground::setup("rename_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_cuatro_mosqueteros.txt",
-            r#"
-                Andrés N. Robalino
-                Jonathan Turner
-                Yehuda Katz
-                Jason Gedge
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_cuatro_mosqueteros.txt
-                | lines
-                | rename mosqueteros
-                "#
-        ));
-
-        assert!(actual.err.contains("no column names available"));
-        assert!(actual.err.contains("can't rename"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/reverse.rs b/old_nushell/crates/nu-command/tests/commands/reverse.rs
deleted file mode 100644
index e994aa492..000000000
--- a/old_nushell/crates/nu-command/tests/commands/reverse.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn can_get_reverse_first() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "ls | sort-by name | reverse | first 1 | get name | str trim "
-    );
-
-    assert_eq!(actual.out, "utf16.ini");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/rm.rs b/old_nushell/crates/nu-command/tests/commands/rm.rs
deleted file mode 100644
index ae7e35828..000000000
--- a/old_nushell/crates/nu-command/tests/commands/rm.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-use nu_test_support::fs::{files_exist_at, Stub::EmptyFile};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn removes_a_file() {
-    Playground::setup("rm_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("i_will_be_deleted.txt")]);
-
-        nu!(
-            cwd: dirs.root(),
-            "rm rm_test_1/i_will_be_deleted.txt"
-        );
-
-        let path = dirs.test().join("i_will_be_deleted.txt");
-
-        assert!(!path.exists());
-    })
-}
-
-#[test]
-fn removes_files_with_wildcard() {
-    Playground::setup("rm_test_2", |dirs, sandbox| {
-        sandbox
-            .within("src")
-            .with_files(vec![
-                EmptyFile("cli.rs"),
-                EmptyFile("lib.rs"),
-                EmptyFile("prelude.rs"),
-            ])
-            .within("src/parser")
-            .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")])
-            .within("src/parser/parse")
-            .with_files(vec![EmptyFile("token_tree.rs")])
-            .within("src/parser/hir")
-            .with_files(vec![
-                EmptyFile("baseline_parse.rs"),
-                EmptyFile("baseline_parse_tokens.rs"),
-            ]);
-
-        nu!(
-            cwd: dirs.test(),
-            r#"rm "src/*/*/*.rs""#
-        );
-
-        assert!(!files_exist_at(
-            vec![
-                "src/parser/parse/token_tree.rs",
-                "src/parser/hir/baseline_parse.rs",
-                "src/parser/hir/baseline_parse_tokens.rs"
-            ],
-            dirs.test()
-        ));
-
-        assert_eq!(
-            Playground::glob_vec(&format!("{}/src/*/*/*.rs", dirs.test().display())),
-            Vec::<std::path::PathBuf>::new()
-        );
-    })
-}
-
-#[test]
-fn removes_deeply_nested_directories_with_wildcard_and_recursive_flag() {
-    Playground::setup("rm_test_3", |dirs, sandbox| {
-        sandbox
-            .within("src")
-            .with_files(vec![
-                EmptyFile("cli.rs"),
-                EmptyFile("lib.rs"),
-                EmptyFile("prelude.rs"),
-            ])
-            .within("src/parser")
-            .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")])
-            .within("src/parser/parse")
-            .with_files(vec![EmptyFile("token_tree.rs")])
-            .within("src/parser/hir")
-            .with_files(vec![
-                EmptyFile("baseline_parse.rs"),
-                EmptyFile("baseline_parse_tokens.rs"),
-            ]);
-
-        nu!(
-            cwd: dirs.test(),
-            "rm -r src/*"
-        );
-
-        assert!(!files_exist_at(
-            vec!["src/parser/parse", "src/parser/hir"],
-            dirs.test()
-        ));
-    })
-}
-
-#[test]
-fn removes_directory_contents_without_recursive_flag_if_empty() {
-    Playground::setup("rm_test_4", |dirs, _| {
-        nu!(
-            cwd: dirs.root(),
-            "rm rm_test_4"
-        );
-
-        assert!(!dirs.test().exists());
-    })
-}
-
-#[test]
-fn removes_directory_contents_with_recursive_flag() {
-    Playground::setup("rm_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-        ]);
-
-        nu!(
-            cwd: dirs.root(),
-            "rm rm_test_5 --recursive"
-        );
-
-        assert!(!dirs.test().exists());
-    })
-}
-
-#[test]
-fn errors_if_attempting_to_delete_a_directory_with_content_without_recursive_flag() {
-    Playground::setup("rm_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("some_empty_file.txt")]);
-        let actual = nu!(
-            cwd: dirs.root(),
-            "rm rm_test_6"
-        );
-
-        assert!(dirs.test().exists());
-        assert!(actual.err.contains("cannot remove non-empty directory"));
-    })
-}
-
-#[test]
-fn errors_if_attempting_to_delete_single_dot_as_argument() {
-    Playground::setup("rm_test_7", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.root(),
-            "rm ."
-        );
-
-        assert!(actual.err.contains("cannot remove any parent directory"));
-    })
-}
-
-#[test]
-fn errors_if_attempting_to_delete_two_dot_as_argument() {
-    Playground::setup("rm_test_8", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.root(),
-            "rm .."
-        );
-
-        assert!(actual.err.contains("cannot remove any parent directory"));
-    })
-}
-
-#[test]
-fn removes_multiple_directories() {
-    Playground::setup("rm_test_9", |dirs, sandbox| {
-        sandbox
-            .within("src")
-            .with_files(vec![EmptyFile("a.rs"), EmptyFile("b.rs")])
-            .within("src/cli")
-            .with_files(vec![EmptyFile("c.rs"), EmptyFile("d.rs")])
-            .within("test")
-            .with_files(vec![EmptyFile("a_test.rs"), EmptyFile("b_test.rs")]);
-
-        nu!(
-            cwd: dirs.test(),
-            "rm src test --recursive"
-        );
-
-        assert_eq!(
-            Playground::glob_vec(&format!("{}/*", dirs.test().display())),
-            Vec::<std::path::PathBuf>::new()
-        );
-    })
-}
-
-#[test]
-fn removes_multiple_files() {
-    Playground::setup("rm_test_10", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.txt"),
-        ]);
-
-        nu!(
-            cwd: dirs.test(),
-            "rm yehuda.txt jonathan.txt andres.txt"
-        );
-
-        assert_eq!(
-            Playground::glob_vec(&format!("{}/*", dirs.test().display())),
-            Vec::<std::path::PathBuf>::new()
-        );
-    })
-}
-
-#[test]
-fn removes_multiple_files_with_asterisks() {
-    Playground::setup("rm_test_11", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("andres.toml"),
-        ]);
-
-        nu!(
-            cwd: dirs.test(),
-            "rm *.txt *.toml"
-        );
-
-        assert_eq!(
-            Playground::glob_vec(&format!("{}/*", dirs.test().display())),
-            Vec::<std::path::PathBuf>::new()
-        );
-    })
-}
-
-#[test]
-fn allows_doubly_specified_file() {
-    Playground::setup("rm_test_12", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("yehuda.txt"), EmptyFile("jonathan.toml")]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "rm *.txt yehuda* *.toml"
-        );
-
-        assert_eq!(
-            Playground::glob_vec(&format!("{}/*", dirs.test().display())),
-            Vec::<std::path::PathBuf>::new()
-        );
-        assert!(!actual.out.contains("error"))
-    })
-}
-
-#[test]
-fn remove_files_from_two_parents_up_using_multiple_dots_and_glob() {
-    Playground::setup("rm_test_13", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("yehuda.txt"),
-            EmptyFile("jonathan.txt"),
-            EmptyFile("kevin.txt"),
-        ]);
-
-        sandbox.within("foo").mkdir("bar");
-
-        nu!(
-            cwd: dirs.test().join("foo/bar"),
-            "rm .../*.txt"
-        );
-
-        assert!(!files_exist_at(
-            vec!["yehuda.txt", "jonathan.txt", "kevin.txt"],
-            dirs.test()
-        ));
-    })
-}
-
-#[test]
-fn no_errors_if_attempting_to_delete_non_existent_file_with_f_flag() {
-    Playground::setup("rm_test_14", |dirs, _| {
-        let actual = nu!(
-            cwd: dirs.root(),
-            "rm -f non_existent_file.txt"
-        );
-
-        assert!(!actual.err.contains("no valid path"));
-    })
-}
-
-#[test]
-fn rm_wildcard_keeps_dotfiles() {
-    Playground::setup("rm_test_15", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("foo"), EmptyFile(".bar")]);
-
-        nu!(
-            cwd: dirs.test(),
-            r#"rm *"#
-        );
-
-        assert!(!files_exist_at(vec!["foo"], dirs.test()));
-        assert!(files_exist_at(vec![".bar"], dirs.test()));
-    })
-}
-
-#[test]
-fn rm_wildcard_leading_dot_deletes_dotfiles() {
-    Playground::setup("rm_test_16", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("foo"), EmptyFile(".bar")]);
-
-        nu!(
-            cwd: dirs.test(),
-            r#"rm .*"#
-        );
-
-        assert!(files_exist_at(vec!["foo"], dirs.test()));
-        assert!(!files_exist_at(vec![".bar"], dirs.test()));
-    })
-}
-
-#[test]
-fn removes_files_with_case_sensitive_glob_matches_by_default() {
-    Playground::setup("glob_test", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("A0"), EmptyFile("a1")]);
-
-        nu!(
-            cwd: dirs.root(),
-            "rm glob_test/A*"
-        );
-
-        let deleted_path = dirs.test().join("A0");
-        let skipped_path = dirs.test().join("a1");
-
-        assert!(!deleted_path.exists());
-        assert!(skipped_path.exists());
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/roll.rs b/old_nushell/crates/nu-command/tests/commands/roll.rs
deleted file mode 100644
index d99a0c5dd..000000000
--- a/old_nushell/crates/nu-command/tests/commands/roll.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-mod rows {
-    use super::*;
-
-    fn table() -> String {
-        pipeline(
-            r#"
-            echo [
-                [service, status];
-            
-                [ruby,      DOWN] 
-                [db,        DOWN] 
-                [nud,       DOWN] 
-                [expected,  HERE]
-            ]"#,
-        )
-    }
-
-    #[test]
-    fn roll_down_by_default() {
-        let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table(), pipeline(r#"
-            roll
-            | first
-            | get status
-        "#)));
-
-        assert_eq!(actual.out, "HERE");
-    }
-
-    #[test]
-    fn can_roll_up() {
-        let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table(), pipeline(r#"
-            roll up 3
-            | first
-            | get status
-        "#)));
-
-        assert_eq!(actual.out, "HERE");
-    }
-}
-
-mod columns {
-    use super::*;
-
-    fn table() -> String {
-        pipeline(
-            r#"
-            echo [
-                [commit_author, origin,      stars];
-            
-                [     "Andres",     EC, amarillito] 
-                [     "Darren",     US,      black] 
-                [   "Jonathan",     US,      black] 
-                [     "Yehuda",     US,      black]
-                [      "Jason",     CA,       gold]
-            ]"#,
-        )
-    }
-
-    #[test]
-    fn roll_left_by_default() {
-        let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table(), pipeline(r#"
-            roll column
-            | get
-            | str collect "-"
-        "#)));
-
-        assert_eq!(actual.out, "origin-stars-commit_author");
-    }
-
-    #[test]
-    fn can_roll_in_the_opposite_direction() {
-        let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table(), pipeline(r#"
-            roll column 2 --opposite
-            | get
-            | str collect "-"
-        "#)));
-
-        assert_eq!(actual.out, "origin-stars-commit_author");
-    }
-
-    struct ThirtieTwo<'a>(usize, &'a str);
-
-    #[test]
-    fn can_roll_the_cells_only_keeping_the_header_names() {
-        let four_bitstring = bitstring_to_nu_row_pipeline("00000100");
-        let expected_value = ThirtieTwo(32, "bit1-bit2-bit3-bit4-bit5-bit6-bit7-bit8");
-
-        let actual = nu!(
-            cwd: ".",
-            format!("{} | roll column 3 --opposite --cells-only | get | str collect '-' ", four_bitstring)
-        );
-
-        assert_eq!(actual.out, expected_value.1);
-    }
-
-    #[test]
-    fn four_in_bitstring_left_shifted_with_three_bits_should_be_32_in_decimal() {
-        let four_bitstring = "00000100";
-        let expected_value = ThirtieTwo(32, "00100000");
-
-        assert_eq!(
-            shift_three_bits_to_the_left_to_bitstring(four_bitstring),
-            expected_value.0.to_string()
-        );
-    }
-
-    fn shift_three_bits_to_the_left_to_bitstring(bits: &str) -> String {
-        // this pipeline takes the bitstring and outputs a nu row literal
-        // for example the number 4 in bitstring:
-        //
-        //  input: 00000100
-        //
-        // output:
-        //  [
-        //   [Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8];
-        //   [      0,       0,       0,       0,       0,       1,       0,       0]
-        //  ]
-        //
-        let bitstring_as_nu_row_pipeline = bitstring_to_nu_row_pipeline(bits);
-
-        // this pipeline takes the nu bitstring row literal, computes it's
-        // decimal value.
-        let nu_row_literal_bitstring_to_decimal_value_pipeline = pipeline(
-            r#"
-            pivot bit --ignore-titles
-            | get bit
-            | reverse
-            | each --numbered {
-                $it.item * (2 ** $it.index)
-            }
-            | math sum
-        "#,
-        );
-
-        nu!(
-            cwd: ".",
-            format!("{} | roll column 3 | {}", bitstring_as_nu_row_pipeline, nu_row_literal_bitstring_to_decimal_value_pipeline)
-        ).out
-    }
-
-    fn bitstring_to_nu_row_pipeline(bits: &str) -> String {
-        format!(
-            "echo '{}' | {}",
-            bits,
-            pipeline(
-                r#"
-            split chars
-            | each { str to-int }
-            | rotate counter-clockwise _
-            | reject _
-            | rename bit1 bit2 bit3 bit4 bit5 bit6 bit7 bit8
-        "#
-            )
-        )
-    }
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/rotate.rs b/old_nushell/crates/nu-command/tests/commands/rotate.rs
deleted file mode 100644
index 0432d89d5..000000000
--- a/old_nushell/crates/nu-command/tests/commands/rotate.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn counter_clockwise() {
-    let table = pipeline(
-        r#"
-        echo [
-            [col1, col2, EXPECTED];
-          
-            [---, "|||",      XX1]
-            [---, "|||",      XX2]
-            [---, "|||",      XX3]
-        ]
-    "#,
-    );
-
-    let expected = nu!(cwd: ".", pipeline(
-        r#"
-        echo [
-            [  Column0, Column1, Column2, Column3];
-
-            [ EXPECTED,    XX1,      XX2,     XX3]
-            [     col2,  "|||",    "|||",   "|||"]
-            [     col1,    ---,      ---,     ---]
-        ]
-        | where Column0 == EXPECTED
-        | get Column1 Column2 Column3
-        | str collect "-"
-        "#,
-    ));
-
-    let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table, pipeline(r#"
-            rotate counter-clockwise
-            | where Column0 == EXPECTED
-            | get Column1 Column2 Column3
-            | str collect "-"
-        "#)));
-
-    assert_eq!(actual.out, expected.out);
-}
-
-#[test]
-fn clockwise() {
-    let table = pipeline(
-        r#"
-        echo [
-            [col1,  col2, EXPECTED];
-          
-            [ ---, "|||",      XX1]
-            [ ---, "|||",      XX2]
-            [ ---, "|||",      XX3]
-        ]
-    "#,
-    );
-
-    let expected = nu!(cwd: ".", pipeline(
-        r#"
-        echo [
-            [ Column0, Column1, Column2,  Column3];
-
-            [     ---,     ---,     ---,     col1]
-            [   "|||",   "|||",   "|||",     col2]
-            [     XX3,     XX2,     XX1, EXPECTED]
-        ]
-        | where Column3 == EXPECTED
-        | get Column0 Column1 Column2
-        | str collect "-"
-        "#,
-    ));
-
-    let actual = nu!(
-        cwd: ".",
-        format!("{} | {}", table, pipeline(r#"
-            rotate
-            | where Column3 == EXPECTED
-            | get Column0 Column1 Column2
-            | str collect "-"
-        "#)));
-
-    assert_eq!(actual.out, expected.out);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/save.rs b/old_nushell/crates/nu-command/tests/commands/save.rs
deleted file mode 100644
index ff953bcfb..000000000
--- a/old_nushell/crates/nu-command/tests/commands/save.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use nu_test_support::fs::{file_contents, Stub::FileWithContent};
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn figures_out_intelligently_where_to_write_out_with_metadata() {
-    Playground::setup("save_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "cargo_sample.toml",
-            r#"
-                [package]
-                name = "nu"
-                version = "0.1.1"
-                authors = ["Yehuda Katz <wycats@gmail.com>"]
-                description = "A shell for the GitHub era"
-                license = "ISC"
-                edition = "2018"
-            "#,
-        )]);
-
-        let subject_file = dirs.test().join("cargo_sample.toml");
-
-        nu!(
-            cwd: dirs.root(),
-            "open save_test_1/cargo_sample.toml | save"
-        );
-
-        let actual = file_contents(&subject_file);
-        assert!(actual.contains("0.1.1"));
-    })
-}
-
-#[test]
-fn writes_out_csv() {
-    Playground::setup("save_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![]);
-
-        let expected_file = dirs.test().join("cargo_sample.csv");
-
-        nu!(
-            cwd: dirs.root(),
-            r#"echo [[name, version, description, license, edition]; [nu, "0.14", "A new type of shell", "MIT", "2018"]] | save save_test_2/cargo_sample.csv"#,
-        );
-
-        let actual = file_contents(expected_file);
-        println!("{}", actual);
-        assert!(actual.contains("nu,0.14,A new type of shell,MIT,2018"));
-    })
-}
-
-#[test]
-fn save_append_will_create_file_if_not_exists() {
-    Playground::setup("save_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![]);
-
-        let expected_file = dirs.test().join("new-file.txt");
-
-        nu!(
-            cwd: dirs.root(),
-            r#"echo hello | save --raw --append save_test_3/new-file.txt"#,
-        );
-
-        let actual = file_contents(expected_file);
-        println!("{}", actual);
-        assert!(actual == "hello");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/select.rs b/old_nushell/crates/nu-command/tests/commands/select.rs
deleted file mode 100644
index cb79f8142..000000000
--- a/old_nushell/crates/nu-command/tests/commands/select.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn regular_columns() {
-    let actual = nu!(cwd: ".", pipeline(
-        r#"
-            echo [
-                [first_name, last_name, rusty_at, type];
-
-                [Andrés Robalino 10/11/2013 A]
-                [Jonathan Turner 10/12/2013 B]
-                [Yehuda Katz 10/11/2013 A]
-            ]
-            | select rusty_at last_name
-            | nth 0
-            | get last_name
-        "#
-    ));
-
-    assert_eq!(actual.out, "Robalino");
-}
-
-#[test]
-fn complex_nested_columns() {
-    Playground::setup("select_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.json",
-            r#"
-                {
-                    "nu": {
-                        "committers": [
-                            {"name": "Andrés N. Robalino"},
-                            {"name": "Jonathan Turner"},
-                            {"name": "Yehuda Katz"}
-                        ],
-                        "releases": [
-                            {"version": "0.2"}
-                            {"version": "0.8"},
-                            {"version": "0.9999999"}
-                        ],
-                        "0xATYKARNU": [
-                            ["Th", "e", " "],
-                            ["BIG", " ", "UnO"],
-                            ["punto", "cero"]
-                        ]
-                    }
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.json
-                | select nu."0xATYKARNU" nu.committers.name nu.releases.version
-                | where nu_releases_version > "0.8"
-                | get nu_releases_version
-            "#
-        ));
-
-        assert_eq!(actual.out, "0.9999999");
-    })
-}
-
-#[test]
-fn allows_if_given_unknown_column_name_is_missing() {
-    let actual = nu!(cwd: ".", pipeline(
-        r#"
-            echo [
-                [first_name, last_name, rusty_at, type];
-
-                [Andrés Robalino 10/11/2013 A]
-                [Jonathan Turner 10/12/2013 B]
-                [Yehuda Katz 10/11/2013 A]
-            ]
-            | select rrusty_at first_name
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn column_names_with_spaces() {
-    let actual = nu!(cwd: ".", pipeline(
-        r#"
-            echo [
-                ["first name", "last name"];
-
-                [Andrés Robalino]
-                [Andrés Jnth]
-            ]
-            | select "last name"
-            | get "last name"
-            | str collect " "
-        "#
-    ));
-
-    assert_eq!(actual.out, "Robalino Jnth");
-}
-
-#[test]
-fn ignores_duplicate_columns_selected() {
-    let actual = nu!(cwd: ".", pipeline(
-        r#"
-            echo [
-                ["first name", "last name"];
-
-                [Andrés Robalino]
-                [Andrés Jnth]
-            ]
-            | select "first name" "last name" "first name"
-            | get
-            | str collect " "
-        "#
-    ));
-
-    assert_eq!(actual.out, "first name last name");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/semicolon.rs b/old_nushell/crates/nu-command/tests/commands/semicolon.rs
deleted file mode 100644
index 19e4a9cfe..000000000
--- a/old_nushell/crates/nu-command/tests/commands/semicolon.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn semicolon_allows_lhs_to_complete() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        let actual = nu!(
-            cwd: dirs.test(),
-            "touch i_will_be_created_semi.txt; echo done"
-        );
-
-        let path = dirs.test().join("i_will_be_created_semi.txt");
-
-        assert!(path.exists());
-        assert_eq!(actual.out, "done");
-    })
-}
-
-#[test]
-fn semicolon_lhs_error_stops_processing() {
-    let actual = nu!(
-    cwd: "tests/fixtures/formats", pipeline(
-    r#"
-        where 1 1; echo done
-    "#
-    ));
-
-    assert!(!actual.out.contains("done"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/skip/mod.rs b/old_nushell/crates/nu-command/tests/commands/skip/mod.rs
deleted file mode 100644
index aa35de070..000000000
--- a/old_nushell/crates/nu-command/tests/commands/skip/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod until;
-mod while_;
diff --git a/old_nushell/crates/nu-command/tests/commands/skip/until.rs b/old_nushell/crates/nu-command/tests/commands/skip/until.rs
deleted file mode 100644
index cdc89e5f7..000000000
--- a/old_nushell/crates/nu-command/tests/commands/skip/until.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn condition_is_met() {
-    Playground::setup("skip_until_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "caballeros.txt",
-            r#"
-                CHICKEN SUMMARY                        report date: April 29th, 2020
-                --------------------------------------------------------------------
-                Chicken Collection,29/04/2020,30/04/2020,31/04/2020,
-                Yellow Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,1
-                Blue Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,2
-                Red Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,3
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open --raw caballeros.txt
-                | lines
-                | skip 2
-                | split column ','
-                | headers
-                | skip until "Chicken Collection" == "Red Chickens"
-                | skip 1
-                | str to-int "31/04/2020"
-                | get "31/04/2020"
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "6");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/skip/while_.rs b/old_nushell/crates/nu-command/tests/commands/skip/while_.rs
deleted file mode 100644
index c0a55a7d6..000000000
--- a/old_nushell/crates/nu-command/tests/commands/skip/while_.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn condition_is_met() {
-    Playground::setup("skip_while_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "caballeros.txt",
-            r#"
-                CHICKEN SUMMARY                        report date: April 29th, 2020
-                --------------------------------------------------------------------
-                Chicken Collection,29/04/2020,30/04/2020,31/04/2020,
-                Yellow Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,1
-                Blue Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,2
-                Red Chickens,,,
-                Andrés,0,0,1
-                Jonathan,0,0,1
-                Jason,0,0,1
-                Yehuda,0,0,3
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open --raw caballeros.txt
-                | lines
-                | skip 2
-                | split column ','
-                | headers
-                | skip while "Chicken Collection" != "Red Chickens"
-                | skip 1
-                | str to-int "31/04/2020"
-                | get "31/04/2020"
-                | math sum
-                "#
-        ));
-
-        assert_eq!(actual.out, "6");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/sort_by.rs b/old_nushell/crates/nu-command/tests/commands/sort_by.rs
deleted file mode 100644
index 4eb3c98fe..000000000
--- a/old_nushell/crates/nu-command/tests/commands/sort_by.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn by_column() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml --raw
-            | lines
-            | skip 1
-            | first 4
-            | split column "="
-            | sort-by Column1
-            | skip 1
-            | first 1
-            | get Column1
-            | str trim
-        "#
-    ));
-
-    assert_eq!(actual.out, "description");
-}
-
-#[test]
-fn by_invalid_column() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml --raw
-            | lines
-            | skip 1
-            | first 4
-            | split column "="
-            | sort-by ColumnThatDoesNotExist
-            | skip 1
-            | first 1
-            | get Column1
-            | str trim
-        "#
-    ));
-
-    assert!(actual.err.contains("Can not find column to sort by"));
-    assert!(actual.err.contains("invalid column"));
-}
-
-#[test]
-fn by_invalid_types() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml --raw
-            | echo [1 "foo"]
-            | sort-by
-        "#
-    ));
-
-    assert!(actual.err.contains("Not all values can be compared"));
-    assert!(actual
-        .err
-        .contains("Unable to sort values, as \"integer\" cannot compare against \"string\""));
-}
-
-#[test]
-fn sort_primitive_values() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml --raw
-            | lines
-            | skip 1
-            | first 6
-            | sort-by
-            | first 1
-        "#
-    ));
-
-    assert_eq!(actual.out, "authors = [\"The Nu Project Contributors\"]");
-}
-
-#[test]
-fn ls_sort_by_name_sensitive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample-ls-output.json
-            | sort-by name
-            | select name
-            | to json
-        "#
-    ));
-
-    let json_output = r#"[{"name":"B.txt"},{"name":"C"},{"name":"a.txt"}]"#;
-
-    assert_eq!(actual.out, json_output);
-}
-
-#[test]
-fn ls_sort_by_name_insensitive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample-ls-output.json
-            | sort-by -i name
-            | select name
-            | to json
-        "#
-    ));
-
-    let json_output = r#"[{"name":"a.txt"},{"name":"B.txt"},{"name":"C"}]"#;
-
-    assert_eq!(actual.out, json_output);
-}
-
-#[test]
-fn ls_sort_by_type_name_sensitive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample-ls-output.json
-            | sort-by type name
-            | select name type
-            | to json
-        "#
-    ));
-
-    let json_output = r#"[{"name":"C","type":"Dir"},{"name":"B.txt","type":"File"},{"name":"a.txt","type":"File"}]"#;
-
-    assert_eq!(actual.out, json_output);
-}
-
-#[test]
-fn ls_sort_by_type_name_insensitive() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample-ls-output.json
-            | sort-by -i type name
-            | select name type
-            | to json
-        "#
-    ));
-
-    let json_output = r#"[{"name":"C","type":"Dir"},{"name":"a.txt","type":"File"},{"name":"B.txt","type":"File"}]"#;
-
-    assert_eq!(actual.out, json_output);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/source.rs b/old_nushell/crates/nu-command/tests/commands/source.rs
deleted file mode 100644
index 473c3e6a3..000000000
--- a/old_nushell/crates/nu-command/tests/commands/source.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use nu_test_support::fs::{AbsolutePath, DisplayPath, Stub::FileWithContent};
-use nu_test_support::nu;
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[should_panic]
-#[test]
-fn sources_also_files_under_custom_lib_dirs_path() {
-    Playground::setup("source_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-        let library_path = AbsolutePath::new(dirs.test().join("lib"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            &format!(
-                r#"
-                lib_dirs = ["{}"]
-                skip_welcome_message = true
-            "#,
-                library_path.display_path()
-            ),
-        )]);
-
-        nu.within("lib").with_files(vec![FileWithContent(
-            "my_library.nu",
-            r#"
-                source my_library/main.nu
-            "#,
-        )]);
-        nu.within("lib/my_library").with_files(vec![FileWithContent(
-            "main.nu",
-            r#"
-            def hello [] {
-                echo "hello nu"
-            }
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                source my_library.nu ;
-
-                hello
-                "#,
-            )),
-            says().stdout("hello nu")
-        );
-    })
-}
-
-fn try_source_foo_with_double_quotes_in(testdir: &str, playdir: &str) {
-    Playground::setup(playdir, |dirs, sandbox| {
-        let testdir = String::from(testdir);
-        let mut foo_file = testdir.clone();
-        foo_file.push_str("/foo.nu");
-
-        sandbox.mkdir(&testdir);
-        sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
-
-        let cmd = String::from("source ") + r#"""# + &foo_file + r#"""#;
-
-        let actual = nu!(cwd: dirs.test(), &cmd);
-
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-fn try_source_foo_with_single_quotes_in(testdir: &str, playdir: &str) {
-    Playground::setup(playdir, |dirs, sandbox| {
-        let testdir = String::from(testdir);
-        let mut foo_file = testdir.clone();
-        foo_file.push_str("/foo.nu");
-
-        sandbox.mkdir(&testdir);
-        sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
-
-        let cmd = String::from("source ") + r#"'"# + &foo_file + r#"'"#;
-
-        let actual = nu!(cwd: dirs.test(), &cmd);
-
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-fn try_source_foo_without_quotes_in(testdir: &str, playdir: &str) {
-    Playground::setup(playdir, |dirs, sandbox| {
-        let testdir = String::from(testdir);
-        let mut foo_file = testdir.clone();
-        foo_file.push_str("/foo.nu");
-
-        sandbox.mkdir(&testdir);
-        sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
-
-        let cmd = String::from("source ") + &foo_file;
-
-        let actual = nu!(cwd: dirs.test(), &cmd);
-
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-#[test]
-fn sources_unicode_file_in_normal_dir() {
-    try_source_foo_with_single_quotes_in("foo", "source_test_1");
-    try_source_foo_with_double_quotes_in("foo", "source_test_2");
-    try_source_foo_without_quotes_in("foo", "source_test_3");
-}
-
-#[test]
-fn sources_unicode_file_in_unicode_dir_without_spaces_1() {
-    try_source_foo_with_single_quotes_in("🚒", "source_test_4");
-    try_source_foo_with_double_quotes_in("🚒", "source_test_5");
-    try_source_foo_without_quotes_in("🚒", "source_test_6");
-}
-
-#[cfg(not(windows))] // ':' is not allowed in Windows paths
-#[test]
-fn sources_unicode_file_in_unicode_dir_without_spaces_2() {
-    try_source_foo_with_single_quotes_in(":fire_engine:", "source_test_7");
-    try_source_foo_with_double_quotes_in(":fire_engine:", "source_test_8");
-    try_source_foo_without_quotes_in(":fire_engine:", "source_test_9");
-}
-
-#[test]
-fn sources_unicode_file_in_unicode_dir_with_spaces_1() {
-    try_source_foo_with_single_quotes_in("e-$ èрт🚒♞中片-j", "source_test_8");
-    try_source_foo_with_double_quotes_in("e-$ èрт🚒♞中片-j", "source_test_9");
-}
-
-#[cfg(not(windows))] // ':' is not allowed in Windows paths
-#[test]
-fn sources_unicode_file_in_unicode_dir_with_spaces_2() {
-    try_source_foo_with_single_quotes_in("e-$ èрт:fire_engine:♞中片-j", "source_test_10");
-    try_source_foo_with_double_quotes_in("e-$ èрт:fire_engine:♞中片-j", "source_test_11");
-}
-
-#[ignore]
-#[test]
-fn sources_unicode_file_in_non_utf8_dir() {
-    // How do I create non-UTF-8 path???
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/split_by.rs b/old_nushell/crates/nu-command/tests/commands/split_by.rs
deleted file mode 100644
index bea39199e..000000000
--- a/old_nushell/crates/nu-command/tests/commands/split_by.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use nu_test_support::fs::Stub::{EmptyFile, FileWithContentToBeTrimmed};
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn splits() {
-    Playground::setup("split_by_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at,type
-                Andrés,Robalino,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | group-by rusty_at
-                | split-by type
-                | get A."10/11/2013"
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn errors_if_no_table_given_as_input() {
-    Playground::setup("split_by_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("los.txt"),
-            EmptyFile("tres.txt"),
-            EmptyFile("amigos.txt"),
-            EmptyFile("arepas.clu"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | get name
-                | split-by type
-            "#
-        ));
-
-        assert!(actual.err.contains("Expected table from pipeline"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/split_column.rs b/old_nushell/crates/nu-command/tests/commands/split_column.rs
deleted file mode 100644
index cb591e500..000000000
--- a/old_nushell/crates/nu-command/tests/commands/split_column.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn to_column() {
-    Playground::setup("split_column_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.txt",
-            r#"
-                importer,shipper,tariff_item,name,origin
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.txt
-                | lines
-                | str trim
-                | split column ","
-                | get Column2
-            "#
-        ));
-
-        assert!(actual.out.contains("shipper"));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/split_row.rs b/old_nushell/crates/nu-command/tests/commands/split_row.rs
deleted file mode 100644
index e7e7dd4f3..000000000
--- a/old_nushell/crates/nu-command/tests/commands/split_row.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn to_row() {
-    Playground::setup("split_row_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.txt",
-            r#"
-                importer,shipper,tariff_item,name,origin
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.txt
-                | lines
-                | str trim
-                | split row ","
-                | length
-            "#
-        ));
-
-        assert!(actual.out.contains('5'));
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/str_/collect.rs b/old_nushell/crates/nu-command/tests/commands/str_/collect.rs
deleted file mode 100644
index 4ac56cc14..000000000
--- a/old_nushell/crates/nu-command/tests/commands/str_/collect.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn test_1() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1..5 | into string | str collect
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "12345");
-}
-
-#[test]
-fn test_2() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo [a b c d] | str collect "<sep>"
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "a<sep>b<sep>c<sep>d");
-}
-
-#[test]
-fn construct_a_path() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo [sample txt] | str collect "."
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "sample.txt");
-}
-
-#[test]
-fn sum_one_to_four() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1..4 | into string | str collect "+" | math eval
-        "#
-        )
-    );
-
-    assert!(actual.out.contains("10.0"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/str_/into_string.rs b/old_nushell/crates/nu-command/tests/commands/str_/into_string.rs
deleted file mode 100644
index 9a50bcd6a..000000000
--- a/old_nushell/crates/nu-command/tests/commands/str_/into_string.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use nu_test_support::playground::{Dirs, Playground};
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn from_range() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1..5 | into string | to json
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "[\"1\",\"2\",\"3\",\"4\",\"5\"]");
-}
-
-#[test]
-fn from_number() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 5 | into string
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "5");
-}
-
-#[test]
-fn from_decimal() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1.5 | into string
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "1.5");
-}
-
-#[test]
-fn from_boolean() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo $true | into string
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn from_string() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "one" | into string
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "one");
-}
-
-#[test]
-fn from_filename() {
-    Playground::setup("from_filename", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.toml",
-            r#"
-                [dependency]
-                name = "nu"
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "ls sample.toml | get name | into string"
-        );
-
-        assert_eq!(actual.out, "sample.toml");
-    })
-}
-
-#[test]
-fn from_filesize() {
-    Playground::setup("from_filesize", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.toml",
-            r#"
-                [dependency]
-                name = "nu"
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "ls sample.toml | get size | into string"
-        );
-
-        assert_eq!(actual.out, "25 B");
-    })
-}
-
-#[test]
-fn from_decimal_correct_trailing_zeros() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        = 1.23000 | into string -d 3
-        "#
-    ));
-
-    assert!(actual.out.contains("1.230"));
-}
-
-#[test]
-fn from_int_decimal_correct_trailing_zeros() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        = 1.00000 | into string -d 3
-        "#
-    ));
-
-    assert!(actual.out.contains("1.000"));
-}
-
-#[test]
-fn from_int_decimal_trim_trailing_zeros() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        = 1.00000 | into string | format "{$it} flat"
-        "#
-    ));
-
-    assert!(actual.out.contains("1 flat")); // "1" would match "1.0"
-}
-
-#[test]
-fn from_table() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo '[{"name": "foo", "weight": 32.377}, {"name": "bar", "weight": 15.2}]'
-        | from json
-        | into string weight -d 2
-        "#
-    ));
-
-    assert!(actual.out.contains("32.38"));
-    assert!(actual.out.contains("15.20"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/str_/mod.rs b/old_nushell/crates/nu-command/tests/commands/str_/mod.rs
deleted file mode 100644
index 6e159f943..000000000
--- a/old_nushell/crates/nu-command/tests/commands/str_/mod.rs
+++ /dev/null
@@ -1,356 +0,0 @@
-mod collect;
-
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn trims() {
-    Playground::setup("str_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependency]
-                    name = "nu "
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open sample.toml | str trim dependency.name | get dependency.name"
-        );
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-
-#[test]
-fn error_trim_multiple_chars() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 'does it work now?!' | str trim -c '?!'
-        "#
-        )
-    );
-
-    assert!(actual.err.contains("char"));
-}
-
-#[test]
-fn capitalizes() {
-    Playground::setup("str_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependency]
-                    name = "nu"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open sample.toml | str capitalize dependency.name | get dependency.name"
-        );
-
-        assert_eq!(actual.out, "Nu");
-    })
-}
-
-#[test]
-fn downcases() {
-    Playground::setup("str_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependency]
-                    name = "LIGHT"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open sample.toml | str downcase dependency.name | get dependency.name"
-        );
-
-        assert_eq!(actual.out, "light");
-    })
-}
-
-#[test]
-fn upcases() {
-    Playground::setup("str_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    name = "nushell"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open sample.toml | str upcase package.name | get package.name"
-        );
-
-        assert_eq!(actual.out, "NUSHELL");
-    })
-}
-
-#[test]
-fn camelcases() {
-    Playground::setup("str_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [dependency]
-                    name = "THIS_IS_A_TEST"
-                "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open sample.toml | str camel-case dependency.name | get dependency.name"
-        );
-
-        assert_eq!(actual.out, "thisIsATest");
-    })
-}
-
-#[test]
-fn converts_to_int() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '{number_as_string: "1"}'
-            | from json
-            | str to-int number_as_string
-            | rename number
-            | where number == 1
-            | get number
-
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn converts_to_decimal() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo "3.1, 0.0415"
-            | split row ","
-            | str to-decimal
-            | math sum
-        "#
-    ));
-
-    assert_eq!(actual.out, "3.1415");
-}
-
-#[test]
-fn find_and_replaces() {
-    Playground::setup("str_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [fortune.teller]
-                     phone = "1-800-KATZ"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str find-replace KATZ "5289" fortune.teller.phone
-                 | get fortune.teller.phone
-             "#
-        ));
-
-        assert_eq!(actual.out, "1-800-5289");
-    })
-}
-
-#[test]
-fn find_and_replaces_without_passing_field() {
-    Playground::setup("str_test_7", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [fortune.teller]
-                     phone = "1-800-KATZ"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | get fortune.teller.phone
-                 | str find-replace KATZ "5289"
-             "#
-        ));
-
-        assert_eq!(actual.out, "1-800-5289");
-    })
-}
-
-#[test]
-fn substrings_the_input() {
-    Playground::setup("str_test_8", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [fortune.teller]
-                     phone = "1-800-ROBALINO"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring 6,14 fortune.teller.phone
-                 | get fortune.teller.phone
-             "#
-        ));
-
-        assert_eq!(actual.out, "ROBALINO");
-    })
-}
-
-#[test]
-fn substring_errors_if_start_index_is_greater_than_end_index() {
-    Playground::setup("str_test_9", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [fortune.teller]
-                     phone = "1-800-ROBALINO"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring 6,5 fortune.teller.phone
-             "#
-        ));
-
-        assert!(actual
-            .err
-            .contains("End must be greater than or equal to Start"))
-    })
-}
-
-#[test]
-fn substrings_the_input_and_returns_the_string_if_end_index_exceeds_length() {
-    Playground::setup("str_test_10", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [package]
-                     name = "nu-arepas"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring 0,999 package.name
-                 | get package.name
-             "#
-        ));
-
-        assert_eq!(actual.out, "nu-arepas");
-    })
-}
-
-#[test]
-fn substrings_the_input_and_returns_blank_if_start_index_exceeds_length() {
-    Playground::setup("str_test_11", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [package]
-                     name = "nu-arepas"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring 50,999 package.name
-                 | get package.name
-             "#
-        ));
-
-        assert_eq!(actual.out, "");
-    })
-}
-
-#[test]
-fn substrings_the_input_and_treats_start_index_as_zero_if_blank_start_index_given() {
-    Playground::setup("str_test_12", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [package]
-                     name = "nu-arepas"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring ,2 package.name
-                 | get package.name
-             "#
-        ));
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-
-#[test]
-fn substrings_the_input_and_treats_end_index_as_length_if_blank_end_index_given() {
-    Playground::setup("str_test_13", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                     [package]
-                     name = "nu-arepas"
-                 "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                 open sample.toml
-                 | str substring 3, package.name
-                 | get package.name
-             "#
-        ));
-
-        assert_eq!(actual.out, "arepas");
-    })
-}
-
-#[test]
-fn str_reverse() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo "nushell" | str reverse
-        "#
-    ));
-
-    assert!(actual.out.contains("llehsun"));
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/touch.rs b/old_nushell/crates/nu-command/tests/commands/touch.rs
deleted file mode 100644
index affc1d14c..000000000
--- a/old_nushell/crates/nu-command/tests/commands/touch.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn creates_a_file_when_it_doesnt_exist() {
-    Playground::setup("create_test_1", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch i_will_be_created.txt"
-        );
-
-        let path = dirs.test().join("i_will_be_created.txt");
-        assert!(path.exists());
-    })
-}
-
-#[test]
-fn creates_two_files() {
-    Playground::setup("create_test_2", |dirs, _sandbox| {
-        nu!(
-            cwd: dirs.test(),
-            "touch a b"
-        );
-
-        let path = dirs.test().join("a");
-        assert!(path.exists());
-
-        let path2 = dirs.test().join("b");
-        assert!(path2.exists());
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/uniq.rs b/old_nushell/crates/nu-command/tests/commands/uniq.rs
deleted file mode 100644
index 4f74a5af8..000000000
--- a/old_nushell/crates/nu-command/tests/commands/uniq.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn removes_duplicate_rows() {
-    Playground::setup("uniq_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at,type
-                Andrés,Robalino,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | uniq
-                | length
-                
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn uniq_values() {
-    Playground::setup("uniq_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.csv",
-            r#"
-                first_name,last_name,rusty_at,type
-                Andrés,Robalino,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-                Jonathan,Turner,10/12/2013,B
-                Yehuda,Katz,10/11/2013,A
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.csv
-                | select type
-                | uniq
-                | length
-                
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn nested_json_structures() {
-    Playground::setup("uniq_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nested_json_structures.json",
-            r#"
-            [
-                {
-                  "name": "this is duplicated",
-                  "nesting": [ { "a": "a", "b": "b" },
-                               { "c": "c", "d": "d" }
-                  ],
-                  "can_be_ordered_differently": {
-                    "array": [1, 2, 3, 4, 5],
-                    "something": { "else": "works" }
-                  }
-                },
-                {
-                  "can_be_ordered_differently": {
-                    "something": { "else": "works" },
-                    "array": [1, 2, 3, 4, 5]
-                  },
-                  "nesting": [ { "b": "b", "a": "a" },
-                               { "d": "d", "c": "c" }
-                  ],
-                  "name": "this is duplicated"
-                },
-                {
-                  "name": "this is unique",
-                  "nesting": [ { "a": "b", "b": "a" },
-                               { "c": "d", "d": "c" }
-                  ],
-                  "can_be_ordered_differently": {
-                    "array": [],
-                    "something": { "else": "does not work" }
-                  }
-                },
-                {
-                  "name": "this is unique",
-                  "nesting": [ { "a": "a", "b": "b", "c": "c" },
-                               { "d": "d", "e": "e", "f": "f" }
-                  ],
-                  "can_be_ordered_differently": {
-                    "array": [],
-                    "something": { "else": "works" }
-                  }
-                }
-              ]
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open nested_json_structures.json
-                | uniq
-                | length
-                
-            "#
-        ));
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn uniq_when_keys_out_of_order() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '[{"a": "a", "b": [1,2,3]},{"b": [1,2,3], "a": "a"}]'
-            | from json
-            | uniq
-            | length
-            
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn uniq_counting() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '["A", "B", "A"]'
-            | from json
-            | wrap item
-            | uniq --count
-            | where item == A
-            | get count
-        "#
-    ));
-    assert_eq!(actual.out, "2");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo '["A", "B", "A"]'
-            | from json
-            | wrap item
-            | uniq --count
-            | where item == B
-            | get count
-        "#
-    ));
-    assert_eq!(actual.out, "1");
-}
-
-#[test]
-fn uniq_unique() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo [1 2 3 4 1 5]
-            | uniq --unique
-        "#
-    ));
-    let expected = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [2 3 4 5]
-        "#
-    ));
-    print!("{}", actual.out);
-    print!("{}", expected.out);
-    assert_eq!(actual.out, expected.out);
-}
-
-#[test]
-fn uniq_simple_vals_ints() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo [1 2 3 4 1 5]
-            | uniq
-        "#
-    ));
-    let expected = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [1 2 3 4 5]
-        "#
-    ));
-    print!("{}", actual.out);
-    print!("{}", expected.out);
-    assert_eq!(actual.out, expected.out);
-}
-
-#[test]
-fn uniq_simple_vals_strs() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            echo [A B C A]
-            | uniq
-        "#
-    ));
-    let expected = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-        echo [A B C]
-        "#
-    ));
-    print!("{}", actual.out);
-    print!("{}", expected.out);
-    assert_eq!(actual.out, expected.out);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/update.rs b/old_nushell/crates/nu-command/tests/commands/update.rs
deleted file mode 100644
index 5506fb488..000000000
--- a/old_nushell/crates/nu-command/tests/commands/update.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn sets_the_column() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml
-            | update dev-dependencies.pretty_assertions "0.7.0"
-            | get dev-dependencies.pretty_assertions
-        "#
-    ));
-
-    assert_eq!(actual.out, "0.7.0");
-}
-
-#[cfg(features = "inc")]
-#[test]
-fn sets_the_column_from_a_block_run_output() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml
-            | update dev-dependencies.pretty_assertions { open cargo_sample.toml | get dev-dependencies.pretty_assertions | inc --minor }
-            | get dev-dependencies.pretty_assertions
-        "#
-    ));
-
-    assert_eq!(actual.out, "0.7.0");
-}
-
-#[test]
-fn sets_the_column_from_a_block_full_stream_output() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            wrap content
-            | update content { open --raw cargo_sample.toml | lines | first 5 }
-            | get content.1
-            | str contains "nu"
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn sets_the_column_from_a_subexpression() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            wrap content
-            | update content (open --raw cargo_sample.toml | lines | first 5)
-            | get content.1
-            | str contains "nu"
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/where_.rs b/old_nushell/crates/nu-command/tests/commands/where_.rs
deleted file mode 100644
index c4eb69c63..000000000
--- a/old_nushell/crates/nu-command/tests/commands/where_.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-use nu_test_support::nu;
-
-#[cfg(feature = "sqlite")]
-use nu_test_support::pipeline;
-
-#[test]
-fn filters_by_unit_size_comparison() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "ls | where size > 1kib | sort-by size | get name | first 1 | str trim"
-    );
-
-    assert_eq!(actual.out, "cargo_sample.toml");
-}
-
-#[test]
-fn filters_with_nothing_comparison() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"echo '[{"foo": 3}, {"foo": null}, {"foo": 4}]' | from json | get foo | compact | where $it > 1 | math sum"#
-    );
-
-    assert_eq!(actual.out, "7");
-}
-
-#[test]
-fn where_in_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"echo '[{"name": "foo", "size": 3}, {"name": "foo", "size": 2}, {"name": "bar", "size": 4}]' | from json | where name in ["foo"] | get size | math sum"#
-    );
-
-    assert_eq!(actual.out, "5");
-}
-
-#[test]
-fn where_not_in_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"echo '[{"name": "foo", "size": 3}, {"name": "foo", "size": 2}, {"name": "bar", "size": 4}]' | from json | where name not-in ["foo"] | get size | math sum"#
-    );
-
-    assert_eq!(actual.out, "4");
-}
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn explicit_block_condition() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | first 4
-            | where {= $it.z > 4200}
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "4253");
-}
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn binary_operator_comparisons() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | first 4
-            | where z > 4200
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "4253");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | first 4
-            | where z >= 4253
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "4253");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | first 4
-            | where z < 10
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | first 4
-            | where z <= 1
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "1");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == ints
-            | get table_values
-            | where z != 1
-            | first 1
-            | get z
-        "#
-    ));
-
-    assert_eq!(actual.out, "42");
-}
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn contains_operator() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == strings
-            | get table_values
-            | where x =~ ell
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "4");
-
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | where table_name == strings
-            | get table_values
-            | where x !~ ell
-            | length
-        "#
-    ));
-
-    assert_eq!(actual.out, "2");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/which.rs b/old_nushell/crates/nu-command/tests/commands/which.rs
deleted file mode 100644
index a16e571c5..000000000
--- a/old_nushell/crates/nu-command/tests/commands/which.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn which_ls() {
-    let actual = nu!(
-        cwd: ".",
-        "which ls | get path | str trim"
-    );
-
-    assert_eq!(actual.out, "Nushell built-in command");
-}
-
-#[test]
-fn which_alias_ls() {
-    let actual = nu!(
-        cwd: ".",
-        "alias ls = ls -a; which ls | get path | str trim"
-    );
-
-    assert_eq!(actual.out, "Nushell alias: ls -a");
-}
-
-#[test]
-fn which_def_ls() {
-    let actual = nu!(
-        cwd: ".",
-        "def ls [] {echo def}; which ls | get path | str trim"
-    );
-
-    assert_eq!(actual.out, "Nushell custom command");
-}
-
-#[test]
-fn correct_precedence_alias_def_custom() {
-    let actual = nu!(
-        cwd: ".",
-        "def ls [] {echo def}; alias ls = echo alias; which ls | get path | str trim"
-    );
-
-    assert_eq!(actual.out, "Nushell alias: echo alias");
-}
-
-#[test]
-fn multiple_reports_for_alias_def_custom() {
-    let actual = nu!(
-        cwd: ".",
-        "def ls [] {echo def}; alias ls = echo alias; which -a ls | length"
-    );
-
-    let length: i32 = actual.out.parse().unwrap();
-    assert!(length >= 3);
-}
-
-// `get_aliases_with_name` and `get_custom_commands_with_name` don't return the correct count of
-// values
-// I suspect this is due to the ScopeFrame getting discarded at '}' and the command is then
-// executed in the parent scope
-// See: parse_definition, line 2187 for reference.
-#[ignore]
-#[test]
-fn multiple_reports_of_multiple_alias() {
-    let actual = nu!(
-        cwd: ".",
-        "alias xaz = echo alias1; def helper [] {alias xaz = echo alias2; which -a xaz}; helper | length"
-    );
-
-    let length: i32 = actual.out.parse().unwrap();
-    assert_eq!(length, 2);
-}
-
-#[ignore]
-#[test]
-fn multiple_reports_of_multiple_defs() {
-    let actual = nu!(
-        cwd: ".",
-        "def xaz [] {echo def1}; def helper [] { def xaz [] { echo def2 }; which -a xaz }; helper | length"
-    );
-
-    let length: i32 = actual.out.parse().unwrap();
-    assert_eq!(length, 2);
-}
-
-//Fails due to ParserScope::add_definition
-// frame.custom_commands.insert(name.clone(), block.clone());
-// frame.commands.insert(name, whole_stream_command(block));
-#[ignore]
-#[test]
-fn def_only_seen_once() {
-    let actual = nu!(
-        cwd: ".",
-        "def xaz [] {echo def1}; which -a xaz | length"
-    );
-    //length is 2. One custom_command (def) one built in ("wrongly" added)
-    let length: i32 = actual.out.parse().unwrap();
-    assert_eq!(length, 1);
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/with_env.rs b/old_nushell/crates/nu-command/tests/commands/with_env.rs
deleted file mode 100644
index 46f135235..000000000
--- a/old_nushell/crates/nu-command/tests/commands/with_env.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn with_env_extends_environment() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "with-env [FOO BARRRR] {echo $nu.env} | get FOO"
-    );
-
-    assert_eq!(actual.out, "BARRRR");
-}
-
-#[test]
-fn with_env_shorthand() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "FOO=BARRRR echo $nu.env | get FOO"
-    );
-
-    assert_eq!(actual.out, "BARRRR");
-}
-
-#[test]
-fn shorthand_doesnt_reorder_arguments() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "FOO=BARRRR nu --testbin cococo first second"
-    );
-
-    assert_eq!(actual.out, "first second");
-}
-
-#[test]
-fn with_env_shorthand_trims_quotes() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "FOO='BARRRR' echo $nu.env | get FOO"
-    );
-
-    assert_eq!(actual.out, "BARRRR");
-}
-
-#[test]
-fn with_env_and_shorthand_same_result() {
-    let actual_shorthand = nu!(
-        cwd: "tests/fixtures/formats",
-        "FOO='BARRRR' echo $nu.env | get FOO"
-    );
-
-    let actual_normal = nu!(
-        cwd: "tests/fixtures/formats",
-        "with-env [FOO BARRRR] {echo $nu.env} | get FOO"
-    );
-
-    assert_eq!(actual_shorthand.out, actual_normal.out);
-}
-
-#[test]
-fn with_env_shorthand_nested_quotes() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "FOO='-arg \"hello world\"' echo $nu.env | get FOO"
-    );
-
-    assert_eq!(actual.out, "-arg \"hello world\"");
-}
-
-#[test]
-fn with_env_hides_variables_in_parent_scope() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"
-        let-env FOO = "1"
-        echo $nu.env.FOO
-        with-env [FOO $nothing] {
-            echo $nu.env.FOO
-        }
-        echo $nu.env.FOO
-        "#
-    );
-
-    assert_eq!(actual.out, "11");
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Unknown column"));
-}
-
-#[test]
-fn with_env_shorthand_can_not_hide_variables() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r#"
-        let-env FOO = "1"
-        echo $nu.env.FOO
-        FOO=$nothing echo $nu.env.FOO
-        echo $nu.env.FOO
-        "#
-    );
-
-    assert_eq!(actual.out, "1$nothing1");
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/wrap.rs b/old_nushell/crates/nu-command/tests/commands/wrap.rs
deleted file mode 100644
index 968e5f125..000000000
--- a/old_nushell/crates/nu-command/tests/commands/wrap.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn wrap_rows_into_a_row() {
-    Playground::setup("wrap_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                first_name,last_name
-                Andrés,Robalino
-                Jonathan,Turner
-                Yehuda,Katz
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | from csv
-                | wrap caballeros
-                | get caballeros
-                | nth 0
-                | get last_name
-            "#
-        ));
-
-        assert_eq!(actual.out, "Robalino");
-    })
-}
-
-#[test]
-fn wrap_rows_into_a_table() {
-    Playground::setup("wrap_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                first_name,last_name
-                Andrés,Robalino
-                Jonathan,Turner
-                Yehuda,Katz
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | from csv
-                | get last_name
-                | wrap caballero
-                | nth 2
-                | get caballero
-            "#
-        ));
-
-        assert_eq!(actual.out, "Katz");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/commands/zip.rs b/old_nushell/crates/nu-command/tests/commands/zip.rs
deleted file mode 100644
index 20aa6bf64..000000000
--- a/old_nushell/crates/nu-command/tests/commands/zip.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-const ZIP_POWERED_TEST_ASSERTION_SCRIPT: &str = r#"
-def expect [
-    left,
-    right,
-    --to-eq
-] {
-    $left | zip { $right } | all? {
-        $it.name.0 == $it.name.1 && $it.commits.0 == $it.commits.1
-    }
-}
-
-def add-commits [n] {
-  each {
-    let contributor = $it;
-    let name = $it.name;
-    let commits = $it.commits;
-
-    $contributor | merge {
-      [[commits]; [($commits + $n)]]
-    }
-  }
-}
-"#;
-
-#[test]
-fn zips_two_tables() {
-    Playground::setup("zip_test_1", |dirs, nu| {
-        nu.with_files(vec![FileWithContent(
-            "zip_test.nu",
-            &format!("{}\n", ZIP_POWERED_TEST_ASSERTION_SCRIPT),
-        )]);
-
-        assert_that!(
-            nu.pipeline(&input(&format!(
-                r#"
-                source {} ;
-        
-                let contributors = ([
-                  [name, commits];
-                  [andres,    10]
-                  [    jt,    20]
-                ]);
-                        
-                let actual = ($contributors | add-commits 10);
-                        
-                expect $actual --to-eq [[name, commits]; [andres, 20] [jt, 30]]
-                "#,
-                dirs.test().join("zip_test.nu").display()
-            ))),
-            says().stdout("true")
-        );
-    })
-}
-
-#[test]
-fn zips_two_lists() {
-    Playground::setup("zip_test_2", |_, nu| {
-        assert_that!(
-            nu.pipeline(&input(
-                r#"
-                echo [0 2 4 6 8] | zip { [1 3 5 7 9] }
-                | flatten
-                | into string
-                | str collect '-'
-                "#
-            )),
-            says().stdout("0-1-2-3-4-5-6-7-8-9")
-        );
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/bson.rs b/old_nushell/crates/nu-command/tests/format_conversions/bson.rs
deleted file mode 100644
index cd7969e0f..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/bson.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#[cfg(feature = "bson")]
-#[test]
-fn table_to_bson_and_back_into_table() {
-    use nu_test_support::{nu, pipeline};
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.bson
-            | to bson
-            | from bson
-            | get root
-            | get 1.b
-        "#
-    ));
-
-    assert_eq!(actual.out, "whel");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/csv.rs b/old_nushell/crates/nu-command/tests/format_conversions/csv.rs
deleted file mode 100644
index 0cddd3eae..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/csv.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_csv_text_and_from_csv_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open caco3_plastics.csv | to csv | from csv | first 1 | get origin "
-    );
-
-    assert_eq!(actual.out, "SPAIN");
-}
-
-#[test]
-fn table_to_csv_text() {
-    Playground::setup("filter_to_csv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "csv_text_sample.txt",
-            r#"
-                importer,shipper,tariff_item,name,origin
-                Plasticos Rival,Reverte,2509000000,Calcium carbonate,Spain
-                Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open csv_text_sample.txt
-                | lines
-                | str trim
-                | split column "," a b c d origin
-                | last 1
-                | to csv
-                | lines
-                | nth 1
-            "#
-        ));
-
-        assert!(actual
-            .out
-            .contains("Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia"));
-    })
-}
-
-#[test]
-fn table_to_csv_text_skipping_headers_after_conversion() {
-    Playground::setup("filter_to_csv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "csv_text_sample.txt",
-            r#"
-                importer,shipper,tariff_item,name,origin
-                Plasticos Rival,Reverte,2509000000,Calcium carbonate,Spain
-                Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open csv_text_sample.txt
-                | lines
-                | str trim
-                | split column "," a b c d origin
-                | last 1
-                | to csv --noheaders
-            "#
-        ));
-
-        assert!(actual
-            .out
-            .contains("Tigre Ecuador,OMYA Andina,3824909999,Calcium carbonate,Colombia"));
-    })
-}
-
-#[test]
-fn infers_types() {
-    Playground::setup("filter_from_csv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_cuatro_mosqueteros.csv",
-            r#"
-                first_name,last_name,rusty_luck,d
-                Andrés,Robalino,1,d
-                Jonathan,Turner,1,d
-                Yehuda,Katz,1,d
-                Jason,Gedge,1,d
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_cuatro_mosqueteros.csv
-                | where rusty_luck > 0
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn from_csv_text_to_table() {
-    Playground::setup("filter_from_csv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                first_name,last_name,rusty_luck
-                Andrés,Robalino,1
-                Jonathan,Turner,1
-                Yehuda,Katz,1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | from csv
-                | get rusty_luck
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn from_csv_text_with_separator_to_table() {
-    Playground::setup("filter_from_csv_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                first_name;last_name;rusty_luck
-                Andrés;Robalino;1
-                Jonathan;Turner;1
-                Yehuda;Katz;1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | from csv --separator ';'
-                | get rusty_luck
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn from_csv_text_with_tab_separator_to_table() {
-    Playground::setup("filter_from_csv_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_caballeros.txt",
-            r#"
-                first_name	last_name	rusty_luck
-                Andrés	Robalino	1
-                Jonathan	Turner	1
-                Yehuda	Katz	1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_caballeros.txt
-                | from csv --separator '\t'
-                | get rusty_luck
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn from_csv_text_skipping_headers_to_table() {
-    Playground::setup("filter_from_csv_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_amigos.txt",
-            r#"
-                Andrés,Robalino,1
-                Jonathan,Turner,1
-                Yehuda,Katz,1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_amigos.txt
-                | from csv --noheaders
-                | get Column3
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/eml.rs b/old_nushell/crates/nu-command/tests/format_conversions/eml.rs
deleted file mode 100644
index 41acb13cb..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/eml.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-const TEST_CWD: &str = "tests/fixtures/formats";
-
-// The To field in this email is just "to@example.com", which gets parsed out as the Address. The Name is empty.
-#[test]
-fn from_eml_get_to_field() {
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get To
-            | get Address
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "to@example.com");
-
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get To
-            | get Name
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "");
-}
-
-// The Reply-To field in this email is "replyto@example.com" <replyto@example.com>, meaning both the Name and Address values are identical.
-#[test]
-fn from_eml_get_replyto_field() {
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get Reply-To
-            | get Address
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "replyto@example.com");
-
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get Reply-To
-            | get Name
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "replyto@example.com");
-}
-
-#[test]
-fn from_eml_get_subject_field() {
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get Subject
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "Test Message");
-}
-
-#[test]
-fn from_eml_get_another_header_field() {
-    let actual = nu!(
-        cwd: TEST_CWD,
-        pipeline(
-            r#"
-            open sample.eml
-            | get MIME-Version
-        "#
-        )
-    );
-
-    assert_eq!(actual.out, "1.0");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/html.rs b/old_nushell/crates/nu-command/tests/format_conversions/html.rs
deleted file mode 100644
index 36ebfff4a..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/html.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn out_html_simple() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo 3 | to html
-        "#
-    ));
-
-    assert_eq!(
-        actual.out,
-        r"<html><style>body { background-color:white;color:black; }</style><body>3</body></html>"
-    );
-}
-
-#[test]
-fn out_html_partial() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo 3 | to html -p
-        "#
-    ));
-
-    assert_eq!(
-        actual.out,
-        "<div style=\"background-color:white;color:black;\">3</div>"
-    );
-}
-
-#[test]
-fn out_html_table() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo '{"name": "darren"}' | from json | to html
-        "#
-    ));
-
-    assert_eq!(
-        actual.out,
-        r"<html><style>body { background-color:white;color:black; }</style><body><table><tr><th>name</th></tr><tr><td>darren</td></tr></table></body></html>"
-    );
-}
-
-#[test]
-fn test_cd_html_color_flag_dark_false() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-            r#"
-                cd --help | to html --html_color
-            "#
-        )
-    );
-    assert_eq!(
-        actual.out,
-        r"<html><style>body { background-color:white;color:black; }</style><body>Change to a new path.<br><br>Usage:<br>  &gt; cd (directory) {flags} <br><br>Parameters:<br>  (directory) the directory to change to<br><br>Flags:<br>  -h, --help: Display this help message<br><br>Examples:<br>  Change to a new directory called &#x27;dirname&#x27;<br>  &gt; <span style='color:#037979;font-weight:bold;'>cd<span style='color:black;font-weight:normal;'></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#037979;'>dirname<span style='color:black;font-weight:normal;'><br><br>  Change to your home directory<br>  &gt; </span><span style='color:#037979;font-weight:bold;'>cd<span style='color:black;font-weight:normal;'><br><br>  Change to your home directory (alternate version)<br>  &gt; </span></span><span style='color:#037979;font-weight:bold;'>cd<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#037979;'>~<span style='color:black;font-weight:normal;'><br><br>  Change to the previous directory<br>  &gt; </span><span style='color:#037979;font-weight:bold;'>cd<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#037979;'>-<span style='color:black;font-weight:normal;'><br><br></body></html></span></span></span>"
-    );
-}
-
-#[test]
-fn test_no_color_flag() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-            r#"
-                cd --help | to html --no_color
-            "#
-        )
-    );
-    assert_eq!(
-        actual.out,
-        r"<html><style>body { background-color:white;color:black; }</style><body>Change to a new path.<br><br>Usage:<br>  &gt; cd (directory) {flags} <br><br>Parameters:<br>  (directory) the directory to change to<br><br>Flags:<br>  -h, --help: Display this help message<br><br>Examples:<br>  Change to a new directory called &#x27;dirname&#x27;<br>  &gt; cd dirname<br><br>  Change to your home directory<br>  &gt; cd<br><br>  Change to your home directory (alternate version)<br>  &gt; cd ~<br><br>  Change to the previous directory<br>  &gt; cd -<br><br></body></html>"
-    );
-}
-
-#[test]
-fn test_html_color_where_flag_dark_false() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-            r#"
-                where --help | to html --html_color
-            "#
-        )
-    );
-    assert_eq!(
-        actual.out,
-        r"<html><style>body { background-color:white;color:black; }</style><body>Filter table to match the condition.<br><br>Usage:<br>  &gt; where &lt;condition&gt; {flags} <br><br>Parameters:<br>  &lt;condition&gt; the condition that must match<br><br>Flags:<br>  -h, --help: Display this help message<br><br>Examples:<br>  List all files in the current directory with sizes greater than 2kb<br>  &gt; <span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>size<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&gt;<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>kb<span style='color:black;font-weight:normal;'><br><br>  List only the files in the current directory<br>  &gt; </span></span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>type<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>==<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>File<span style='color:black;font-weight:normal;'><br><br>  List all files with names that contain &quot;Car&quot;<br>  &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>name<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>=~<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>&quot;Car&quot;<span style='color:black;font-weight:normal;'><br><br>  List all files that were modified in the last two weeks<br>  &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>modified<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&lt;=<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>wk<span style='color:black;font-weight:normal;'><br><br></body></html></span></span></span>"
-    );
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/ics.rs b/old_nushell/crates/nu-command/tests/format_conversions/ics.rs
deleted file mode 100644
index 7e727cb72..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/ics.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn infers_types() {
-    Playground::setup("filter_from_ics_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "calendar.ics",
-            r#"
-                BEGIN:VCALENDAR
-                PRODID:-//Google Inc//Google Calendar 70.9054//EN
-                VERSION:2.0
-                BEGIN:VEVENT
-                DTSTART:20171007T200000Z
-                DTEND:20171007T233000Z
-                DTSTAMP:20200319T182138Z
-                UID:4l80f6dcovnriq38g57g07btid@google.com
-                CREATED:20170719T202915Z
-                DESCRIPTION:
-                LAST-MODIFIED:20170930T190808Z
-                LOCATION:
-                SEQUENCE:1
-                STATUS:CONFIRMED
-                SUMMARY:Maryland Game
-                TRANSP:TRANSPARENT
-                END:VEVENT
-                BEGIN:VEVENT
-                DTSTART:20171002T010000Z
-                DTEND:20171002T020000Z
-                DTSTAMP:20200319T182138Z
-                UID:2v61g7mij4s7ieoubm3sjpun5d@google.com
-                CREATED:20171001T180103Z
-                DESCRIPTION:
-                LAST-MODIFIED:20171001T180103Z
-                LOCATION:
-                SEQUENCE:0
-                STATUS:CONFIRMED
-                SUMMARY:Halloween Wars
-                TRANSP:OPAQUE
-                END:VEVENT
-                END:VCALENDAR
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open calendar.ics
-                | get events
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn from_ics_text_to_table() {
-    Playground::setup("filter_from_ics_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "calendar.txt",
-            r#"
-                BEGIN:VCALENDAR
-                BEGIN:VEVENT
-                DTSTART:20171007T200000Z
-                DTEND:20171007T233000Z
-                DTSTAMP:20200319T182138Z
-                UID:4l80f6dcovnriq38g57g07btid@google.com
-                CREATED:20170719T202915Z
-                DESCRIPTION:
-                LAST-MODIFIED:20170930T190808Z
-                LOCATION:
-                SEQUENCE:1
-                STATUS:CONFIRMED
-                SUMMARY:Maryland Game
-                TRANSP:TRANSPARENT
-                END:VEVENT
-                END:VCALENDAR
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open calendar.txt
-                | from ics
-                | get events
-                | get properties
-                | where name == "SUMMARY"
-                | first
-                | get value
-            "#
-        ));
-
-        assert_eq!(actual.out, "Maryland Game");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/json.rs b/old_nushell/crates/nu-command/tests/format_conversions/json.rs
deleted file mode 100644
index 1cb059c14..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/json.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_json_text_and_from_json_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sgml_description.json
-            | to json
-            | from json
-            | get glossary.GlossDiv.GlossList.GlossEntry.GlossSee
-        "#
-    ));
-
-    assert_eq!(actual.out, "markup");
-}
-
-#[test]
-fn from_json_text_to_table() {
-    Playground::setup("filter_from_json_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.txt",
-            r#"
-                {
-                    "katz": [
-                        {"name":   "Yehuda", "rusty_luck": 1},
-                        {"name": "Jonathan", "rusty_luck": 1},
-                        {"name":   "Andres", "rusty_luck": 1},
-                        {"name":"GorbyPuff", "rusty_luck": 1}
-                    ]
-                }
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            "open katz.txt | from json | get katz | get rusty_luck | length "
-        );
-
-        assert_eq!(actual.out, "4");
-    })
-}
-
-#[test]
-fn from_json_text_recognizing_objects_independently_to_table() {
-    Playground::setup("filter_from_json_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "katz.txt",
-            r#"
-                {"name":   "Yehuda", "rusty_luck": 1}
-                {"name": "Jonathan", "rusty_luck": 1}
-                {"name":   "Andres", "rusty_luck": 1}
-                {"name":"GorbyPuff", "rusty_luck": 3}
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open katz.txt
-                | from json -o
-                | where name == "GorbyPuff"
-                | get rusty_luck
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn table_to_json_text() {
-    Playground::setup("filter_to_json_test", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "sample.txt",
-            r#"
-                JonAndrehudaTZ,3
-                GorbyPuff,100
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open sample.txt
-                | lines
-                | split column "," name luck
-                | select name
-                | to json
-                | from json
-                | nth 0
-                | get name
-            "#
-        ));
-
-        assert_eq!(actual.out, "JonAndrehudaTZ");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/markdown.rs b/old_nushell/crates/nu-command/tests/format_conversions/markdown.rs
deleted file mode 100644
index 15aef3275..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/markdown.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn md_empty() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[]; []] | from json | to md
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn md_empty_pretty() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo "{}" | from json | to md -p
-        "#
-    ));
-
-    assert_eq!(actual.out, "");
-}
-
-#[test]
-fn md_simple() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo 3 | to md
-        "#
-    ));
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn md_simple_pretty() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo 3 | to md -p
-        "#
-    ));
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn md_table() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[name]; [jason]] | to md
-        "#
-    ));
-
-    assert_eq!(actual.out, "|name||-||jason|");
-}
-
-#[test]
-fn md_table_pretty() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            echo [[name]; [joseph]] | to md -p
-        "#
-    ));
-
-    assert_eq!(actual.out, "| name   || ------ || joseph |");
-}
-
-#[test]
-fn md_combined() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            def title [] {
-                echo [[H1]; ["Nu top meals"]]
-            };
-
-            def meals [] {
-                echo [[dish]; [Arepa] [Taco] [Pizza]]
-            };
-
-            title
-            | append (meals)
-            | to md --per-element --pretty
-        "#
-    ));
-
-    assert_eq!(
-        actual.out,
-        "# Nu top meals| dish  || ----- || Arepa || Taco  || Pizza |"
-    );
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/mod.rs b/old_nushell/crates/nu-command/tests/format_conversions/mod.rs
deleted file mode 100644
index 5af12f9fc..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-mod bson;
-mod csv;
-mod eml;
-mod html;
-mod ics;
-mod json;
-mod markdown;
-mod ods;
-mod sqlite;
-mod ssv;
-mod toml;
-mod tsv;
-mod url;
-mod vcf;
-mod xlsx;
-mod xml;
-mod yaml;
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/ods.rs b/old_nushell/crates/nu-command/tests/format_conversions/ods.rs
deleted file mode 100644
index 5d5ce7ca7..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/ods.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn from_ods_file_to_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_data.ods
-            | get SalesOrders
-            | nth 4
-            | get Column2
-        "#
-    ));
-
-    assert_eq!(actual.out, "Gill");
-}
-
-#[test]
-fn from_ods_file_to_table_select_sheet() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_data.ods --raw
-            | from ods -s ["SalesOrders"]
-            | get
-        "#
-    ));
-
-    assert_eq!(actual.out, "SalesOrders");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/sqlite.rs b/old_nushell/crates/nu-command/tests/format_conversions/sqlite.rs
deleted file mode 100644
index de6ce8ccf..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/sqlite.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#[cfg(feature = "sqlite")]
-use nu_test_support::{nu, pipeline};
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn table_to_sqlite_and_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | to sqlite
-            | from sqlite
-            | get table_values
-            | nth 2
-            | get x
-        "#
-    ));
-
-    assert_eq!(actual.out, "hello");
-}
-
-#[cfg(feature = "sqlite")]
-#[test]
-fn table_to_sqlite_and_back_into_table_select_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample.db
-            | to sqlite
-            | from sqlite -t [strings]
-            | get table_names
-        "#
-    ));
-
-    assert_eq!(actual.out, "strings");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/ssv.rs b/old_nushell/crates/nu-command/tests/format_conversions/ssv.rs
deleted file mode 100644
index 76d704578..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/ssv.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn from_ssv_text_to_table() {
-    Playground::setup("filter_from_ssv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "oc_get_svc.txt",
-            r#"
-                NAME              LABELS                                    SELECTOR                  IP              PORT(S)
-                docker-registry   docker-registry=default                   docker-registry=default   172.30.78.158   5000/TCP
-                kubernetes        component=apiserver,provider=kubernetes   <none>                    172.30.0.2      443/TCP
-                kubernetes-ro     component=apiserver,provider=kubernetes   <none>                    172.30.0.1      80/TCP
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open oc_get_svc.txt
-                | from ssv
-                | nth 0
-                | get IP
-            "#
-        ));
-
-        assert_eq!(actual.out, "172.30.78.158");
-    })
-}
-
-#[test]
-fn from_ssv_text_to_table_with_separator_specified() {
-    Playground::setup("filter_from_ssv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "oc_get_svc.txt",
-            r#"
-                NAME              LABELS                                    SELECTOR                  IP              PORT(S)
-                docker-registry   docker-registry=default                   docker-registry=default   172.30.78.158   5000/TCP
-                kubernetes        component=apiserver,provider=kubernetes   <none>                    172.30.0.2      443/TCP
-                kubernetes-ro     component=apiserver,provider=kubernetes   <none>                    172.30.0.1      80/TCP
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open oc_get_svc.txt
-                | from ssv --minimum-spaces 3
-                | nth 0
-                | get IP
-            "#
-        ));
-
-        assert_eq!(actual.out, "172.30.78.158");
-    })
-}
-
-#[test]
-fn from_ssv_text_treating_first_line_as_data_with_flag() {
-    Playground::setup("filter_from_ssv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "oc_get_svc.txt",
-            r#"
-                docker-registry   docker-registry=default                   docker-registry=default   172.30.78.158   5000/TCP
-                kubernetes        component=apiserver,provider=kubernetes   <none>                    172.30.0.2      443/TCP
-                kubernetes-ro     component=apiserver,provider=kubernetes   <none>                    172.30.0.1      80/TCP
-            "#,
-        )]);
-
-        let aligned_columns = nu!(
-        cwd: dirs.test(), pipeline(
-            r#"
-                open oc_get_svc.txt
-                | from ssv --noheaders -a
-                | first
-                | get Column1
-            "#
-        ));
-
-        let separator_based = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open oc_get_svc.txt
-                | from ssv --noheaders
-                | first
-                | get Column1
-                
-            "#
-        ));
-
-        assert_eq!(aligned_columns.out, separator_based.out);
-        assert_eq!(separator_based.out, "docker-registry");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/toml.rs b/old_nushell/crates/nu-command/tests/format_conversions/toml.rs
deleted file mode 100644
index cffeed1c2..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/toml.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_toml_text_and_from_toml_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open cargo_sample.toml
-            | to toml
-            | from toml
-            | get package.name
-        "#
-    ));
-
-    assert_eq!(actual.out, "nu");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/tsv.rs b/old_nushell/crates/nu-command/tests/format_conversions/tsv.rs
deleted file mode 100644
index 066fa16ad..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/tsv.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_tsv_text_and_from_tsv_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        "open caco3_plastics.tsv | to tsv | from tsv | first 1 | get origin"
-    );
-
-    assert_eq!(actual.out, "SPAIN");
-}
-
-#[test]
-fn table_to_tsv_text_and_from_tsv_text_back_into_table_using_csv_separator() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats",
-        r"open caco3_plastics.tsv | to tsv | from csv --separator '\t' | first 1 | get origin"
-    );
-
-    assert_eq!(actual.out, "SPAIN");
-}
-
-#[test]
-fn table_to_tsv_text() {
-    Playground::setup("filter_to_tsv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "tsv_text_sample.txt",
-            r#"
-                importer	shipper	tariff_item	name	origin
-                Plasticos Rival	Reverte	2509000000	Calcium carbonate	Spain
-                Tigre Ecuador	OMYA Andina	3824909999	Calcium carbonate	Colombia
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open tsv_text_sample.txt
-                | lines
-                | split column "\t" a b c d origin
-                | last 1
-                | to tsv
-                | lines
-                | nth 1
-            "#
-        ));
-
-        assert!(actual.out.contains("Colombia"));
-    })
-}
-
-#[test]
-fn table_to_tsv_text_skipping_headers_after_conversion() {
-    Playground::setup("filter_to_tsv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "tsv_text_sample.txt",
-            r#"
-                importer    shipper tariff_item name    origin
-                Plasticos Rival Reverte 2509000000  Calcium carbonate   Spain
-                Tigre Ecuador   OMYA Andina 3824909999  Calcium carbonate   Colombia
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open tsv_text_sample.txt
-                | lines
-                | split column "\t" a b c d origin
-                | last 1
-                | to tsv --noheaders
-            "#
-        ));
-
-        assert!(actual.out.contains("Colombia"));
-    })
-}
-
-#[test]
-fn from_tsv_text_to_table() {
-    Playground::setup("filter_from_tsv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_amigos.txt",
-            r#"
-                first Name	Last Name	rusty_luck
-                Andrés	Robalino	1
-                Jonathan	Turner	1
-                Yehuda	Katz	1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_amigos.txt
-                | from tsv
-                | get rusty_luck
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn from_tsv_text_skipping_headers_to_table() {
-    Playground::setup("filter_from_tsv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "los_tres_amigos.txt",
-            r#"
-                Andrés	Robalino	1
-                Jonathan	Turner	1
-                Yehuda	Katz	1
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open los_tres_amigos.txt
-                | from tsv --noheaders
-                | get Column3
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "3");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/url.rs b/old_nushell/crates/nu-command/tests/format_conversions/url.rs
deleted file mode 100644
index 2187fa382..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/url.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn can_encode_and_decode_urlencoding() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-            r#"
-                open sample.url
-                | to url
-                | from url
-                | get cheese
-            "#
-    ));
-
-    assert_eq!(actual.out, "comté");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/vcf.rs b/old_nushell/crates/nu-command/tests/format_conversions/vcf.rs
deleted file mode 100644
index 9d03dd625..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/vcf.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn infers_types() {
-    Playground::setup("filter_from_vcf_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "contacts.vcf",
-            r#"
-                BEGIN:VCARD
-                VERSION:3.0
-                FN:John Doe
-                N:Doe;John;;;
-                EMAIL;TYPE=INTERNET:john.doe99@gmail.com
-                item1.ORG:'Alpine Ski Resort'
-                item1.X-ABLabel:Other
-                item2.TITLE:'Ski Instructor'
-                item2.X-ABLabel:Other
-                BDAY:19001106
-                NOTE:Facebook: john.doe.3\nWebsite: \nHometown: Cleveland\, Ohio
-                CATEGORIES:myContacts
-                END:VCARD
-                BEGIN:VCARD
-                VERSION:3.0
-                FN:Alex Smith
-                N:Smith;Alex;;;
-                TEL;TYPE=CELL:(890) 123-4567
-                CATEGORIES:Band,myContacts
-                END:VCARD
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open contacts.vcf
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.out, "2");
-    })
-}
-
-#[test]
-fn from_vcf_text_to_table() {
-    Playground::setup("filter_from_vcf_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "contacts.txt",
-            r#"
-                BEGIN:VCARD
-                VERSION:3.0
-                FN:John Doe
-                N:Doe;John;;;
-                EMAIL;TYPE=INTERNET:john.doe99@gmail.com
-                item1.ORG:'Alpine Ski Resort'
-                item1.X-ABLabel:Other
-                item2.TITLE:'Ski Instructor'
-                item2.X-ABLabel:Other
-                BDAY:19001106
-                NOTE:Facebook: john.doe.3\nWebsite: \nHometown: Cleveland\, Ohio
-                CATEGORIES:myContacts
-                END:VCARD
-            "#,
-        )]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open contacts.txt
-                | from vcf
-                | get properties
-                | where name == "EMAIL"
-                | first
-                | get value
-            "#
-        ));
-
-        assert_eq!(actual.out, "john.doe99@gmail.com");
-    })
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/xlsx.rs b/old_nushell/crates/nu-command/tests/format_conversions/xlsx.rs
deleted file mode 100644
index 36b3aca17..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/xlsx.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn from_excel_file_to_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_data.xlsx
-            | get SalesOrders
-            | nth 4
-            | get Column2
-        "#
-    ));
-
-    assert_eq!(actual.out, "Gill");
-}
-
-#[test]
-fn from_excel_file_to_table_select_sheet() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open sample_data.xlsx --raw
-            | from xlsx -s ["SalesOrders"]
-            | get
-        "#
-    ));
-
-    assert_eq!(actual.out, "SalesOrders");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/xml.rs b/old_nushell/crates/nu-command/tests/format_conversions/xml.rs
deleted file mode 100644
index 068296195..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/xml.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_xml_text_and_from_xml_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open jonathan.xml
-            | to xml
-            | from xml
-            | get rss.children.channel.children.0.item.children.0.guid.attributes.isPermaLink
-        "#
-    ));
-
-    assert_eq!(actual.out, "true");
-}
diff --git a/old_nushell/crates/nu-command/tests/format_conversions/yaml.rs b/old_nushell/crates/nu-command/tests/format_conversions/yaml.rs
deleted file mode 100644
index 887256637..000000000
--- a/old_nushell/crates/nu-command/tests/format_conversions/yaml.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn table_to_yaml_text_and_from_yaml_text_back_into_table() {
-    let actual = nu!(
-        cwd: "tests/fixtures/formats", pipeline(
-        r#"
-            open appveyor.yml
-            | to yaml
-            | from yaml
-            | get environment.global.PROJECT_NAME
-        "#
-    ));
-
-    assert_eq!(actual.out, "nushell");
-}
diff --git a/old_nushell/crates/nu-command/tests/main.rs b/old_nushell/crates/nu-command/tests/main.rs
deleted file mode 100644
index bd02ef653..000000000
--- a/old_nushell/crates/nu-command/tests/main.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use quickcheck_macros::quickcheck;
-
-mod commands;
-mod format_conversions;
-
-use nu_engine::EvaluationContext;
-
-#[quickcheck]
-fn quickcheck_parse(data: String) -> bool {
-    let (tokens, err) = nu_parser::lex(&data, 0, nu_parser::NewlineMode::Normal);
-    let (lite_block, err2) = nu_parser::parse_block(tokens);
-
-    if err.is_none() && err2.is_none() {
-        let context = EvaluationContext::basic();
-        let _ = nu_parser::classify_block(&lite_block, &context.scope);
-    }
-    true
-}
diff --git a/old_nushell/crates/nu-completion/Cargo.toml b/old_nushell/crates/nu-completion/Cargo.toml
deleted file mode 100644
index 04153adf2..000000000
--- a/old_nushell/crates/nu-completion/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Completions for nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-completion"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-engine = { version = "0.43.0", path="../nu-engine" }
-nu-data = { version = "0.43.0", path="../nu-data" }
-nu-parser = { version = "0.43.0", path="../nu-parser" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-indexmap = { version="1.6.1", features=["serde-1"] }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-is_executable = "1.0.1"
-
-[dev-dependencies]
-parking_lot = "0.11.1"
diff --git a/old_nushell/crates/nu-completion/src/command.rs b/old_nushell/crates/nu-completion/src/command.rs
deleted file mode 100644
index 7db121de2..000000000
--- a/old_nushell/crates/nu-completion/src/command.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use super::matchers::Matcher;
-use crate::{Completer, CompletionContext, Suggestion};
-use indexmap::set::IndexSet;
-#[cfg(not(target_arch = "wasm32"))]
-use is_executable::IsExecutable;
-use nu_test_support::NATIVE_PATH_ENV_VAR;
-use std::iter::FromIterator;
-use std::path::Path;
-
-pub struct CommandCompleter;
-
-impl<Context> Completer<Context> for CommandCompleter
-where
-    Context: CompletionContext,
-{
-    fn complete(&self, ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion> {
-        let registry = ctx.signature_registry();
-        let mut commands: IndexSet<String> = IndexSet::from_iter(registry.names());
-
-        // Command suggestions can come from three possible sets:
-        //   1. internal command names,
-        //   2. external command names relative to PATH env var, and
-        //   3. any other executable (that matches what's been typed so far).
-
-        let path_executables = find_path_executables().unwrap_or_default();
-
-        // TODO quote these, if necessary
-        commands.extend(path_executables);
-
-        let mut suggestions: Vec<_> = commands
-            .into_iter()
-            .filter(|v| matcher.matches(partial, v))
-            .map(|v| Suggestion {
-                replacement: v.clone(),
-                display: v,
-            })
-            .collect();
-
-        if !partial.is_empty() {
-            let path_completer = crate::path::PathCompleter;
-            let path_results = path_completer.path_suggestions(partial, matcher);
-            let iter = path_results.into_iter().filter_map(|path_suggestion| {
-                let path = path_suggestion.path;
-                if path.is_dir() || is_executable(&path) {
-                    Some(path_suggestion.suggestion)
-                } else {
-                    None
-                }
-            });
-
-            suggestions.extend(iter);
-        }
-
-        suggestions
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-fn is_executable(path: &Path) -> bool {
-    // This call to a crate essentially checks the PATHEXT on Windows and does some
-    // low level WinAPI calls to determine if the file is executable. It seems quite
-    // a bit faster than calling path.metadata().
-    // On Unix, this checks the file metadata. The underlying code traverses symlinks.
-    path.is_executable()
-}
-
-#[cfg(target_arch = "wasm32")]
-fn is_executable(_path: &Path) -> bool {
-    false
-}
-
-// TODO cache these, but watch for changes to PATH
-fn find_path_executables() -> Option<IndexSet<String>> {
-    let path_var = std::env::var_os(NATIVE_PATH_ENV_VAR)?;
-    let paths: Vec<_> = std::env::split_paths(&path_var).collect();
-
-    let mut executables: IndexSet<String> = IndexSet::new();
-    for path in paths {
-        if let Ok(mut contents) = std::fs::read_dir(path) {
-            while let Some(Ok(item)) = contents.next() {
-                if is_executable(&item.path()) {
-                    if let Ok(name) = item.file_name().into_string() {
-                        executables.insert(name);
-                    }
-                }
-            }
-        }
-    }
-
-    Some(executables)
-}
diff --git a/old_nushell/crates/nu-completion/src/completer.rs b/old_nushell/crates/nu-completion/src/completer.rs
deleted file mode 100644
index def926f02..000000000
--- a/old_nushell/crates/nu-completion/src/completer.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-use std::borrow::Cow;
-
-use nu_parser::NewlineMode;
-use nu_source::{Span, Tag};
-
-use crate::command::CommandCompleter;
-use crate::engine;
-use crate::flag::FlagCompleter;
-use crate::matchers;
-use crate::matchers::Matcher;
-use crate::path::{PathCompleter, PathSuggestion};
-use crate::variable::VariableCompleter;
-use crate::{Completer, CompletionContext, Suggestion};
-
-pub struct NuCompleter {}
-
-impl NuCompleter {}
-
-impl NuCompleter {
-    pub fn complete<Context: CompletionContext>(
-        &self,
-        line: &str,
-        pos: usize,
-        context: &Context,
-    ) -> (usize, Vec<Suggestion>) {
-        use engine::LocationType;
-
-        let tokens = nu_parser::lex(line, 0, NewlineMode::Normal).0;
-
-        let locations = Some(nu_parser::parse_block(tokens).0)
-            .map(|block| nu_parser::classify_block(&block, context.scope()))
-            .map(|(block, _)| engine::completion_location(line, &block, pos))
-            .unwrap_or_default();
-
-        let matcher = nu_data::config::config(Tag::unknown())
-            .ok()
-            .and_then(|cfg| cfg.get("line_editor").cloned())
-            .and_then(|le| {
-                le.row_entries()
-                    .find(|&(idx, _value)| idx == "completion_match_method")
-                    .and_then(|(_idx, value)| value.as_string().ok())
-            })
-            .unwrap_or_else(String::new);
-
-        let matcher = matcher.as_str();
-        let matcher: &dyn Matcher = match matcher {
-            "case-insensitive" => &matchers::case_insensitive::Matcher,
-            "case-sensitive" => &matchers::case_sensitive::Matcher,
-            #[cfg(target_os = "windows")]
-            _ => &matchers::case_insensitive::Matcher,
-            #[cfg(not(target_os = "windows"))]
-            _ => &matchers::case_sensitive::Matcher,
-        };
-
-        if locations.is_empty() {
-            (pos, Vec::new())
-        } else {
-            let mut pos = locations[0].span.start();
-
-            for location in &locations {
-                if location.span.start() < pos {
-                    pos = location.span.start();
-                }
-            }
-            let suggestions = locations
-                .into_iter()
-                .flat_map(|location| {
-                    let partial = location.span.slice(line).to_string();
-                    match location.item {
-                        LocationType::Command => {
-                            let command_completer = CommandCompleter;
-                            command_completer.complete(context, &partial, matcher.to_owned())
-                        }
-
-                        LocationType::Flag(cmd) => {
-                            let flag_completer = FlagCompleter { cmd };
-                            flag_completer.complete(context, &partial, matcher.to_owned())
-                        }
-
-                        LocationType::Argument(cmd, _arg_name) => {
-                            let path_completer = PathCompleter;
-                            let prepend = Span::new(pos, location.span.start()).slice(line);
-
-                            const QUOTE_CHARS: &[char] = &['\'', '"'];
-
-                            // TODO Find a better way to deal with quote chars. Can the completion
-                            //      engine relay this back to us? Maybe have two spans: inner and
-                            //      outer. The former is what we want to complete, the latter what
-                            //      we'd need to replace.
-                            let (quote_char, partial) = if partial.starts_with(QUOTE_CHARS) {
-                                let (head, tail) = partial.split_at(1);
-                                (Some(head), tail.to_string())
-                            } else {
-                                (None, partial)
-                            };
-
-                            let (mut partial, quoted) = if let Some(quote_char) = quote_char {
-                                if partial.ends_with(quote_char) {
-                                    (partial[..partial.len() - 1].to_string(), true)
-                                } else {
-                                    (partial, false)
-                                }
-                            } else {
-                                (partial, false)
-                            };
-
-                            partial = partial.split('"').collect::<Vec<_>>().join("");
-                            let completed_paths =
-                                path_completer.path_suggestions(&partial, matcher);
-                            match cmd.as_deref().unwrap_or("") {
-                                "cd" => select_directory_suggestions(completed_paths),
-                                _ => completed_paths,
-                            }
-                            .into_iter()
-                            .map(|s| Suggestion {
-                                replacement: format!(
-                                    "{}{}",
-                                    prepend,
-                                    requote(s.suggestion.replacement, quoted)
-                                ),
-                                display: s.suggestion.display,
-                            })
-                            .collect()
-                        }
-
-                        LocationType::Variable => {
-                            let variable_completer = VariableCompleter;
-                            variable_completer.complete(context, &partial, matcher.to_owned())
-                        }
-                    }
-                })
-                .collect();
-
-            (pos, suggestions)
-        }
-    }
-}
-
-fn select_directory_suggestions(completed_paths: Vec<PathSuggestion>) -> Vec<PathSuggestion> {
-    completed_paths
-        .into_iter()
-        .filter(|suggestion| {
-            suggestion
-                .path
-                .metadata()
-                .map(|md| md.is_dir())
-                .unwrap_or(false)
-        })
-        .collect()
-}
-
-fn requote(orig_value: String, previously_quoted: bool) -> String {
-    let value: Cow<str> = {
-        #[cfg(feature = "rustyline-support")]
-        {
-            rustyline::completion::unescape(&orig_value, Some('\\'))
-        }
-        #[cfg(not(feature = "rustyline-support"))]
-        {
-            orig_value.into()
-        }
-    };
-
-    let mut quotes = vec!['"', '\''];
-    let mut should_quote = false;
-    for c in value.chars() {
-        if c.is_whitespace() || c == '#' {
-            should_quote = true;
-        } else if let Some(index) = quotes.iter().position(|q| *q == c) {
-            should_quote = true;
-            quotes.swap_remove(index);
-        }
-    }
-
-    if should_quote {
-        if quotes.is_empty() {
-            // TODO we don't really have an escape character, so there isn't a great option right
-            //      now. One possibility is `{{(char backtick)}}`
-            value.to_string()
-        } else {
-            let quote = quotes[0];
-            if previously_quoted {
-                format!("{}{}", quote, value)
-            } else {
-                format!("{}{}{}", quote, value, quote)
-            }
-        }
-    } else {
-        value.to_string()
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/engine.rs b/old_nushell/crates/nu-completion/src/engine.rs
deleted file mode 100644
index 67158548e..000000000
--- a/old_nushell/crates/nu-completion/src/engine.rs
+++ /dev/null
@@ -1,497 +0,0 @@
-use nu_protocol::hir::*;
-use nu_source::{Span, Spanned, SpannedItem};
-
-#[derive(Debug, Clone, Eq, PartialEq)]
-pub enum LocationType {
-    Command,
-    Flag(String),                             // command name
-    Argument(Option<String>, Option<String>), // command name, argument name
-    Variable,
-}
-
-pub type CompletionLocation = Spanned<LocationType>;
-
-// TODO The below is very similar to shapes / expression_to_flat_shape. Check back October 2020
-//      to see if we're close enough to just make use of those.
-
-struct Flatten<'s> {
-    line: &'s str,
-    command: Option<String>,
-    flag: Option<String>,
-}
-
-impl<'s> Flatten<'s> {
-    /// Converts a SpannedExpression into a completion location for use in NuCompleter
-    fn expression(&self, e: &SpannedExpression) -> Vec<CompletionLocation> {
-        match &e.expr {
-            Expression::Block(block) => self.completion_locations(block),
-            Expression::Subexpression(block) => self.completion_locations(block),
-            Expression::List(exprs) => exprs.iter().flat_map(|v| self.expression(v)).collect(),
-            Expression::Table(headers, cells) => headers
-                .iter()
-                .flat_map(|v| self.expression(v))
-                .chain(
-                    cells
-                        .iter()
-                        .flat_map(|v| v.iter().flat_map(|v| self.expression(v))),
-                )
-                .collect(),
-            Expression::Command => vec![LocationType::Command.spanned(e.span)],
-            Expression::FullColumnPath(path) => self.expression(&path.head),
-            Expression::Variable(_, _) => vec![LocationType::Variable.spanned(e.span)],
-
-            Expression::Boolean(_)
-            | Expression::FilePath(_)
-            | Expression::Literal(Literal::ColumnPath(_))
-            | Expression::Literal(Literal::GlobPattern(_))
-            | Expression::Literal(Literal::Number(_))
-            | Expression::Literal(Literal::Size(_, _))
-            | Expression::Literal(Literal::String(_)) => {
-                vec![
-                    LocationType::Argument(self.command.clone(), self.flag.clone()).spanned(e.span),
-                ]
-            }
-
-            Expression::Binary(binary) => {
-                let mut result = Vec::new();
-                result.append(&mut self.expression(&binary.left));
-                result.append(&mut self.expression(&binary.right));
-                result
-            }
-            Expression::Range(range) => {
-                let mut result = Vec::new();
-                if let Some(left) = &range.left {
-                    result.append(&mut self.expression(left));
-                }
-                if let Some(right) = &range.right {
-                    result.append(&mut self.expression(right));
-                }
-                result
-            }
-
-            Expression::ExternalWord
-            | Expression::ExternalCommand(_)
-            | Expression::Synthetic(_)
-            | Expression::Literal(Literal::Operator(_))
-            | Expression::Literal(Literal::Bare(_))
-            | Expression::Garbage => Vec::new(),
-        }
-    }
-
-    fn internal_command(&self, internal: &InternalCommand) -> Vec<CompletionLocation> {
-        let mut result = Vec::new();
-
-        match internal.args.head.expr {
-            Expression::Command => {
-                result.push(LocationType::Command.spanned(internal.name_span));
-            }
-            Expression::Literal(Literal::String(_)) => {
-                result.push(LocationType::Command.spanned(internal.name_span));
-            }
-            _ => (),
-        }
-
-        if let Some(positionals) = &internal.args.positional {
-            let mut positionals = positionals.iter();
-
-            if internal.name == "run_external" {
-                if let Some(external_command) = positionals.next() {
-                    result.push(LocationType::Command.spanned(external_command.span));
-                }
-            }
-
-            result.extend(positionals.flat_map(|positional| match positional.expr {
-                Expression::Garbage => {
-                    let garbage = positional.span.slice(self.line);
-                    let location = if garbage.starts_with('-') {
-                        LocationType::Flag(internal.name.clone())
-                    } else {
-                        // TODO we may be able to map this to the name of a positional,
-                        //      but we'll need a signature
-                        LocationType::Argument(Some(internal.name.clone()), None)
-                    };
-
-                    vec![location.spanned(positional.span)]
-                }
-
-                _ => self.expression(positional),
-            }));
-        }
-
-        if let Some(named) = &internal.args.named {
-            for (name, kind) in &named.named {
-                match kind {
-                    NamedValue::PresentSwitch(span) => {
-                        result.push(LocationType::Flag(internal.name.clone()).spanned(*span));
-                    }
-
-                    NamedValue::Value(span, expr) => {
-                        result.push(LocationType::Flag(internal.name.clone()).spanned(*span));
-                        result.append(&mut self.with_flag(name.clone()).expression(expr));
-                    }
-
-                    _ => (),
-                }
-            }
-        }
-
-        result
-    }
-
-    fn pipeline(&self, pipeline: &Pipeline) -> Vec<CompletionLocation> {
-        let mut result = Vec::new();
-
-        for command in &pipeline.list {
-            match command {
-                ClassifiedCommand::Internal(internal) => {
-                    let engine = self.with_command(internal.name.clone());
-                    result.append(&mut engine.internal_command(internal));
-                }
-
-                ClassifiedCommand::Expr(expr) => result.append(&mut self.expression(expr)),
-                _ => (),
-            }
-        }
-
-        result
-    }
-
-    /// Flattens the block into a Vec of completion locations
-    pub fn completion_locations(&self, block: &Block) -> Vec<CompletionLocation> {
-        block
-            .block
-            .iter()
-            .flat_map(|g| g.pipelines.iter().flat_map(|v| self.pipeline(v)))
-            .collect()
-    }
-
-    pub fn new(line: &'s str) -> Flatten<'s> {
-        Flatten {
-            line,
-            command: None,
-            flag: None,
-        }
-    }
-
-    pub fn with_command(&self, command: String) -> Flatten<'s> {
-        Flatten {
-            line: self.line,
-            command: Some(command),
-            flag: None,
-        }
-    }
-
-    pub fn with_flag(&self, flag: String) -> Flatten<'s> {
-        Flatten {
-            line: self.line,
-            command: self.command.clone(),
-            flag: Some(flag),
-        }
-    }
-}
-
-/// Characters that precede a command name
-const BEFORE_COMMAND_CHARS: &[char] = &['|', '(', ';'];
-
-/// Determines the completion location for a given block at the given cursor position
-pub fn completion_location(line: &str, block: &Block, pos: usize) -> Vec<CompletionLocation> {
-    let completion_engine = Flatten::new(line);
-    let locations = completion_engine.completion_locations(block);
-
-    if locations.is_empty() {
-        vec![LocationType::Command.spanned(Span::unknown())]
-    } else {
-        let mut command = None;
-        let mut prev = None;
-
-        for loc in &locations {
-            // We don't use span.contains because we want to include the end. This handles the case
-            // where the cursor is just after the text (i.e., no space between cursor and text)
-            if loc.span.start() <= pos && pos <= loc.span.end() {
-                // The parser sees the "-" in `cmd -` as an argument, but the user is likely
-                // expecting a flag.
-                return match loc.item {
-                    LocationType::Argument(ref cmd, _) => {
-                        if loc.span.slice(line) == "-" {
-                            let cmd = cmd.clone();
-                            let span = loc.span;
-                            vec![
-                                loc.clone(),
-                                LocationType::Flag(cmd.unwrap_or_default()).spanned(span),
-                            ]
-                        } else {
-                            let mut output = vec![];
-
-                            for rloc in locations.iter().rev() {
-                                if let Spanned {
-                                    span,
-                                    item: LocationType::Command,
-                                } = &rloc
-                                {
-                                    if span.start() <= pos {
-                                        output.push(
-                                            LocationType::Command
-                                                .spanned(Span::new(span.start(), pos)),
-                                        );
-                                        break;
-                                    }
-                                }
-                            }
-
-                            output.push({
-                                let mut partial_loc = loc.clone();
-                                partial_loc.span = Span::new(loc.span.start(), pos);
-                                partial_loc
-                            });
-                            output
-                        }
-                    }
-                    _ => vec![{
-                        let mut partial_loc = loc.clone();
-                        partial_loc.span = Span::new(loc.span.start(), pos);
-                        partial_loc
-                    }],
-                };
-            } else if pos < loc.span.start() {
-                break;
-            }
-
-            if let LocationType::Command = loc.item {
-                command = Some(String::from(loc.span.slice(line)));
-            }
-
-            prev = Some(loc);
-        }
-
-        if let Some(prev) = prev {
-            let mut locations = vec![];
-            // Cursor is between locations (or at the end). Look at the line to see if the cursor
-            // is after some character that would imply we're in the command position.
-            let start = prev.span.end();
-
-            if let Spanned {
-                item: LocationType::Command,
-                span,
-            } = &prev
-            {
-                locations.push(LocationType::Command.spanned(Span::new(span.start(), pos)));
-            }
-            if line[start..pos].contains(BEFORE_COMMAND_CHARS) {
-                locations.push(LocationType::Command.spanned(Span::new(pos, pos)));
-            } else {
-                // TODO this should be able to be mapped to a command
-                locations.push(LocationType::Argument(command, None).spanned(Span::new(pos, pos)));
-            }
-            locations
-        } else {
-            // Cursor is before any possible completion location, so must be a command
-            vec![LocationType::Command.spanned(Span::unknown())]
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use super::*;
-
-    use nu_parser::{classify_block, lex, parse_block, ParserScope};
-    use nu_protocol::{Signature, SyntaxShape};
-
-    #[derive(Clone, Debug)]
-    struct VecRegistry(Vec<Signature>);
-
-    impl From<Vec<Signature>> for VecRegistry {
-        fn from(v: Vec<Signature>) -> Self {
-            VecRegistry(v)
-        }
-    }
-
-    impl ParserScope for VecRegistry {
-        fn has_signature(&self, name: &str) -> bool {
-            self.0.iter().any(|v| v.name == name)
-        }
-
-        fn get_signature(&self, name: &str) -> Option<nu_protocol::Signature> {
-            self.0.iter().find(|v| v.name == name).cloned()
-        }
-
-        fn get_alias(&self, _name: &str) -> Option<Vec<Spanned<String>>> {
-            None
-        }
-
-        fn add_alias(&self, _name: &str, _replacement: Vec<Spanned<String>>) {
-            todo!()
-        }
-
-        fn remove_alias(&self, _name: &str) {
-            todo!()
-        }
-
-        fn add_definition(&self, _block: Arc<Block>) {}
-
-        fn get_definitions(&self) -> Vec<Arc<Block>> {
-            vec![]
-        }
-
-        fn enter_scope(&self) {}
-
-        fn exit_scope(&self) {}
-    }
-
-    mod completion_location {
-        use super::*;
-
-        fn completion_location(
-            line: &str,
-            scope: &dyn ParserScope,
-            pos: usize,
-        ) -> Vec<CompletionLocation> {
-            let (tokens, _) = lex(line, 0, nu_parser::NewlineMode::Normal);
-            let (lite_block, _) = parse_block(tokens);
-
-            scope.enter_scope();
-            let (block, _) = classify_block(&lite_block, scope);
-            scope.exit_scope();
-
-            super::completion_location(line, &block, pos)
-        }
-
-        #[test]
-        fn completes_internal_command_names() {
-            let registry: VecRegistry =
-                vec![Signature::build("echo").rest("rest", SyntaxShape::Any, "the values to echo")]
-                    .into();
-            let line = "echo 1 | echo 2";
-
-            assert_eq!(
-                completion_location(line, &registry, 10),
-                vec![LocationType::Command.spanned(Span::new(9, 10)),],
-            );
-        }
-
-        #[test]
-        fn completes_external_command_names() {
-            let registry: VecRegistry = Vec::new().into();
-            let line = "echo 1 | echo 2";
-
-            assert_eq!(
-                completion_location(line, &registry, 10),
-                vec![LocationType::Command.spanned(Span::new(9, 10)),],
-            );
-        }
-
-        #[test]
-        fn completes_command_names_when_cursor_immediately_after_command_name() {
-            let registry: VecRegistry = Vec::new().into();
-            let line = "echo 1 | echo 2";
-
-            assert_eq!(
-                completion_location(line, &registry, 4),
-                vec![LocationType::Command.spanned(Span::new(0, 4)),],
-            );
-        }
-
-        #[test]
-        fn completes_variables() {
-            let registry: VecRegistry = Vec::new().into();
-            let line = "echo $nu.env.";
-
-            assert_eq!(
-                completion_location(line, &registry, 13),
-                vec![LocationType::Variable.spanned(Span::new(5, 13)),],
-            );
-        }
-
-        #[test]
-        fn completes_flags() {
-            let registry: VecRegistry = vec![Signature::build("du")
-                .switch("recursive", "the values to echo", None)
-                .rest("rest", SyntaxShape::Any, "blah")]
-            .into();
-
-            let line = "du --recurs";
-
-            assert_eq!(
-                completion_location(line, &registry, 7),
-                vec![LocationType::Flag("du".to_string()).spanned(Span::new(3, 7)),],
-            );
-        }
-
-        #[test]
-        fn completes_incomplete_nested_structure() {
-            let registry: VecRegistry = vec![Signature::build("sys")].into();
-            let line = "echo (sy";
-
-            assert_eq!(
-                completion_location(line, &registry, 8),
-                vec![LocationType::Command.spanned(Span::new(6, 8)),],
-            );
-        }
-
-        #[test]
-        fn has_correct_command_name_for_argument() {
-            let registry: VecRegistry = vec![Signature::build("cd")].into();
-            let line = "cd ";
-
-            assert_eq!(
-                completion_location(line, &registry, 3),
-                vec![
-                    LocationType::Command.spanned(Span::new(0, 3)),
-                    LocationType::Argument(Some("cd".to_string()), None).spanned(Span::new(3, 3)),
-                ],
-            );
-        }
-
-        #[test]
-        fn completes_flags_with_just_a_single_hyphen() {
-            let registry: VecRegistry = vec![Signature::build("du")
-                .switch("recursive", "the values to echo", None)
-                .rest("rest", SyntaxShape::Any, "blah")]
-            .into();
-
-            let line = "du -";
-
-            assert_eq!(
-                completion_location(line, &registry, 3),
-                vec![
-                    LocationType::Argument(Some("du".to_string()), None).spanned(Span::new(3, 4)),
-                    LocationType::Flag("du".to_string()).spanned(Span::new(3, 4)),
-                ],
-            );
-        }
-
-        #[test]
-        fn completes_arguments() {
-            let registry: VecRegistry =
-                vec![Signature::build("echo").rest("rest", SyntaxShape::Any, "the values to echo")]
-                    .into();
-            let line = "echo 1 | echo 2";
-
-            assert_eq!(
-                completion_location(line, &registry, 6),
-                vec![
-                    LocationType::Command.spanned(Span::new(0, 6)),
-                    LocationType::Argument(Some("echo".to_string()), None).spanned(Span::new(5, 6)),
-                ],
-            );
-        }
-
-        #[test]
-        fn completes_argument_when_cursor_inside_argument() {
-            let registry: VecRegistry =
-                vec![Signature::build("echo").rest("rest", SyntaxShape::Any, "the values to echo")]
-                    .into();
-            let line = "echo 123";
-
-            assert_eq!(
-                completion_location(line, &registry, 6),
-                vec![
-                    LocationType::Command.spanned(Span::new(0, 6)),
-                    LocationType::Argument(Some("echo".to_string()), None).spanned(Span::new(5, 6)),
-                ],
-            );
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/flag.rs b/old_nushell/crates/nu-completion/src/flag.rs
deleted file mode 100644
index 88b8ddaf8..000000000
--- a/old_nushell/crates/nu-completion/src/flag.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use super::matchers::Matcher;
-use crate::{Completer, CompletionContext, Suggestion};
-
-pub struct FlagCompleter {
-    pub(crate) cmd: String,
-}
-
-impl<Context> Completer<Context> for FlagCompleter
-where
-    Context: CompletionContext,
-{
-    fn complete(&self, ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion> {
-        if let Some(sig) = ctx.signature_registry().get(&self.cmd) {
-            let mut suggestions = Vec::new();
-            for (name, (named_type, _desc)) in &sig.named {
-                suggestions.push(format!("--{}", name));
-
-                if let Some(c) = named_type.get_short() {
-                    suggestions.push(format!("-{}", c));
-                }
-            }
-
-            suggestions
-                .into_iter()
-                .filter(|v| matcher.matches(partial, v))
-                .map(|v| Suggestion {
-                    replacement: format!("{} ", v),
-                    display: v,
-                })
-                .collect()
-        } else {
-            Vec::new()
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/lib.rs b/old_nushell/crates/nu-completion/src/lib.rs
deleted file mode 100644
index 4774f933f..000000000
--- a/old_nushell/crates/nu-completion/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-pub(crate) mod command;
-pub(crate) mod completer;
-pub(crate) mod engine;
-pub(crate) mod flag;
-pub(crate) mod matchers;
-pub(crate) mod path;
-pub(crate) mod variable;
-
-use nu_engine::EvaluationContext;
-use nu_protocol::{SignatureRegistry, VariableRegistry};
-
-use matchers::Matcher;
-
-pub use completer::NuCompleter;
-
-#[derive(Debug, Eq, PartialEq)]
-pub struct Suggestion {
-    pub display: String,
-    pub replacement: String,
-}
-
-impl Suggestion {
-    fn new(display: impl Into<String>, replacement: impl Into<String>) -> Self {
-        Self {
-            display: display.into(),
-            replacement: replacement.into(),
-        }
-    }
-}
-
-pub trait CompletionContext {
-    fn signature_registry(&self) -> &dyn SignatureRegistry;
-    fn scope(&self) -> &dyn nu_parser::ParserScope;
-    fn source(&self) -> &EvaluationContext;
-    fn variable_registry(&self) -> &dyn VariableRegistry;
-}
-
-pub trait Completer<Context: CompletionContext> {
-    fn complete(&self, ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion>;
-}
diff --git a/old_nushell/crates/nu-completion/src/matchers/case_insensitive.rs b/old_nushell/crates/nu-completion/src/matchers/case_insensitive.rs
deleted file mode 100644
index 9c3ad47a5..000000000
--- a/old_nushell/crates/nu-completion/src/matchers/case_insensitive.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::matchers;
-
-pub struct Matcher;
-
-impl matchers::Matcher for Matcher {
-    fn matches(&self, partial: &str, from: &str) -> bool {
-        from.to_ascii_lowercase()
-            .starts_with(&partial.to_ascii_lowercase())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // TODO: check some unicode matches if this becomes relevant
-
-    // FIXME: could work exhaustively through ['-', '--'. ''] in a loop for each test
-    #[test]
-    fn completes_exact_matches() {
-        let matcher: Box<dyn matchers::Matcher> = Box::new(Matcher);
-
-        assert!(matcher.matches("shouldmatch", "shouldmatch"));
-        assert!(matcher.matches("shouldm", "shouldmatch"));
-        assert!(matcher.matches("--also-should-m", "--also-should-match"));
-        assert!(matcher.matches("-also-should-m", "-also-should-match"));
-    }
-
-    #[test]
-    fn completes_case_insensitive_matches() {
-        let matcher: Box<dyn matchers::Matcher> = Box::new(Matcher);
-
-        assert!(matcher.matches("thisshould", "Thisshouldmatch"));
-        assert!(matcher.matches("--Shouldm", "--shouldmatch"));
-        assert!(matcher.matches("-Shouldm", "-shouldmatch"));
-    }
-
-    #[test]
-    fn should_not_match_when_unequal() {
-        let matcher: Box<dyn matchers::Matcher> = Box::new(Matcher);
-
-        assert!(!matcher.matches("ashouldmatch", "Shouldnotmatch"));
-        assert!(!matcher.matches("--ashouldnotmatch", "--Shouldnotmatch"));
-        assert!(!matcher.matches("-ashouldnotmatch", "-Shouldnotmatch"));
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/matchers/case_sensitive.rs b/old_nushell/crates/nu-completion/src/matchers/case_sensitive.rs
deleted file mode 100644
index 6a00aac6d..000000000
--- a/old_nushell/crates/nu-completion/src/matchers/case_sensitive.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use crate::matchers;
-
-pub struct Matcher;
-
-impl matchers::Matcher for Matcher {
-    fn matches(&self, partial: &str, from: &str) -> bool {
-        from.starts_with(partial)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn completes_case_sensitive() {
-        let matcher: Box<dyn matchers::Matcher> = Box::new(Matcher);
-
-        //Should match
-        assert!(matcher.matches("shouldmatch", "shouldmatch"));
-        assert!(matcher.matches("shouldm", "shouldmatch"));
-        assert!(matcher.matches("--also-should-m", "--also-should-match"));
-        assert!(matcher.matches("-also-should-m", "-also-should-match"));
-
-        // Should not match
-        assert!(!matcher.matches("--Shouldnot", "--shouldnotmatch"));
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/matchers/mod.rs b/old_nushell/crates/nu-completion/src/matchers/mod.rs
deleted file mode 100644
index c14b0d50c..000000000
--- a/old_nushell/crates/nu-completion/src/matchers/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub(crate) mod case_insensitive;
-pub(crate) mod case_sensitive;
-
-pub trait Matcher {
-    fn matches(&self, partial: &str, from: &str) -> bool;
-}
diff --git a/old_nushell/crates/nu-completion/src/path.rs b/old_nushell/crates/nu-completion/src/path.rs
deleted file mode 100644
index df804bf89..000000000
--- a/old_nushell/crates/nu-completion/src/path.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use std::path::{is_separator, Path, PathBuf};
-
-use super::matchers::Matcher;
-use crate::{Completer, CompletionContext, Suggestion};
-
-const SEP: char = std::path::MAIN_SEPARATOR;
-
-pub struct PathCompleter;
-
-#[derive(Debug)]
-pub struct PathSuggestion {
-    pub(crate) path: PathBuf,
-    pub(crate) suggestion: Suggestion,
-}
-
-impl PathCompleter {
-    pub fn path_suggestions(&self, partial: &str, matcher: &dyn Matcher) -> Vec<PathSuggestion> {
-        let (base_dir_name, partial) = {
-            // If partial is only a word we want to search in the current dir
-            let (base, rest) = partial.rsplit_once(is_separator).unwrap_or((".", partial));
-            // On windows, this standardizes paths to use \
-            let mut base = base.replace(is_separator, &SEP.to_string());
-
-            // rsplit_once removes the separator
-            base.push(SEP);
-            (base, rest)
-        };
-
-        let base_dir = nu_path::expand_path(&base_dir_name);
-        // This check is here as base_dir.read_dir() with base_dir == "" will open the current dir
-        // which we don't want in this case (if we did, base_dir would already be ".")
-        if base_dir == Path::new("") {
-            return Vec::new();
-        }
-
-        if let Ok(result) = base_dir.read_dir() {
-            result
-                .filter_map(|entry| {
-                    entry.ok().and_then(|entry| {
-                        let mut file_name = entry.file_name().to_string_lossy().into_owned();
-                        if matcher.matches(partial, &file_name) {
-                            let mut path = format!("{}{}", base_dir_name, file_name);
-                            if entry.path().is_dir() {
-                                path.push(SEP);
-                                file_name.push(SEP);
-                            }
-
-                            Some(PathSuggestion {
-                                path: entry.path(),
-                                suggestion: Suggestion {
-                                    replacement: path,
-                                    display: file_name,
-                                },
-                            })
-                        } else {
-                            None
-                        }
-                    })
-                })
-                .collect()
-        } else {
-            Vec::new()
-        }
-    }
-}
-
-impl<Context> Completer<Context> for PathCompleter
-where
-    Context: CompletionContext,
-{
-    fn complete(&self, _ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion> {
-        self.path_suggestions(partial, matcher)
-            .into_iter()
-            .map(|ps| ps.suggestion)
-            .collect()
-    }
-}
diff --git a/old_nushell/crates/nu-completion/src/variable.rs b/old_nushell/crates/nu-completion/src/variable.rs
deleted file mode 100644
index 4d450101b..000000000
--- a/old_nushell/crates/nu-completion/src/variable.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use nu_engine::value_shell::ValueShell;
-use nu_protocol::ColumnPath;
-use nu_source::SpannedItem;
-
-use super::matchers::Matcher;
-use crate::{Completer, CompletionContext, Suggestion};
-use std::path::{Path, PathBuf};
-
-fn build_path(head: &str, members: &Path, entry: &str) -> String {
-    let mut full_path = head.to_string();
-    full_path.push_str(
-        &members
-            .join(entry)
-            .display()
-            .to_string()
-            .replace(std::path::MAIN_SEPARATOR, "."),
-    );
-    full_path
-}
-
-fn collect_entries(value_fs: &ValueShell, head: &str, path: &Path) -> Vec<String> {
-    value_fs
-        .members_under(path)
-        .iter()
-        .flat_map(|entry| {
-            entry
-                .row_entries()
-                .map(|(entry_name, _)| build_path(head, path, entry_name))
-        })
-        .collect()
-}
-
-pub struct VariableCompleter;
-
-impl<Context> Completer<Context> for VariableCompleter
-where
-    Context: CompletionContext,
-{
-    fn complete(&self, ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion> {
-        let registry = ctx.variable_registry();
-        let variables_available = registry.variables();
-        let partial_column_path = ColumnPath::with_head(&partial.to_string().spanned_unknown());
-
-        partial_column_path
-            .map(|(head, members)| {
-                variables_available
-                    .iter()
-                    .filter(|candidate| matcher.matches(&head, candidate))
-                    .into_iter()
-                    .filter_map(|candidate| {
-                        if !partial.ends_with('.') && members.is_empty() {
-                            Some(vec![candidate.to_string()])
-                        } else {
-                            let value = registry.get_variable(&candidate[..].spanned_unknown());
-                            let path = PathBuf::from(members.path());
-
-                            value.map(|candidate| {
-                                let fs = ValueShell::new(candidate);
-
-                                fs.find(&path)
-                                    .map(|fs| collect_entries(fs, &head, &path))
-                                    .or_else(|| {
-                                        path.parent().map(|parent| {
-                                            fs.find(parent)
-                                                .map(|fs| collect_entries(fs, &head, parent))
-                                                .unwrap_or_default()
-                                        })
-                                    })
-                                    .unwrap_or_default()
-                            })
-                        }
-                    })
-                    .flatten()
-                    .filter_map(|candidate| {
-                        if matcher.matches(partial, &candidate) {
-                            Some(Suggestion::new(&candidate, &candidate))
-                        } else {
-                            None
-                        }
-                    })
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{Completer, Suggestion as S, VariableCompleter};
-    use crate::matchers::case_insensitive::Matcher as CaseInsensitiveMatcher;
-
-    use nu_engine::EnvVar;
-    use nu_engine::{
-        evaluation_context::EngineState, ConfigHolder, EvaluationContext, FakeHost, Host, Scope,
-        ShellManager,
-    };
-    use nu_protocol::{SignatureRegistry, VariableRegistry};
-    use parking_lot::Mutex;
-    use std::ffi::OsString;
-    use std::sync::{atomic::AtomicBool, Arc};
-
-    struct CompletionContext<'a>(&'a EvaluationContext);
-
-    impl<'a> crate::CompletionContext for CompletionContext<'a> {
-        fn signature_registry(&self) -> &dyn SignatureRegistry {
-            &self.0.scope
-        }
-
-        fn source(&self) -> &nu_engine::EvaluationContext {
-            self.0
-        }
-
-        fn scope(&self) -> &dyn nu_parser::ParserScope {
-            &self.0.scope
-        }
-
-        fn variable_registry(&self) -> &dyn VariableRegistry {
-            self.0
-        }
-    }
-
-    fn create_context_with_host(host: Box<dyn Host>) -> EvaluationContext {
-        let scope = Scope::new();
-        let env_vars = host
-            .vars()
-            .iter()
-            .cloned()
-            .map(|(k, v)| (k, EnvVar::from(v)))
-            .collect();
-        scope.add_env(env_vars);
-
-        EvaluationContext {
-            scope,
-            engine_state: Arc::new(EngineState {
-                host: Arc::new(parking_lot::Mutex::new(host)),
-                current_errors: Arc::new(Mutex::new(vec![])),
-                ctrl_c: Arc::new(AtomicBool::new(false)),
-                configs: Arc::new(Mutex::new(ConfigHolder::new())),
-                shell_manager: ShellManager::basic(),
-                windows_drives_previous_cwd: Arc::new(Mutex::new(std::collections::HashMap::new())),
-            }),
-        }
-    }
-
-    fn set_envs(host: &mut FakeHost, values: Vec<(&str, &str)>) {
-        values.iter().for_each(|(key, value)| {
-            host.env_set(OsString::from(key), OsString::from(value));
-        });
-    }
-
-    #[test]
-    fn structure() {
-        let mut host = nu_engine::FakeHost::new();
-        set_envs(&mut host, vec![("COMPLETER", "VARIABLE"), ("SHELL", "NU")]);
-        let context = create_context_with_host(Box::new(host));
-
-        assert_eq!(
-            VariableCompleter {}.complete(
-                &CompletionContext(&context),
-                "$nu.env.",
-                &CaseInsensitiveMatcher
-            ),
-            vec![
-                S::new("$nu.env.COMPLETER", "$nu.env.COMPLETER"),
-                S::new("$nu.env.SHELL", "$nu.env.SHELL")
-            ]
-        );
-
-        assert_eq!(
-            VariableCompleter {}.complete(
-                &CompletionContext(&context),
-                "$nu.env.CO",
-                &CaseInsensitiveMatcher
-            ),
-            vec![S::new("$nu.env.COMPLETER", "$nu.env.COMPLETER"),]
-        );
-
-        assert_eq!(
-            VariableCompleter {}.complete(
-                &CompletionContext(&context),
-                "$nu.en",
-                &CaseInsensitiveMatcher
-            ),
-            vec![S::new("$nu.env", "$nu.env"),]
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-data/Cargo.toml b/old_nushell/crates/nu-data/Cargo.toml
deleted file mode 100644
index 118300129..000000000
--- a/old_nushell/crates/nu-data/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Data for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-data"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-byte-unit = "4.0.9"
-chrono = "0.4.19"
-common-path = "1.0.0"
-derive-new = "0.5.8"
-directories-next = "2.0.0"
-getset = "0.1.1"
-indexmap = { version="1.6.1", features=["serde-1"] }
-log = "0.4.14"
-num-bigint = { version="0.4.3", features=["serde"] }
-num-format = "0.4.0"
-num-traits = "0.2.14"
-serde = { version="1.0.123", features=["derive"] }
-sha2 = "0.9.3"
-sys-locale = "0.1.0"
-toml = "0.5.8"
-
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-table = { version = "0.43.0", path="../nu-table" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-nu-value-ext = { version = "0.43.0", path="../nu-value-ext" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-
-[features]
-dataframe = ["nu-protocol/dataframe"]
diff --git a/old_nushell/crates/nu-data/src/base.rs b/old_nushell/crates/nu-data/src/base.rs
deleted file mode 100644
index f0b76d7ac..000000000
--- a/old_nushell/crates/nu-data/src/base.rs
+++ /dev/null
@@ -1,466 +0,0 @@
-pub mod shape;
-
-use bigdecimal::BigDecimal;
-use chrono::{DateTime, FixedOffset, Utc};
-use derive_new::new;
-use nu_errors::ShellError;
-use nu_protocol::{
-    hir, Primitive, ShellTypeName, SpannedTypeName, TaggedDictBuilder, UntaggedValue, Value,
-};
-use nu_source::{Span, Tag};
-use nu_value_ext::ValueExt;
-use num_bigint::BigInt;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, new, Serialize)]
-pub struct Operation {
-    pub(crate) left: Value,
-    pub(crate) operator: hir::Operator,
-    pub(crate) right: Value,
-}
-
-#[derive(Serialize, Deserialize)]
-pub enum Switch {
-    Present,
-    Absent,
-}
-
-impl std::convert::TryFrom<Option<&Value>> for Switch {
-    type Error = ShellError;
-
-    fn try_from(value: Option<&Value>) -> Result<Switch, ShellError> {
-        match value {
-            None => Ok(Switch::Absent),
-            Some(value) => match &value.value {
-                UntaggedValue::Primitive(Primitive::Boolean(true)) => Ok(Switch::Present),
-                _ => Err(ShellError::type_error("Boolean", value.spanned_type_name())),
-            },
-        }
-    }
-}
-
-pub fn select_fields(obj: &Value, fields: &[String], tag: impl Into<Tag>) -> Value {
-    let mut out = TaggedDictBuilder::new(tag);
-
-    let descs = obj.data_descriptors();
-
-    for column_name in fields {
-        match descs.iter().find(|&d| d == column_name) {
-            None => out.insert_untagged(column_name, UntaggedValue::nothing()),
-            Some(desc) => out.insert_value(desc.clone(), obj.get_data(desc).borrow().clone()),
-        }
-    }
-
-    out.into_value()
-}
-
-pub fn reject_fields(obj: &Value, fields: &[String], tag: impl Into<Tag>) -> Value {
-    let mut out = TaggedDictBuilder::new(tag);
-
-    let descs = obj.data_descriptors();
-
-    for desc in descs {
-        if fields.iter().any(|field| *field == desc) {
-            continue;
-        } else {
-            out.insert_value(desc.clone(), obj.get_data(&desc).borrow().clone())
-        }
-    }
-
-    out.into_value()
-}
-
-pub enum CompareValues {
-    Ints(i64, i64),
-    Filesizes(u64, u64),
-    BigInts(BigInt, BigInt),
-    Decimals(BigDecimal, BigDecimal),
-    String(String, String),
-    Date(DateTime<FixedOffset>, DateTime<FixedOffset>),
-    DateDuration(DateTime<FixedOffset>, BigInt),
-    TimeDuration(BigInt, BigInt),
-    Booleans(bool, bool),
-}
-
-impl CompareValues {
-    pub fn compare(&self) -> std::cmp::Ordering {
-        match self {
-            CompareValues::BigInts(left, right) => left.cmp(right),
-            CompareValues::Ints(left, right) => left.cmp(right),
-            CompareValues::Filesizes(left, right) => left.cmp(right),
-            CompareValues::Decimals(left, right) => left.cmp(right),
-            CompareValues::String(left, right) => left.cmp(right),
-            CompareValues::Date(left, right) => left.cmp(right),
-            CompareValues::DateDuration(left, right) => {
-                // FIXME: Not sure if I could do something better with the Span.
-                let duration = Primitive::into_chrono_duration(
-                    Primitive::Duration(right.clone()),
-                    Span::unknown(),
-                )
-                .expect("Could not convert nushell Duration into chrono Duration.");
-                let right: DateTime<FixedOffset> = Utc::now()
-                    .checked_sub_signed(duration)
-                    .expect("Data overflow")
-                    .into();
-                right.cmp(left)
-            }
-            CompareValues::Booleans(left, right) => left.cmp(right),
-            CompareValues::TimeDuration(left, right) => left.cmp(right),
-        }
-    }
-}
-
-pub fn coerce_compare(
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<CompareValues, (&'static str, &'static str)> {
-    match (left, right) {
-        (UntaggedValue::Primitive(left), UntaggedValue::Primitive(right)) => {
-            coerce_compare_primitive(left, right)
-        }
-
-        _ => Err((left.type_name(), right.type_name())),
-    }
-}
-
-pub fn coerce_compare_primitive(
-    left: &Primitive,
-    right: &Primitive,
-) -> Result<CompareValues, (&'static str, &'static str)> {
-    use Primitive::*;
-
-    Ok(match (left, right) {
-        (Int(left), Int(right)) => CompareValues::Ints(*left, *right),
-        (Int(left), BigInt(right)) => {
-            CompareValues::BigInts(num_bigint::BigInt::from(*left), right.clone())
-        }
-        (BigInt(left), Int(right)) => {
-            CompareValues::BigInts(left.clone(), num_bigint::BigInt::from(*right))
-        }
-        (BigInt(left), BigInt(right)) => CompareValues::BigInts(left.clone(), right.clone()),
-
-        (Int(left), Decimal(right)) => {
-            CompareValues::Decimals(BigDecimal::from(*left), right.clone())
-        }
-        (BigInt(left), Decimal(right)) => {
-            CompareValues::Decimals(BigDecimal::from(left.clone()), right.clone())
-        }
-        (Decimal(left), Decimal(right)) => CompareValues::Decimals(left.clone(), right.clone()),
-        (Decimal(left), Int(right)) => {
-            CompareValues::Decimals(left.clone(), BigDecimal::from(*right))
-        }
-        (Decimal(left), BigInt(right)) => {
-            CompareValues::Decimals(left.clone(), BigDecimal::from(right.clone()))
-        }
-        (Decimal(left), Filesize(right)) => {
-            CompareValues::Decimals(left.clone(), BigDecimal::from(*right))
-        }
-        (Filesize(left), Filesize(right)) => CompareValues::Filesizes(*left, *right),
-        (Filesize(left), Decimal(right)) => {
-            CompareValues::Decimals(BigDecimal::from(*left), right.clone())
-        }
-        (Nothing, Nothing) => CompareValues::Booleans(true, true),
-        (String(left), String(right)) => CompareValues::String(left.clone(), right.clone()),
-        (Date(left), Date(right)) => CompareValues::Date(*left, *right),
-        (Date(left), Duration(right)) => CompareValues::DateDuration(*left, right.clone()),
-        (Boolean(left), Boolean(right)) => CompareValues::Booleans(*left, *right),
-        (Boolean(left), Nothing) => CompareValues::Ints(if *left { 1 } else { 0 }, -1),
-        (Nothing, Boolean(right)) => CompareValues::Ints(-1, if *right { 1 } else { 0 }),
-        (String(left), Nothing) => CompareValues::String(left.clone(), std::string::String::new()),
-        (Nothing, String(right)) => {
-            CompareValues::String(std::string::String::new(), right.clone())
-        }
-        (FilePath(left), String(right)) => {
-            CompareValues::String(left.as_path().display().to_string(), right.clone())
-        }
-        (String(left), FilePath(right)) => {
-            CompareValues::String(left.clone(), right.as_path().display().to_string())
-        }
-        (Duration(left), Duration(right)) => {
-            CompareValues::TimeDuration(left.clone(), right.clone())
-        }
-        _ => return Err((left.type_name(), right.type_name())),
-    })
-}
-#[cfg(test)]
-mod tests {
-    use nu_errors::ShellError;
-    use nu_protocol::UntaggedValue;
-    use nu_source::SpannedItem;
-    use nu_test_support::value::*;
-    use nu_value_ext::ValueExt;
-
-    use indexmap::indexmap;
-
-    #[test]
-    fn gets_matching_field_from_a_row() -> Result<(), ShellError> {
-        let row = UntaggedValue::row(indexmap! {
-            "amigos".into() => table(&[string("andres"),string("jonathan"),string("yehuda")])
-        })
-        .into_untagged_value();
-
-        assert_eq!(
-            row.get_data_by_key("amigos".spanned_unknown())
-                .ok_or_else(|| ShellError::unexpected("Failure during testing"))?,
-            table(&[string("andres"), string("jonathan"), string("yehuda")])
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn gets_matching_field_from_nested_rows_inside_a_row() -> Result<(), ShellError> {
-        let field_path = column_path("package.version").as_column_path()?;
-
-        let (version, tag) = string("0.4.0").into_parts();
-
-        let value = UntaggedValue::row(indexmap! {
-            "package".into() =>
-                row(indexmap! {
-                    "name".into()    =>     string("nu"),
-                    "version".into() =>  string("0.4.0")
-                })
-        });
-
-        assert_eq!(
-            *value.into_value(tag).get_data_by_column_path(
-                &field_path.item,
-                Box::new(error_callback("package.version"))
-            )?,
-            version
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn gets_first_matching_field_from_rows_with_same_field_inside_a_table() -> Result<(), ShellError>
-    {
-        let field_path = column_path("package.authors.name").as_column_path()?;
-
-        let (_, tag) = string("Andrés N. Robalino").into_parts();
-
-        let value = UntaggedValue::row(indexmap! {
-            "package".into() => row(indexmap! {
-                "name".into() => string("nu"),
-                "version".into() => string("0.4.0"),
-                "authors".into() => table(&[
-                    row(indexmap!{"name".into() => string("Andrés N. Robalino")}),
-                    row(indexmap!{"name".into() => string("Jonathan Turner")}),
-                    row(indexmap!{"name".into() => string("Yehuda Katz")})
-                ])
-            })
-        });
-
-        assert_eq!(
-            value.into_value(tag).get_data_by_column_path(
-                &field_path.item,
-                Box::new(error_callback("package.authors.name"))
-            )?,
-            table(&[
-                string("Andrés N. Robalino"),
-                string("Jonathan Turner"),
-                string("Yehuda Katz")
-            ])
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn column_path_that_contains_just_a_number_gets_a_row_from_a_table() -> Result<(), ShellError> {
-        let field_path = column_path("package.authors.0").as_column_path()?;
-
-        let (_, tag) = string("Andrés N. Robalino").into_parts();
-
-        let value = UntaggedValue::row(indexmap! {
-            "package".into() => row(indexmap! {
-                "name".into() => string("nu"),
-                "version".into() => string("0.4.0"),
-                "authors".into() => table(&[
-                    row(indexmap!{"name".into() => string("Andrés N. Robalino")}),
-                    row(indexmap!{"name".into() => string("Jonathan Turner")}),
-                    row(indexmap!{"name".into() => string("Yehuda Katz")})
-                ])
-            })
-        });
-
-        assert_eq!(
-            *value.into_value(tag).get_data_by_column_path(
-                &field_path.item,
-                Box::new(error_callback("package.authors.0"))
-            )?,
-            UntaggedValue::row(indexmap! {
-                "name".into() => string("Andrés N. Robalino")
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn column_path_that_contains_just_a_number_gets_a_row_from_a_row() -> Result<(), ShellError> {
-        let field_path = column_path(r#"package.authors."0""#).as_column_path()?;
-
-        let (_, tag) = string("Andrés N. Robalino").into_parts();
-
-        let value = UntaggedValue::row(indexmap! {
-            "package".into() => row(indexmap! {
-                "name".into() => string("nu"),
-                "version".into() => string("0.4.0"),
-                "authors".into() => row(indexmap! {
-                    "0".into() => row(indexmap!{"name".into() => string("Andrés N. Robalino")}),
-                    "1".into() => row(indexmap!{"name".into() => string("Jonathan Turner")}),
-                    "2".into() => row(indexmap!{"name".into() => string("Yehuda Katz")}),
-                })
-            })
-        });
-
-        assert_eq!(
-            *value.into_value(tag).get_data_by_column_path(
-                &field_path.item,
-                Box::new(error_callback("package.authors.\"0\""))
-            )?,
-            UntaggedValue::row(indexmap! {
-                "name".into() => string("Andrés N. Robalino")
-            })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn replaces_matching_field_from_a_row() -> Result<(), ShellError> {
-        let field_path = column_path("amigos").as_column_path()?;
-
-        let sample = UntaggedValue::row(indexmap! {
-            "amigos".into() => table(&[
-                string("andres"),
-                string("jonathan"),
-                string("yehuda"),
-            ]),
-        });
-
-        let replacement = string("jonas");
-
-        let actual = sample
-            .into_untagged_value()
-            .replace_data_at_column_path(&field_path.item, replacement)
-            .ok_or_else(|| ShellError::untagged_runtime_error("Could not replace column"))?;
-
-        assert_eq!(actual, row(indexmap! {"amigos".into() => string("jonas")}));
-
-        Ok(())
-    }
-
-    #[test]
-    fn replaces_matching_field_from_nested_rows_inside_a_row() -> Result<(), ShellError> {
-        let field_path = column_path(r#"package.authors."los.3.caballeros""#).as_column_path()?;
-
-        let sample = UntaggedValue::row(indexmap! {
-            "package".into() => row(indexmap! {
-                "authors".into() => row(indexmap! {
-                    "los.3.mosqueteros".into() => table(&[string("andres::yehuda::jonathan")]),
-                    "los.3.amigos".into() => table(&[string("andres::yehuda::jonathan")]),
-                    "los.3.caballeros".into() => table(&[string("andres::yehuda::jonathan")])
-                })
-            })
-        });
-
-        let replacement = table(&[string("yehuda::jonathan::andres")]);
-        let tag = replacement.tag.clone();
-
-        let actual = sample
-            .into_value(&tag)
-            .replace_data_at_column_path(&field_path.item, replacement.clone())
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Could not replace column",
-                    "could not replace column",
-                    &tag,
-                )
-            })?;
-
-        assert_eq!(
-            actual,
-            UntaggedValue::row(indexmap! {
-            "package".into() => row(indexmap! {
-                "authors".into() => row(indexmap! {
-                    "los.3.mosqueteros".into() => table(&[string("andres::yehuda::jonathan")]),
-                    "los.3.amigos".into()      => table(&[string("andres::yehuda::jonathan")]),
-                    "los.3.caballeros".into()  => replacement})})})
-            .into_value(tag)
-        );
-
-        Ok(())
-    }
-    #[test]
-    fn replaces_matching_field_from_rows_inside_a_table() -> Result<(), ShellError> {
-        let field_path =
-            column_path(r#"shell_policy.releases."nu.version.arepa""#).as_column_path()?;
-
-        let sample = UntaggedValue::row(indexmap! {
-            "shell_policy".into() => row(indexmap! {
-                "releases".into() => table(&[
-                    row(indexmap! {
-                        "nu.version.arepa".into() => row(indexmap! {
-                            "code".into() => string("0.4.0"), "tag_line".into() => string("GitHub-era")
-                        })
-                    }),
-                    row(indexmap! {
-                        "nu.version.taco".into() => row(indexmap! {
-                            "code".into() => string("0.3.0"), "tag_line".into() => string("GitHub-era")
-                        })
-                    }),
-                    row(indexmap! {
-                        "nu.version.stable".into() => row(indexmap! {
-                            "code".into() => string("0.2.0"), "tag_line".into() => string("GitHub-era")
-                        })
-                    })
-                ])
-            })
-        });
-
-        let replacement = row(indexmap! {
-            "code".into() => string("0.5.0"),
-            "tag_line".into() => string("CABALLEROS")
-        });
-        let tag = replacement.tag.clone();
-
-        let actual = sample
-            .into_value(tag.clone())
-            .replace_data_at_column_path(&field_path.item, replacement.clone())
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Could not replace column",
-                    "could not replace column",
-                    &tag,
-                )
-            })?;
-
-        assert_eq!(
-            actual,
-            UntaggedValue::row(indexmap! {
-                "shell_policy".into() => row(indexmap! {
-                    "releases".into() => table(&[
-                        row(indexmap! {
-                            "nu.version.arepa".into() => replacement
-                        }),
-                        row(indexmap! {
-                            "nu.version.taco".into() => row(indexmap! {
-                                "code".into() => string("0.3.0"), "tag_line".into() => string("GitHub-era")
-                            })
-                        }),
-                        row(indexmap! {
-                            "nu.version.stable".into() => row(indexmap! {
-                                "code".into() => string("0.2.0"), "tag_line".into() => string("GitHub-era")
-                            })
-                        })
-                    ])
-                })
-            }).into_value(&tag)
-        );
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/base/shape.rs b/old_nushell/crates/nu-data/src/base/shape.rs
deleted file mode 100644
index c2a912216..000000000
--- a/old_nushell/crates/nu-data/src/base/shape.rs
+++ /dev/null
@@ -1,479 +0,0 @@
-use bigdecimal::BigDecimal;
-use chrono::{DateTime, FixedOffset};
-use indexmap::map::IndexMap;
-use nu_protocol::RangeInclusion;
-use nu_protocol::{format_primitive, ColumnPath, Dictionary, Primitive, UntaggedValue, Value};
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug, Tag};
-use num_bigint::BigInt;
-use num_format::{Locale, ToFormattedString};
-use serde::{Deserialize, Serialize};
-use std::cmp::Ordering;
-use std::fmt::Debug;
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use sys_locale::get_locale;
-
-#[cfg(feature = "dataframe")]
-use nu_protocol::dataframe::{FrameStruct, NuDataFrame};
-
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize)]
-pub struct InlineRange {
-    from: (InlineShape, RangeInclusion),
-    to: (InlineShape, RangeInclusion),
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize)]
-pub enum InlineShape {
-    Nothing,
-    Int(i64),
-    BigInt(BigInt),
-    Decimal(BigDecimal),
-    Range(Box<InlineRange>),
-    Bytesize(u64),
-    String(String),
-    Line(String),
-    ColumnPath(ColumnPath),
-    GlobPattern(String),
-    Boolean(bool),
-    Date(DateTime<FixedOffset>),
-    Duration(BigInt),
-    FilePath(PathBuf),
-    Binary(usize),
-
-    Row(Row),
-    Table(Vec<InlineShape>),
-
-    // TODO: Block arguments
-    Block,
-    // TODO: Error type
-    Error,
-
-    #[cfg(feature = "dataframe")]
-    DataFrame(String),
-
-    #[cfg(feature = "dataframe")]
-    FrameStruct(String),
-
-    // Stream markers (used as bookend markers rather than actual values)
-    BeginningOfStream,
-    EndOfStream,
-}
-
-pub struct FormatInlineShape {
-    shape: InlineShape,
-    column: Option<Column>,
-}
-
-pub fn get_config_filesize_metric() -> bool {
-    let res = crate::config::config(Tag::unknown());
-    if res.is_err() {
-        return true;
-    }
-    let value = res
-        .unwrap_or_default()
-        .get("filesize_metric")
-        .map(|s| s.value.is_true())
-        .unwrap_or(true);
-    value
-}
-
-impl InlineShape {
-    pub fn from_primitive(primitive: &Primitive) -> InlineShape {
-        match primitive {
-            Primitive::Nothing => InlineShape::Nothing,
-            Primitive::Int(int) => InlineShape::Int(*int),
-            Primitive::BigInt(int) => InlineShape::BigInt(int.clone()),
-            Primitive::Range(range) => {
-                let (left, left_inclusion) = &range.from;
-                let (right, right_inclusion) = &range.to;
-
-                InlineShape::Range(Box::new(InlineRange {
-                    from: (InlineShape::from_primitive(left), *left_inclusion),
-                    to: (InlineShape::from_primitive(right), *right_inclusion),
-                }))
-            }
-            Primitive::Decimal(decimal) => InlineShape::Decimal(decimal.clone()),
-            Primitive::Filesize(bytesize) => InlineShape::Bytesize(*bytesize),
-            Primitive::String(string) => InlineShape::String(string.clone()),
-            Primitive::ColumnPath(path) => InlineShape::ColumnPath(path.clone()),
-            Primitive::GlobPattern(pattern) => InlineShape::GlobPattern(pattern.clone()),
-            Primitive::Boolean(boolean) => InlineShape::Boolean(*boolean),
-            Primitive::Date(date) => InlineShape::Date(*date),
-            Primitive::Duration(duration) => InlineShape::Duration(duration.clone()),
-            Primitive::FilePath(path) => InlineShape::FilePath(path.clone()),
-            Primitive::Binary(b) => InlineShape::Binary(b.len()),
-            Primitive::BeginningOfStream => InlineShape::BeginningOfStream,
-            Primitive::EndOfStream => InlineShape::EndOfStream,
-        }
-    }
-
-    pub fn from_dictionary(dictionary: &Dictionary) -> InlineShape {
-        let mut map = IndexMap::new();
-
-        for (key, value) in &dictionary.entries {
-            let column = Column::String(key.clone());
-            map.insert(column, InlineShape::from_value(value));
-        }
-
-        InlineShape::Row(Row { map })
-    }
-
-    pub fn from_table<'a>(table: impl IntoIterator<Item = &'a Value>) -> InlineShape {
-        let vec = table.into_iter().map(InlineShape::from_value).collect();
-
-        InlineShape::Table(vec)
-    }
-
-    #[cfg(feature = "dataframe")]
-    pub fn from_df(df: &NuDataFrame) -> InlineShape {
-        let msg = format!("{} rows {} cols", df.as_ref().height(), df.as_ref().width());
-
-        InlineShape::DataFrame(msg)
-    }
-
-    #[cfg(feature = "dataframe")]
-    pub fn from_frame_struct(s: &FrameStruct) -> InlineShape {
-        match s {
-            FrameStruct::GroupBy(groupby) => {
-                let msg = groupby.by().join(",");
-                let msg = format!("groupby {}", msg);
-                InlineShape::DataFrame(msg)
-            }
-        }
-    }
-
-    pub fn from_value<'a>(value: impl Into<&'a UntaggedValue>) -> InlineShape {
-        match value.into() {
-            UntaggedValue::Primitive(p) => InlineShape::from_primitive(p),
-            UntaggedValue::Row(row) => InlineShape::from_dictionary(row),
-            UntaggedValue::Table(table) => InlineShape::from_table(table),
-            UntaggedValue::Error(_) => InlineShape::Error,
-            UntaggedValue::Block(_) => InlineShape::Block,
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::DataFrame(df) => InlineShape::from_df(df),
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::FrameStruct(s) => InlineShape::from_frame_struct(s),
-        }
-    }
-
-    #[allow(unused)]
-    pub fn format_for_column(self, column: impl Into<Column>) -> FormatInlineShape {
-        FormatInlineShape {
-            shape: self,
-            column: Some(column.into()),
-        }
-    }
-
-    pub fn format(self) -> FormatInlineShape {
-        FormatInlineShape {
-            shape: self,
-            column: None,
-        }
-    }
-
-    pub fn format_bytes(bytesize: u64, forced_format: Option<&str>) -> (DbgDocBldr, String) {
-        use bigdecimal::ToPrimitive;
-
-        // get the config value, if it doesn't exist make it 'auto' so it works how it originally did
-        let filesize_format_var;
-        if let Some(fmt) = forced_format {
-            filesize_format_var = fmt.to_ascii_lowercase();
-        } else {
-            filesize_format_var = match crate::config::config(Tag::unknown()) {
-                Ok(cfg) => cfg
-                    .get("filesize_format")
-                    .map(|val| val.convert_to_string().to_ascii_lowercase())
-                    .unwrap_or_else(|| "auto".to_string()),
-                _ => "auto".to_string(),
-            }
-        }
-
-        // if there is a value, match it to one of the valid values for byte units
-        let filesize_format = match filesize_format_var.as_str() {
-            "b" => (byte_unit::ByteUnit::B, ""),
-            "kb" => (byte_unit::ByteUnit::KB, ""),
-            "kib" => (byte_unit::ByteUnit::KiB, ""),
-            "mb" => (byte_unit::ByteUnit::MB, ""),
-            "mib" => (byte_unit::ByteUnit::MiB, ""),
-            "gb" => (byte_unit::ByteUnit::GB, ""),
-            "gib" => (byte_unit::ByteUnit::GiB, ""),
-            "tb" => (byte_unit::ByteUnit::TB, ""),
-            "tib" => (byte_unit::ByteUnit::TiB, ""),
-            "pb" => (byte_unit::ByteUnit::PB, ""),
-            "pib" => (byte_unit::ByteUnit::PiB, ""),
-            "eb" => (byte_unit::ByteUnit::EB, ""),
-            "eib" => (byte_unit::ByteUnit::EiB, ""),
-            "zb" => (byte_unit::ByteUnit::ZB, ""),
-            "zib" => (byte_unit::ByteUnit::ZiB, ""),
-            _ => (byte_unit::ByteUnit::B, "auto"),
-        };
-
-        if let Some(value) = bytesize.to_u128() {
-            let byte = byte_unit::Byte::from_bytes(value);
-            let adj_byte =
-                if filesize_format.0 == byte_unit::ByteUnit::B && filesize_format.1 == "auto" {
-                    byte.get_appropriate_unit(!get_config_filesize_metric())
-                } else {
-                    byte.get_adjusted_unit(filesize_format.0)
-                };
-
-            match adj_byte.get_unit() {
-                byte_unit::ByteUnit::B => {
-                    let locale_string = get_locale().unwrap_or_else(|| String::from("en-US"));
-                    // Since get_locale() and Locale::from_name() don't always return the same items
-                    // we need to try and parse it to match. For instance, a valid locale is de_DE
-                    // however Locale::from_name() wants only de so we split and parse it out.
-                    let locale_string = locale_string.replace("_", "-"); // en_AU -> en-AU
-                    let locale = match Locale::from_name(&locale_string) {
-                        Ok(loc) => loc,
-                        _ => {
-                            let all = num_format::Locale::available_names();
-                            let locale_prefix = &locale_string.split('-').collect::<Vec<&str>>();
-                            if all.contains(&locale_prefix[0]) {
-                                // eprintln!("Found alternate: {}", &locale_prefix[0]);
-                                Locale::from_name(locale_prefix[0]).unwrap_or(Locale::en)
-                            } else {
-                                // eprintln!("Unable to find matching locale. Defaulting to en-US");
-                                Locale::en
-                            }
-                        }
-                    };
-                    let locale_byte = adj_byte.get_value() as u64;
-                    let locale_byte_string = locale_byte.to_formatted_string(&locale);
-                    if filesize_format.1 == "auto" {
-                        let doc = (DbgDocBldr::primitive(locale_byte_string)
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::kind("B"))
-                        .group();
-                        (doc.clone(), InlineShape::render_doc(&doc))
-                    } else {
-                        let doc = (DbgDocBldr::primitive(locale_byte_string)).group();
-                        (doc.clone(), InlineShape::render_doc(&doc))
-                    }
-                }
-                _ => {
-                    let doc = DbgDocBldr::primitive(adj_byte.format(1));
-                    (doc.clone(), InlineShape::render_doc(&doc))
-                }
-            }
-        } else {
-            let doc =
-                (DbgDocBldr::primitive(bytesize) + DbgDocBldr::space() + DbgDocBldr::kind("B"))
-                    .group();
-            (doc.clone(), InlineShape::render_doc(&doc))
-        }
-    }
-
-    pub fn render_doc(doc: &DebugDocBuilder) -> String {
-        let mut w = Vec::new();
-        doc.to_doc()
-            .render(1000, &mut w)
-            .expect("Error rendering bytes");
-        String::from_utf8_lossy(&w).to_string()
-    }
-}
-
-impl PrettyDebug for FormatInlineShape {
-    fn pretty(&self) -> DebugDocBuilder {
-        let column = &self.column;
-
-        match &self.shape {
-            InlineShape::Nothing => DbgDocBldr::blank(),
-            InlineShape::Int(int) => DbgDocBldr::primitive(int),
-            InlineShape::BigInt(int) => DbgDocBldr::primitive(int),
-            InlineShape::Decimal(decimal) => DbgDocBldr::description(format_primitive(
-                &Primitive::Decimal(decimal.clone()),
-                None,
-            )),
-            InlineShape::Range(range) => {
-                let (left, left_inclusion) = &range.from;
-                let (right, right_inclusion) = &range.to;
-
-                let op = match (left_inclusion, right_inclusion) {
-                    (RangeInclusion::Inclusive, RangeInclusion::Inclusive) => "..",
-                    (RangeInclusion::Inclusive, RangeInclusion::Exclusive) => "..<",
-                    _ => unimplemented!(
-                        "No syntax for ranges that aren't inclusive on the left and exclusive \
-                         or inclusive on the right"
-                    ),
-                };
-
-                left.clone().format().pretty()
-                    + DbgDocBldr::operator(op)
-                    + right.clone().format().pretty()
-            }
-            InlineShape::Bytesize(bytesize) => {
-                let bytes = InlineShape::format_bytes(*bytesize, None);
-                bytes.0
-            }
-            InlineShape::String(string) => DbgDocBldr::primitive(string),
-            InlineShape::Line(string) => DbgDocBldr::primitive(string),
-            InlineShape::ColumnPath(path) => DbgDocBldr::intersperse(
-                path.iter().map(|member| member.pretty()),
-                DbgDocBldr::keyword("."),
-            ),
-            InlineShape::GlobPattern(pattern) => DbgDocBldr::primitive(pattern),
-            InlineShape::Boolean(boolean) => DbgDocBldr::primitive(
-                match (boolean, column) {
-                    (true, None) => "true",
-                    (false, None) => "false",
-                    (true, Some(Column::String(s))) if !s.is_empty() => s,
-                    (false, Some(Column::String(s))) if !s.is_empty() => "",
-                    (true, Some(_)) => "true",
-                    (false, Some(_)) => "false",
-                }
-                .to_owned(),
-            ),
-            InlineShape::Date(date) => DbgDocBldr::primitive(nu_protocol::format_date(date)),
-            InlineShape::Duration(duration) => DbgDocBldr::description(format_primitive(
-                &Primitive::Duration(duration.clone()),
-                None,
-            )),
-            InlineShape::FilePath(path) => DbgDocBldr::primitive(path.display()),
-            InlineShape::Binary(length) => {
-                DbgDocBldr::opaque(format!("<binary: {} bytes>", length))
-            }
-            InlineShape::Row(row) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::kind("row")
-                    + DbgDocBldr::space()
-                    + if row.map.keys().len() <= 6 {
-                        DbgDocBldr::intersperse(
-                            row.map.keys().map(|key| match key {
-                                Column::String(string) => DbgDocBldr::description(string),
-                                Column::Value => DbgDocBldr::blank(),
-                            }),
-                            DbgDocBldr::space(),
-                        )
-                    } else {
-                        DbgDocBldr::description(format!("{} columns", row.map.keys().len()))
-                    },
-                "]",
-            )
-            .group(),
-            InlineShape::Table(rows) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::kind("table")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::primitive(rows.len())
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::description("rows"),
-                "]",
-            )
-            .group(),
-            InlineShape::Block => DbgDocBldr::opaque("block"),
-            InlineShape::Error => DbgDocBldr::error("error"),
-            #[cfg(feature = "dataframe")]
-            InlineShape::DataFrame(msg) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::kind("dataframe") + DbgDocBldr::space() + DbgDocBldr::primitive(msg),
-                "]",
-            )
-            .group(),
-            #[cfg(feature = "dataframe")]
-            InlineShape::FrameStruct(msg) => {
-                DbgDocBldr::delimit("[", DbgDocBldr::primitive(msg), "]").group()
-            }
-            InlineShape::BeginningOfStream => DbgDocBldr::blank(),
-            InlineShape::EndOfStream => DbgDocBldr::blank(),
-        }
-    }
-}
-
-pub trait GroupedValue: Debug + Clone {
-    type Item;
-
-    fn new() -> Self;
-    fn merge(&mut self, value: Self::Item);
-}
-
-impl GroupedValue for Vec<(usize, usize)> {
-    type Item = usize;
-
-    fn new() -> Vec<(usize, usize)> {
-        vec![]
-    }
-
-    fn merge(&mut self, new_value: usize) {
-        match self.last_mut() {
-            Some(value) if value.1 == new_value - 1 => {
-                value.1 += 1;
-            }
-
-            _ => self.push((new_value, new_value)),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Deserialize, Serialize)]
-pub enum Column {
-    String(String),
-    Value,
-}
-
-impl From<String> for Column {
-    fn from(x: String) -> Self {
-        Column::String(x)
-    }
-}
-
-impl From<&String> for Column {
-    fn from(x: &String) -> Self {
-        Column::String(x.clone())
-    }
-}
-
-impl From<&str> for Column {
-    fn from(x: &str) -> Self {
-        Column::String(x.to_string())
-    }
-}
-
-/// A shape representation of the type of a row
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Row {
-    map: IndexMap<Column, InlineShape>,
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl Hash for Row {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let mut entries = self.map.clone();
-        entries.sort_keys();
-        entries.keys().collect::<Vec<&Column>>().hash(state);
-        entries.values().collect::<Vec<&InlineShape>>().hash(state);
-    }
-}
-
-impl PartialOrd for Row {
-    fn partial_cmp(&self, other: &Row) -> Option<Ordering> {
-        let this: Vec<&Column> = self.map.keys().collect();
-        let that: Vec<&Column> = other.map.keys().collect();
-
-        if this != that {
-            return this.partial_cmp(&that);
-        }
-
-        let this: Vec<&InlineShape> = self.map.values().collect();
-        let that: Vec<&InlineShape> = self.map.values().collect();
-
-        this.partial_cmp(&that)
-    }
-}
-
-impl Ord for Row {
-    /// Compare two dictionaries for ordering
-    fn cmp(&self, other: &Row) -> Ordering {
-        let this: Vec<&Column> = self.map.keys().collect();
-        let that: Vec<&Column> = other.map.keys().collect();
-
-        if this != that {
-            return this.cmp(&that);
-        }
-
-        let this: Vec<&InlineShape> = self.map.values().collect();
-        let that: Vec<&InlineShape> = self.map.values().collect();
-
-        this.cmp(&that)
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/config.rs b/old_nushell/crates/nu-data/src/config.rs
deleted file mode 100644
index 3181db46a..000000000
--- a/old_nushell/crates/nu-data/src/config.rs
+++ /dev/null
@@ -1,319 +0,0 @@
-mod conf;
-mod config_trust;
-mod local_config;
-mod nuconfig;
-pub mod path;
-
-pub use conf::Conf;
-pub use config_trust::is_file_trusted;
-pub use config_trust::read_trusted;
-pub use config_trust::Trusted;
-pub use local_config::loadable_cfg_exists_in_dir;
-pub use local_config::LocalConfigDiff;
-pub use nuconfig::NuConfig;
-
-use indexmap::IndexMap;
-use log::trace;
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{
-    Dictionary, Primitive, ShellTypeName, TaggedDictBuilder, UnspannedPathMember, UntaggedValue,
-    Value,
-};
-use nu_source::{SpannedItem, Tag, TaggedItem};
-use std::env::var;
-use std::fs::{self, OpenOptions};
-use std::io;
-use std::path::{Path, PathBuf};
-
-pub fn convert_toml_value_to_nu_value(v: &toml::Value, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-
-    match v {
-        toml::Value::Boolean(b) => UntaggedValue::boolean(*b).into_value(tag),
-        toml::Value::Integer(n) => UntaggedValue::int(*n).into_value(tag),
-        toml::Value::Float(n) => UntaggedValue::decimal_from_float(*n, tag.span).into_value(tag),
-        toml::Value::String(s) => {
-            UntaggedValue::Primitive(Primitive::String(String::from(s))).into_value(tag)
-        }
-        toml::Value::Array(a) => UntaggedValue::Table(
-            a.iter()
-                .map(|x| convert_toml_value_to_nu_value(x, &tag))
-                .collect(),
-        )
-        .into_value(tag),
-        toml::Value::Datetime(dt) => {
-            UntaggedValue::Primitive(Primitive::String(dt.to_string())).into_value(tag)
-        }
-        toml::Value::Table(t) => {
-            let mut collected = TaggedDictBuilder::new(&tag);
-
-            for (k, v) in t {
-                collected.insert_value(k.clone(), convert_toml_value_to_nu_value(v, &tag));
-            }
-
-            collected.into_value()
-        }
-    }
-}
-
-fn collect_values(input: &[Value]) -> Result<Vec<toml::Value>, ShellError> {
-    let mut out = vec![];
-
-    for value in input {
-        out.push(helper(value)?);
-    }
-
-    Ok(out)
-}
-// Helper method to recursively convert nu_protocol::Value -> toml::Value
-// This shouldn't be called at the top-level
-fn helper(v: &Value) -> Result<toml::Value, ShellError> {
-    use bigdecimal::ToPrimitive;
-
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => toml::Value::Boolean(*b),
-        UntaggedValue::Primitive(Primitive::Filesize(b)) => {
-            if let Some(value) = b.to_i64() {
-                toml::Value::Integer(value)
-            } else {
-                return Err(ShellError::labeled_error(
-                    "Value too large to convert to toml value",
-                    "value too large",
-                    v.tag.span,
-                ));
-            }
-        }
-        UntaggedValue::Primitive(Primitive::Duration(i)) => toml::Value::String(i.to_string()),
-        UntaggedValue::Primitive(Primitive::Date(d)) => toml::Value::String(d.to_string()),
-        UntaggedValue::Primitive(Primitive::EndOfStream) => {
-            toml::Value::String("<End of Stream>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => {
-            toml::Value::String("<Beginning of Stream>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Decimal(f)) => {
-            toml::Value::Float(f.tagged(&v.tag).coerce_into("converting to TOML float")?)
-        }
-        UntaggedValue::Primitive(Primitive::Int(i)) => toml::Value::Integer(*i),
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            toml::Value::Integer(i.tagged(&v.tag).coerce_into("converting to TOML integer")?)
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => {
-            toml::Value::String("<Nothing>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::GlobPattern(s)) => toml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::String(s)) => toml::Value::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => {
-            toml::Value::String(s.display().to_string())
-        }
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => toml::Value::Array(
-            path.iter()
-                .map(|x| match &x.unspanned {
-                    UnspannedPathMember::String(string) => Ok(toml::Value::String(string.clone())),
-                    UnspannedPathMember::Int(int) => Ok(toml::Value::Integer(*int)),
-                })
-                .collect::<Result<Vec<toml::Value>, ShellError>>()?,
-        ),
-        UntaggedValue::Table(l) => toml::Value::Array(collect_values(l)?),
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Block(_) => toml::Value::String("<Block>".to_string()),
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-            toml::Value::String("<DataFrame>".to_string())
-        }
-        UntaggedValue::Primitive(Primitive::Range(_)) => toml::Value::String("<Range>".to_string()),
-        UntaggedValue::Primitive(Primitive::Binary(b)) => {
-            toml::Value::Array(b.iter().map(|x| toml::Value::Integer(*x as i64)).collect())
-        }
-        UntaggedValue::Row(o) => {
-            let mut m = toml::map::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), helper(v)?);
-            }
-            toml::Value::Table(m)
-        }
-    })
-}
-
-/// Converts a nu_protocol::Value into a toml::Value
-/// Will return a Shell Error, if the Nu Value is not a valid top-level TOML Value
-pub fn value_to_toml_value(v: &Value) -> Result<toml::Value, ShellError> {
-    match &v.value {
-        UntaggedValue::Row(o) => {
-            let mut m = toml::map::Map::new();
-            for (k, v) in &o.entries {
-                m.insert(k.clone(), helper(v)?);
-            }
-            Ok(toml::Value::Table(m))
-        }
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            // Attempt to de-serialize the String
-            toml::de::from_str(s).map_err(|_| {
-                ShellError::labeled_error(
-                    format!("{:?} unable to de-serialize string to TOML", s),
-                    "invalid TOML",
-                    v.tag(),
-                )
-            })
-        }
-        _ => Err(ShellError::labeled_error(
-            format!("{:?} is not a valid top-level TOML", v.value),
-            "invalid TOML",
-            v.tag(),
-        )),
-    }
-}
-
-pub fn config_path() -> Result<PathBuf, ShellError> {
-    use directories_next::ProjectDirs;
-
-    let dir = ProjectDirs::from("org", "nushell", "nu")
-        .ok_or_else(|| ShellError::untagged_runtime_error("Couldn't find project directory"))?;
-    let path = var("NU_CONFIG_DIR").map_or(ProjectDirs::config_dir(&dir).to_owned(), |path| {
-        PathBuf::from(path)
-    });
-    std::fs::create_dir_all(&path).map_err(|err| {
-        ShellError::untagged_runtime_error(&format!("Couldn't create {} path:\n{}", "config", err))
-    })?;
-
-    Ok(path)
-}
-
-pub fn default_path() -> Result<PathBuf, ShellError> {
-    default_path_for(&None)
-}
-
-pub fn default_path_for(file: &Option<PathBuf>) -> Result<PathBuf, ShellError> {
-    let mut filename = config_path()?;
-    let file: &Path = file.as_deref().unwrap_or_else(|| "config.toml".as_ref());
-    filename.push(file);
-
-    Ok(filename)
-}
-
-pub fn user_data() -> Result<PathBuf, ShellError> {
-    use directories_next::ProjectDirs;
-
-    let dir = ProjectDirs::from("org", "nushell", "nu")
-        .ok_or_else(|| ShellError::untagged_runtime_error("Couldn't find project directory"))?;
-    let path = ProjectDirs::data_local_dir(&dir).to_owned();
-    std::fs::create_dir_all(&path).map_err(|err| {
-        ShellError::untagged_runtime_error(&format!(
-            "Couldn't create {} path:\n{}",
-            "user data", err
-        ))
-    })?;
-
-    Ok(path)
-}
-
-#[derive(Debug, Clone)]
-pub enum Status {
-    LastModified(std::time::SystemTime),
-    Unavailable,
-}
-
-impl Default for Status {
-    fn default() -> Self {
-        Status::Unavailable
-    }
-}
-
-pub fn last_modified(at: &Option<PathBuf>) -> Result<Status, Box<dyn std::error::Error>> {
-    let filename = default_path()?;
-
-    let filename = match at {
-        None => filename,
-        Some(ref file) => file.clone(),
-    };
-
-    if let Ok(time) = filename.metadata()?.modified() {
-        return Ok(Status::LastModified(time));
-    }
-
-    Ok(Status::Unavailable)
-}
-
-pub fn read(
-    tag: impl Into<Tag>,
-    at: &Option<PathBuf>,
-) -> Result<IndexMap<String, Value>, ShellError> {
-    let filename = default_path()?;
-
-    let filename = match at {
-        None => filename,
-        Some(ref file) => file.clone(),
-    };
-
-    if !filename.exists() && touch(&filename).is_err() {
-        // If we can't create configs, let's just return an empty indexmap instead as we may be in
-        // a readonly environment
-        return Ok(IndexMap::new());
-    }
-
-    trace!("config file = {}", filename.display());
-
-    let tag = tag.into();
-    let contents = fs::read_to_string(filename)
-        .map(|v| v.tagged(&tag))
-        .map_err(|err| {
-            ShellError::labeled_error(
-                &format!("Couldn't read config file:\n{}", err),
-                "file name",
-                &tag,
-            )
-        })?;
-
-    let parsed: toml::Value = toml::from_str(&contents).map_err(|err| {
-        ShellError::labeled_error(
-            &format!("Couldn't parse config file:\n{}", err),
-            "file name",
-            &tag,
-        )
-    })?;
-
-    let value = convert_toml_value_to_nu_value(&parsed, tag);
-    let tag = value.tag();
-    match value.value {
-        UntaggedValue::Row(Dictionary { entries }) => Ok(entries),
-        other => Err(ShellError::type_error(
-            "Dictionary",
-            other.type_name().spanned(tag.span),
-        )),
-    }
-}
-
-pub fn config(tag: impl Into<Tag>) -> Result<IndexMap<String, Value>, ShellError> {
-    read(tag, &None)
-}
-
-pub fn write(config: &IndexMap<String, Value>, at: &Option<PathBuf>) -> Result<(), ShellError> {
-    let filename = default_path()?;
-
-    let filename = match at {
-        None => filename,
-        Some(ref file) => file.clone(),
-    };
-
-    let contents = value_to_toml_value(
-        &UntaggedValue::Row(Dictionary::new(config.clone())).into_untagged_value(),
-    )?;
-
-    let contents = toml::to_string(&contents)?;
-
-    fs::write(&filename, &contents)?;
-
-    Ok(())
-}
-
-// A simple implementation of `% touch path` (ignores existing files)
-fn touch(path: &Path) -> io::Result<()> {
-    match OpenOptions::new().create(true).write(true).open(path) {
-        Ok(_) => Ok(()),
-        Err(e) => Err(e),
-    }
-}
-
-pub fn cfg_path_to_scope_tag(cfg_path: &Path) -> String {
-    cfg_path.to_string_lossy().to_string()
-}
diff --git a/old_nushell/crates/nu-data/src/config/conf.rs b/old_nushell/crates/nu-data/src/config/conf.rs
deleted file mode 100644
index 784184eaa..000000000
--- a/old_nushell/crates/nu-data/src/config/conf.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::Value;
-use std::{fmt::Debug, path::PathBuf};
-
-pub trait Conf: Debug + Send {
-    fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>>;
-    fn var(&self, key: &str) -> Option<Value>;
-    fn env(&self) -> Option<Value>;
-    fn path(&self) -> Result<Option<Vec<PathBuf>>, ShellError>;
-    fn clone_box(&self) -> Box<dyn Conf>;
-    fn reload(&mut self);
-}
-
-impl Conf for Box<dyn Conf> {
-    fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>> {
-        (**self).is_modified()
-    }
-
-    fn var(&self, key: &str) -> Option<Value> {
-        (**self).var(key)
-    }
-
-    fn env(&self) -> Option<Value> {
-        (**self).env()
-    }
-
-    fn reload(&mut self) {
-        (**self).reload();
-    }
-
-    fn clone_box(&self) -> Box<dyn Conf> {
-        (**self).clone_box()
-    }
-
-    fn path(&self) -> Result<Option<Vec<PathBuf>>, ShellError> {
-        (**self).path()
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/config/config_trust.rs b/old_nushell/crates/nu-data/src/config/config_trust.rs
deleted file mode 100644
index 98012cdf8..000000000
--- a/old_nushell/crates/nu-data/src/config/config_trust.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use serde::Deserialize;
-use serde::Serialize;
-use sha2::{Digest, Sha256};
-use std::{io::Read, path::Path, path::PathBuf};
-
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-
-#[derive(Deserialize, Serialize, Debug, Default)]
-pub struct Trusted {
-    pub files: IndexMap<String, Vec<u8>>,
-}
-
-impl Trusted {
-    pub fn new() -> Self {
-        Trusted {
-            files: IndexMap::new(),
-        }
-    }
-}
-
-pub fn is_file_trusted(nu_env_file: &Path, content: &[u8]) -> Result<bool, ShellError> {
-    let contentdigest = Sha256::digest(content).as_slice().to_vec();
-    let nufile = nu_path::canonicalize(nu_env_file)?;
-
-    let trusted = read_trusted()?;
-    Ok(trusted.files.get(&nufile.to_string_lossy().to_string()) == Some(&contentdigest))
-}
-
-pub fn read_trusted() -> Result<Trusted, ShellError> {
-    let config_path = crate::config::default_path_for(&Some(PathBuf::from("nu-env.toml")))?;
-
-    let mut file = std::fs::OpenOptions::new()
-        .read(true)
-        .create(true)
-        .write(true)
-        .open(config_path)
-        .map_err(|_| ShellError::untagged_runtime_error("Couldn't open nu-env.toml"))?;
-    let mut doc = String::new();
-    file.read_to_string(&mut doc)?;
-
-    let allowed = toml::de::from_str(&doc).unwrap_or_else(|_| Trusted::new());
-    Ok(allowed)
-}
diff --git a/old_nushell/crates/nu-data/src/config/local_config.rs b/old_nushell/crates/nu-data/src/config/local_config.rs
deleted file mode 100644
index b96c1f809..000000000
--- a/old_nushell/crates/nu-data/src/config/local_config.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-use nu_errors::ShellError;
-use std::path::{Path, PathBuf};
-
-static LOCAL_CFG_FILE_NAME: &str = ".nu-env";
-
-pub struct LocalConfigDiff {
-    pub cfgs_to_load: Vec<PathBuf>,
-    pub cfgs_to_unload: Vec<PathBuf>,
-}
-
-/// Finds all local configs between `from` up to `to`.
-/// Every config seen while going up the filesystem (e.G. from `/foo` to `/foo/bar`) is returned
-/// as a config to load
-/// Every config seen while going down the filesystem (e.G. from `/foo/bar` to `/foo/bar`) is
-/// returned as a config to unload
-/// If both paths are unrelated to each other, (e.G. windows paths as: `C:/foo` and `D:/bar`)
-/// this function first walks `from` completely down the filesystem and then it walks up until `to`.
-///
-/// Both paths are required to be absolute.
-impl LocalConfigDiff {
-    pub fn between(from: PathBuf, to: PathBuf) -> (LocalConfigDiff, Vec<ShellError>) {
-        let common_prefix = common_path::common_path(&from, &to);
-        let (cfgs_to_unload, err_down) = walk_down(&from, &common_prefix);
-        let (cfgs_to_load, err_up) = walk_up(&common_prefix, &to);
-
-        (
-            LocalConfigDiff {
-                cfgs_to_load,
-                cfgs_to_unload,
-            },
-            err_down.into_iter().chain(err_up).collect(),
-        )
-    }
-}
-
-///Walks from the first parameter down the filesystem to the second parameter. Marking all
-///configs found in directories on the way as to remove.
-///If to is None, this method walks from the first parameter down to the beginning of the
-///filesystem
-///Returns tuple of (configs to remove, errors from io).
-fn walk_down(
-    from_inclusive: &Path,
-    to_exclusive: &Option<PathBuf>,
-) -> (Vec<PathBuf>, Vec<ShellError>) {
-    let mut all_err = vec![];
-    let mut all_cfgs_to_unload = vec![];
-    for dir in from_inclusive.ancestors().take_while(|cur_path| {
-        if let Some(until_path) = to_exclusive {
-            //Stop before `to_exclusive`
-            *cur_path != until_path
-        } else {
-            //No end, walk all the way down
-            true
-        }
-    }) {
-        match local_cfg_should_be_unloaded(dir.to_path_buf()) {
-            Ok(Some(cfg)) => all_cfgs_to_unload.push(cfg),
-            Err(e) => all_err.push(e),
-            _ => {}
-        }
-    }
-
-    (all_cfgs_to_unload, all_err)
-}
-
-///Walks from the first parameter up the filesystem to the second parameter, returns all configs
-///found in directories on the way to load.
-///Returns combined errors from checking directories on the way
-///If from is None, this method walks from the beginning of the second parameter up to the
-///second parameter
-fn walk_up(
-    from_exclusive: &Option<PathBuf>,
-    to_inclusive: &Path,
-) -> (Vec<PathBuf>, Vec<ShellError>) {
-    let mut all_err = vec![];
-    let mut all_cfgs_to_load = vec![];
-
-    //skip all paths until (inclusive) from (or 0 if from is None)
-    let skip_ahead = from_exclusive
-        .as_ref()
-        .map(|p| p.ancestors().count())
-        .unwrap_or(0);
-    //We have to traverse ancestors in reverse order (apply lower directories first)
-    //ancestors() does not yield iter with .rev() method. So we store all ancestors
-    //and then iterate over the vec
-    let dirs: Vec<_> = to_inclusive.ancestors().map(Path::to_path_buf).collect();
-    for dir in dirs.iter().rev().skip(skip_ahead) {
-        match loadable_cfg_exists_in_dir(dir.clone()) {
-            Ok(Some(cfg)) => all_cfgs_to_load.push(cfg),
-            Err(e) => all_err.push(e),
-            _ => {}
-        }
-    }
-
-    (all_cfgs_to_load, all_err)
-}
-
-fn is_existent_local_cfg(cfg_file_path: &Path) -> Result<bool, ShellError> {
-    if !cfg_file_path.exists() || cfg_file_path.parent() == super::default_path()?.parent() {
-        //Don't treat global cfg as local one
-        Ok(false)
-    } else {
-        Ok(true)
-    }
-}
-
-fn is_trusted_local_cfg_content(cfg_file_path: &Path, content: &[u8]) -> Result<bool, ShellError> {
-    //This checks whether user used `autoenv trust` to mark this cfg as secure
-    if !super::is_file_trusted(cfg_file_path, content)? {
-        //Notify user about present config, but not trusted
-        Err(ShellError::untagged_runtime_error(
-                format!("{:?} is untrusted. Run 'autoenv trust {:?}' to trust it.\nThis needs to be done after each change to the file.",
-                    cfg_file_path, cfg_file_path.parent().unwrap_or_else(|| Path::new("")))))
-    } else {
-        Ok(true)
-    }
-}
-
-fn local_cfg_should_be_unloaded<P: AsRef<Path>>(cfg_dir: P) -> Result<Option<PathBuf>, ShellError> {
-    let mut cfg = cfg_dir.as_ref().to_path_buf();
-    cfg.push(LOCAL_CFG_FILE_NAME);
-    if is_existent_local_cfg(&cfg)? {
-        //No need to compute whether content is good. If it is not loaded before, unloading does
-        //nothing
-        Ok(Some(cfg))
-    } else {
-        Ok(None)
-    }
-}
-
-/// Checks whether a local_cfg exists in cfg_dir and returns:
-/// Ok(Some(cfg_path)) if cfg exists and is good to load
-/// Ok(None) if no cfg exists
-/// Err(error) if cfg exits, but is not good to load
-pub fn loadable_cfg_exists_in_dir(mut cfg_dir: PathBuf) -> Result<Option<PathBuf>, ShellError> {
-    cfg_dir.push(LOCAL_CFG_FILE_NAME);
-    let cfg_path = cfg_dir;
-
-    if !is_existent_local_cfg(&cfg_path)? {
-        return Ok(None);
-    }
-
-    let content = std::fs::read(&cfg_path)?;
-
-    if !is_trusted_local_cfg_content(&cfg_path, &content)? {
-        return Ok(None);
-    }
-
-    Ok(Some(cfg_path))
-}
diff --git a/old_nushell/crates/nu-data/src/config/nuconfig.rs b/old_nushell/crates/nu-data/src/config/nuconfig.rs
deleted file mode 100644
index 7cecb8e91..000000000
--- a/old_nushell/crates/nu-data/src/config/nuconfig.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use crate::config::{last_modified, read, Conf, Status};
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::Value;
-use nu_source::Tag;
-use nu_test_support::NATIVE_PATH_ENV_VAR;
-use std::{fmt::Debug, path::PathBuf};
-
-use super::write;
-
-#[derive(Debug, Clone, Default)]
-pub struct NuConfig {
-    pub vars: IndexMap<String, Value>,
-    pub file_path: PathBuf,
-    pub modified_at: Status,
-}
-
-impl Conf for NuConfig {
-    fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>> {
-        self.is_modified()
-    }
-
-    fn var(&self, key: &str) -> Option<Value> {
-        self.var(key)
-    }
-
-    fn env(&self) -> Option<Value> {
-        self.env()
-    }
-
-    fn path(&self) -> Result<Option<Vec<PathBuf>>, ShellError> {
-        self.path()
-    }
-
-    fn reload(&mut self) {
-        if let Ok(variables) = read(Tag::unknown(), &Some(self.file_path.clone())) {
-            self.vars = variables;
-
-            self.modified_at = if let Ok(status) = last_modified(&Some(self.file_path.clone())) {
-                status
-            } else {
-                Status::Unavailable
-            };
-        }
-    }
-
-    fn clone_box(&self) -> Box<dyn Conf> {
-        Box::new(self.clone())
-    }
-}
-
-impl NuConfig {
-    pub fn load(cfg_file_path: Option<PathBuf>) -> Result<NuConfig, ShellError> {
-        let vars = read(Tag::unknown(), &cfg_file_path)?;
-        let modified_at = NuConfig::get_last_modified(&cfg_file_path);
-        let file_path = if let Some(file_path) = cfg_file_path {
-            file_path
-        } else {
-            crate::config::default_path()?
-        };
-
-        Ok(NuConfig {
-            vars,
-            file_path,
-            modified_at,
-        })
-    }
-
-    /// Writes self.values under self.file_path
-    pub fn write(&self) -> Result<(), ShellError> {
-        write(&self.vars, &Some(self.file_path.clone()))
-    }
-
-    pub fn new() -> NuConfig {
-        let vars = if let Ok(variables) = read(Tag::unknown(), &None) {
-            variables
-        } else {
-            IndexMap::default()
-        };
-        let path = if let Ok(path) = crate::config::default_path() {
-            path
-        } else {
-            PathBuf::new()
-        };
-
-        NuConfig {
-            vars,
-            modified_at: NuConfig::get_last_modified(&None),
-            file_path: path,
-        }
-    }
-
-    pub fn get_last_modified(config_file: &Option<std::path::PathBuf>) -> Status {
-        if let Ok(status) = last_modified(config_file) {
-            status
-        } else {
-            Status::Unavailable
-        }
-    }
-
-    pub fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>> {
-        let modified_at = &self.modified_at;
-
-        Ok(match (NuConfig::get_last_modified(&None), modified_at) {
-            (Status::LastModified(left), Status::LastModified(right)) => {
-                let left = left.duration_since(std::time::UNIX_EPOCH)?;
-                let right = (*right).duration_since(std::time::UNIX_EPOCH)?;
-
-                left != right
-            }
-            (_, _) => false,
-        })
-    }
-
-    pub fn var(&self, key: &str) -> Option<Value> {
-        let vars = &self.vars;
-
-        if let Some(value) = vars.get(key) {
-            return Some(value.clone());
-        }
-
-        None
-    }
-
-    /// Return environment variables as map
-    pub fn env_map(&self) -> IndexMap<String, String> {
-        let mut result = IndexMap::new();
-        if let Some(variables) = self.env() {
-            for var in variables.row_entries() {
-                if let Ok(value) = var.1.as_string() {
-                    result.insert(var.0.clone(), value);
-                }
-            }
-        }
-        result
-    }
-
-    pub fn env(&self) -> Option<Value> {
-        let vars = &self.vars;
-
-        if let Some(env_vars) = vars.get("env") {
-            return Some(env_vars.clone());
-        }
-
-        None
-    }
-
-    pub fn path(&self) -> Result<Option<Vec<PathBuf>>, ShellError> {
-        let vars = &self.vars;
-
-        if let Some(path) = vars.get("path").or_else(|| vars.get(NATIVE_PATH_ENV_VAR)) {
-            path
-                .table_entries()
-                .map(|p| {
-                    p.as_string().map(PathBuf::from).map_err(|_| {
-                        ShellError::untagged_runtime_error("Could not format path entry as string!\nPath entry from config won't be added")
-                    })
-                })
-            .collect::<Result<Vec<PathBuf>, ShellError>>().map(Some)
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn load_scripts_if_present(&self, scripts_name: &str) -> Result<Vec<String>, ShellError> {
-        if let Some(array) = self.var(scripts_name) {
-            if !array.is_table() {
-                Err(ShellError::untagged_runtime_error(format!(
-                    "expected an array of strings as {} commands",
-                    scripts_name
-                )))
-            } else {
-                array.table_entries().map(Value::as_string).collect()
-            }
-        } else {
-            Ok(vec![])
-        }
-    }
-
-    pub fn exit_scripts(&self) -> Result<Vec<String>, ShellError> {
-        self.load_scripts_if_present("on_exit")
-    }
-
-    pub fn startup_scripts(&self) -> Result<Vec<String>, ShellError> {
-        self.load_scripts_if_present("startup")
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/config/path.rs b/old_nushell/crates/nu-data/src/config/path.rs
deleted file mode 100644
index 5a9fdb031..000000000
--- a/old_nushell/crates/nu-data/src/config/path.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::path::PathBuf;
-
-use super::NuConfig;
-
-const DEFAULT_LOCATION: &str = "history.txt";
-
-pub fn default_history_path() -> PathBuf {
-    crate::config::user_data()
-        .map(|mut p| {
-            p.push(DEFAULT_LOCATION);
-            p
-        })
-        .unwrap_or_else(|_| PathBuf::from(DEFAULT_LOCATION))
-}
-
-/// Get history path of config, if present
-pub fn history_path(config: &NuConfig) -> Option<PathBuf> {
-    config
-        .var("history-path")
-        .and_then(|custom_path| custom_path.as_string().map(PathBuf::from).ok())
-}
-
-/// Get history path in config or default
-pub fn history_path_or_default(config: &NuConfig) -> PathBuf {
-    history_path(config).unwrap_or_else(default_history_path)
-}
diff --git a/old_nushell/crates/nu-data/src/config/tests.rs b/old_nushell/crates/nu-data/src/config/tests.rs
deleted file mode 100644
index 9a8935537..000000000
--- a/old_nushell/crates/nu-data/src/config/tests.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use crate::config::{Conf, NuConfig, Status};
-use nu_protocol::Value;
-use std::path::{Path, PathBuf};
-
-#[derive(Debug, Clone)]
-pub struct FakeConfig {
-    pub config: NuConfig,
-    source_file: Option<PathBuf>,
-}
-
-impl Conf for FakeConfig {
-    fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>> {
-        self.is_modified()
-    }
-
-    fn var(&self, key: &str) -> Option<Value> {
-        self.config.var(key)
-    }
-
-    fn env(&self) -> Option<Value> {
-        self.config.env()
-    }
-
-    fn path(&self) -> Option<Value> {
-        self.config.path()
-    }
-
-    fn reload(&mut self) {
-        self.reload()
-    }
-
-    fn clone_box(&self) -> Box<dyn Conf> {
-        self.config.clone_box()
-    }
-}
-
-impl FakeConfig {
-    pub fn new(config_file: &Path) -> FakeConfig {
-        let config_file = config_file.to_path_buf();
-
-        FakeConfig {
-            config: NuConfig::with(Some(config_file.clone().into_os_string())),
-            source_file: Some(config_file),
-        }
-    }
-
-    pub fn is_modified(&self) -> Result<bool, Box<dyn std::error::Error>> {
-        let modified_at = &self.config.modified_at;
-
-        Ok(
-            match (NuConfig::get_last_modified(&self.source_file), modified_at) {
-                (Status::LastModified(left), Status::LastModified(right)) => {
-                    let left = left.duration_since(std::time::UNIX_EPOCH)?;
-                    let right = (*right).duration_since(std::time::UNIX_EPOCH)?;
-
-                    left != right
-                }
-                (_, _) => false,
-            },
-        )
-    }
-
-    pub fn reload(&mut self) {
-        self.config = NuConfig::with(self.source_file.clone().map(|x| x.into_os_string()));
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/dict.rs b/old_nushell/crates/nu-data/src/dict.rs
deleted file mode 100644
index fa48110fc..000000000
--- a/old_nushell/crates/nu-data/src/dict.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use derive_new::new;
-use nu_protocol::{Dictionary, MaybeOwned, Primitive, UntaggedValue, Value};
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug, Spanned, Tag};
-
-#[derive(Debug, new)]
-struct DebugEntry<'a> {
-    key: &'a str,
-    value: &'a Value,
-}
-
-impl<'a> PrettyDebug for DebugEntry<'a> {
-    fn pretty(&self) -> DebugDocBuilder {
-        (DbgDocBldr::key(self.key.to_string())
-            + DbgDocBldr::equals()
-            + self.value.pretty().into_value())
-        .group()
-    }
-}
-
-pub trait DictionaryExt {
-    fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value>;
-
-    fn keys(&self) -> indexmap::map::Keys<String, Value>;
-    fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value>;
-    fn get_mut_data_by_key(&mut self, name: &str) -> Option<&mut Value>;
-    fn insert_data_at_key(&mut self, name: &str, value: Value);
-}
-
-impl DictionaryExt for Dictionary {
-    fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value> {
-        match self.entries.get(desc) {
-            Some(v) => MaybeOwned::Borrowed(v),
-            None => MaybeOwned::Owned(
-                UntaggedValue::Primitive(Primitive::Nothing).into_untagged_value(),
-            ),
-        }
-    }
-
-    fn keys(&self) -> indexmap::map::Keys<String, Value> {
-        self.entries.keys()
-    }
-
-    fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value> {
-        let result = self
-            .entries
-            .iter()
-            .find(|&(desc_name, _)| desc_name == name.item)?
-            .1;
-
-        Some(
-            result
-                .value
-                .clone()
-                .into_value(Tag::new(result.anchor(), name.span)),
-        )
-    }
-
-    fn get_mut_data_by_key(&mut self, name: &str) -> Option<&mut Value> {
-        self.entries
-            .iter_mut()
-            .find(|&(desc_name, _)| desc_name == name)
-            .map_or_else(|| None, |x| Some(x.1))
-    }
-
-    fn insert_data_at_key(&mut self, name: &str, value: Value) {
-        self.entries.insert(name.to_string(), value);
-    }
-}
-
-#[derive(Debug)]
-pub struct TaggedListBuilder {
-    tag: Tag,
-    pub list: Vec<Value>,
-}
-
-impl TaggedListBuilder {
-    pub fn new(tag: impl Into<Tag>) -> TaggedListBuilder {
-        TaggedListBuilder {
-            tag: tag.into(),
-            list: vec![],
-        }
-    }
-
-    pub fn push_value(&mut self, value: impl Into<Value>) {
-        self.list.push(value.into());
-    }
-
-    pub fn push_untagged(&mut self, value: impl Into<UntaggedValue>) {
-        self.list.push(value.into().into_value(self.tag.clone()));
-    }
-
-    pub fn into_value(self) -> Value {
-        UntaggedValue::Table(self.list).into_value(self.tag)
-    }
-
-    pub fn into_untagged_value(self) -> UntaggedValue {
-        UntaggedValue::Table(self.list).into_value(self.tag).value
-    }
-}
-
-impl From<TaggedListBuilder> for Value {
-    fn from(input: TaggedListBuilder) -> Value {
-        input.into_value()
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/keybinding.rs b/old_nushell/crates/nu-data/src/keybinding.rs
deleted file mode 100644
index 9c36d463c..000000000
--- a/old_nushell/crates/nu-data/src/keybinding.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn keybinding_path() -> Result<std::path::PathBuf, nu_errors::ShellError> {
-    crate::config::default_path_for(&Some(std::path::PathBuf::from("keybindings.yml")))
-}
diff --git a/old_nushell/crates/nu-data/src/lib.rs b/old_nushell/crates/nu-data/src/lib.rs
deleted file mode 100644
index 44d0862bb..000000000
--- a/old_nushell/crates/nu-data/src/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod base;
-pub mod config;
-pub mod dict;
-pub mod keybinding;
-pub mod primitive;
-pub mod utils;
-pub mod value;
-
-pub use dict::TaggedListBuilder;
diff --git a/old_nushell/crates/nu-data/src/primitive.rs b/old_nushell/crates/nu-data/src/primitive.rs
deleted file mode 100644
index 3d0ad340c..000000000
--- a/old_nushell/crates/nu-data/src/primitive.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-use crate::config::NuConfig;
-use nu_ansi_term::{Color, Style};
-use nu_protocol::{hir::Number, Primitive, Value};
-use nu_table::{Alignment, TextStyle};
-use std::collections::HashMap;
-
-pub fn number(number: impl Into<Number>) -> Primitive {
-    let number = number.into();
-
-    match number {
-        Number::BigInt(int) => Primitive::BigInt(int),
-        Number::Int(int) => Primitive::Int(int),
-        Number::Decimal(decimal) => Primitive::Decimal(decimal),
-    }
-}
-
-pub fn lookup_ansi_color_style(s: String) -> Style {
-    match s.as_str() {
-        "g" | "green" => Color::Green.normal(),
-        "gb" | "green_bold" => Color::Green.bold(),
-        "gu" | "green_underline" => Color::Green.underline(),
-        "gi" | "green_italic" => Color::Green.italic(),
-        "gd" | "green_dimmed" => Color::Green.dimmed(),
-        "gr" | "green_reverse" => Color::Green.reverse(),
-        "gbl" | "green_blink" => Color::Green.blink(),
-        "gst" | "green_strike" => Color::Green.strikethrough(),
-        "r" | "red" => Color::Red.normal(),
-        "rb" | "red_bold" => Color::Red.bold(),
-        "ru" | "red_underline" => Color::Red.underline(),
-        "ri" | "red_italic" => Color::Red.italic(),
-        "rd" | "red_dimmed" => Color::Red.dimmed(),
-        "rr" | "red_reverse" => Color::Red.reverse(),
-        "rbl" | "red_blink" => Color::Red.blink(),
-        "rst" | "red_strike" => Color::Red.strikethrough(),
-        "u" | "blue" => Color::Blue.normal(),
-        "ub" | "blue_bold" => Color::Blue.bold(),
-        "uu" | "blue_underline" => Color::Blue.underline(),
-        "ui" | "blue_italic" => Color::Blue.italic(),
-        "ud" | "blue_dimmed" => Color::Blue.dimmed(),
-        "ur" | "blue_reverse" => Color::Blue.reverse(),
-        "ubl" | "blue_blink" => Color::Blue.blink(),
-        "ust" | "blue_strike" => Color::Blue.strikethrough(),
-        "b" | "black" => Color::Black.normal(),
-        "bb" | "black_bold" => Color::Black.bold(),
-        "bu" | "black_underline" => Color::Black.underline(),
-        "bi" | "black_italic" => Color::Black.italic(),
-        "bd" | "black_dimmed" => Color::Black.dimmed(),
-        "br" | "black_reverse" => Color::Black.reverse(),
-        "bbl" | "black_blink" => Color::Black.blink(),
-        "bst" | "black_strike" => Color::Black.strikethrough(),
-        "y" | "yellow" => Color::Yellow.normal(),
-        "yb" | "yellow_bold" => Color::Yellow.bold(),
-        "yu" | "yellow_underline" => Color::Yellow.underline(),
-        "yi" | "yellow_italic" => Color::Yellow.italic(),
-        "yd" | "yellow_dimmed" => Color::Yellow.dimmed(),
-        "yr" | "yellow_reverse" => Color::Yellow.reverse(),
-        "ybl" | "yellow_blink" => Color::Yellow.blink(),
-        "yst" | "yellow_strike" => Color::Yellow.strikethrough(),
-        "p" | "purple" => Color::Purple.normal(),
-        "pb" | "purple_bold" => Color::Purple.bold(),
-        "pu" | "purple_underline" => Color::Purple.underline(),
-        "pi" | "purple_italic" => Color::Purple.italic(),
-        "pd" | "purple_dimmed" => Color::Purple.dimmed(),
-        "pr" | "purple_reverse" => Color::Purple.reverse(),
-        "pbl" | "purple_blink" => Color::Purple.blink(),
-        "pst" | "purple_strike" => Color::Purple.strikethrough(),
-        "c" | "cyan" => Color::Cyan.normal(),
-        "cb" | "cyan_bold" => Color::Cyan.bold(),
-        "cu" | "cyan_underline" => Color::Cyan.underline(),
-        "ci" | "cyan_italic" => Color::Cyan.italic(),
-        "cd" | "cyan_dimmed" => Color::Cyan.dimmed(),
-        "cr" | "cyan_reverse" => Color::Cyan.reverse(),
-        "cbl" | "cyan_blink" => Color::Cyan.blink(),
-        "cst" | "cyan_strike" => Color::Cyan.strikethrough(),
-        "w" | "white" => Color::White.normal(),
-        "wb" | "white_bold" => Color::White.bold(),
-        "wu" | "white_underline" => Color::White.underline(),
-        "wi" | "white_italic" => Color::White.italic(),
-        "wd" | "white_dimmed" => Color::White.dimmed(),
-        "wr" | "white_reverse" => Color::White.reverse(),
-        "wbl" | "white_blink" => Color::White.blink(),
-        "wst" | "white_strike" => Color::White.strikethrough(),
-        _ => Color::White.normal(),
-    }
-}
-
-pub fn string_to_lookup_value(str_prim: &str) -> String {
-    match str_prim {
-        "primitive_int" => "Primitive::Int".to_string(),
-        "primitive_decimal" => "Primitive::Decimal".to_string(),
-        "primitive_filesize" => "Primitive::Filesize".to_string(),
-        "primitive_string" => "Primitive::String".to_string(),
-        "primitive_line" => "Primitive::Line".to_string(),
-        "primitive_columnpath" => "Primitive::ColumnPath".to_string(),
-        "primitive_pattern" => "Primitive::GlobPattern".to_string(),
-        "primitive_boolean" => "Primitive::Boolean".to_string(),
-        "primitive_date" => "Primitive::Date".to_string(),
-        "primitive_duration" => "Primitive::Duration".to_string(),
-        "primitive_range" => "Primitive::Range".to_string(),
-        "primitive_path" => "Primitive::FilePath".to_string(),
-        "primitive_binary" => "Primitive::Binary".to_string(),
-        "separator_color" => "separator_color".to_string(),
-        "header_align" => "header_align".to_string(),
-        "header_color" => "header_color".to_string(),
-        "header_style" => "header_style".to_string(),
-        "index_color" => "index_color".to_string(),
-        "leading_trailing_space_bg" => "leading_trailing_space_bg".to_string(),
-        _ => "Primitive::Nothing".to_string(),
-    }
-}
-
-fn update_hashmap(key: &str, val: &Value, hm: &mut HashMap<String, Style>) {
-    if let Ok(var) = val.as_string() {
-        let color = lookup_ansi_color_style(var);
-        let prim = string_to_lookup_value(key);
-        if let Some(v) = hm.get_mut(&prim) {
-            *v = color;
-        } else {
-            hm.insert(prim, color);
-        }
-    }
-}
-
-pub fn get_color_config(config: &NuConfig) -> HashMap<String, Style> {
-    let config = &config.vars;
-
-    // create the hashmap
-    let mut hm: HashMap<String, Style> = HashMap::new();
-    // set some defaults
-    hm.insert("primitive_int".to_string(), Color::White.normal());
-    hm.insert("primitive_decimal".to_string(), Color::White.normal());
-    hm.insert("primitive_filesize".to_string(), Color::White.normal());
-    hm.insert("primitive_string".to_string(), Color::White.normal());
-    hm.insert("primitive_line".to_string(), Color::White.normal());
-    hm.insert("primitive_columnpath".to_string(), Color::White.normal());
-    hm.insert("primitive_pattern".to_string(), Color::White.normal());
-    hm.insert("primitive_boolean".to_string(), Color::White.normal());
-    hm.insert("primitive_date".to_string(), Color::White.normal());
-    hm.insert("primitive_duration".to_string(), Color::White.normal());
-    hm.insert("primitive_range".to_string(), Color::White.normal());
-    hm.insert("primitive_path".to_string(), Color::White.normal());
-    hm.insert("primitive_binary".to_string(), Color::White.normal());
-    hm.insert("separator_color".to_string(), Color::White.normal());
-    hm.insert("header_align".to_string(), Color::Green.bold());
-    hm.insert("header_color".to_string(), Color::Green.bold());
-    hm.insert("header_style".to_string(), Style::default());
-    hm.insert("index_color".to_string(), Color::Green.bold());
-    hm.insert(
-        "leading_trailing_space_bg".to_string(),
-        Style::default().on(Color::Rgb(128, 128, 128)),
-    );
-
-    // populate hashmap from config values
-    if let Some(primitive_color_vars) = config.get("color_config") {
-        for (key, value) in primitive_color_vars.row_entries() {
-            match key.as_ref() {
-                "primitive_int" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_decimal" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_filesize" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_string" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_line" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_columnpath" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_pattern" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_boolean" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_date" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_duration" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_range" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_path" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "primitive_binary" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "separator_color" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "header_align" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "header_color" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "header_style" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "index_color" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                "leading_trailing_space_bg" => {
-                    update_hashmap(key, value, &mut hm);
-                }
-                _ => (),
-            }
-        }
-    }
-
-    hm
-}
-
-// This function will assign a text style to a primitive, or really any string that's
-// in the hashmap. The hashmap actually contains the style to be applied.
-pub fn style_primitive(primitive: &str, color_hm: &HashMap<String, Style>) -> TextStyle {
-    match primitive {
-        "Int" => {
-            let style = color_hm.get("Primitive::Int");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Right, *s),
-                None => TextStyle::basic_right(),
-            }
-        }
-        "Decimal" => {
-            let style = color_hm.get("Primitive::Decimal");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Right, *s),
-                None => TextStyle::basic_right(),
-            }
-        }
-        "Filesize" => {
-            let style = color_hm.get("Primitive::Filesize");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Right, *s),
-                None => TextStyle::basic_right(),
-            }
-        }
-        "String" => {
-            let style = color_hm.get("Primitive::String");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Line" => {
-            let style = color_hm.get("Primitive::Line");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "ColumnPath" => {
-            let style = color_hm.get("Primitive::ColumnPath");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "GlobPattern" => {
-            let style = color_hm.get("Primitive::GlobPattern");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Boolean" => {
-            let style = color_hm.get("Primitive::Boolean");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Date" => {
-            let style = color_hm.get("Primitive::Date");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Duration" => {
-            let style = color_hm.get("Primitive::Duration");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Range" => {
-            let style = color_hm.get("Primitive::Range");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "FilePath" => {
-            let style = color_hm.get("Primitive::FilePath");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Binary" => {
-            let style = color_hm.get("Primitive::Binary");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "BeginningOfStream" => {
-            let style = color_hm.get("Primitive::BeginningOfStream");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "EndOfStream" => {
-            let style = color_hm.get("Primitive::EndOfStream");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "Nothing" => {
-            let style = color_hm.get("Primitive::Nothing");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "separator_color" => {
-            let style = color_hm.get("separator");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Left, *s),
-                None => TextStyle::basic_left(),
-            }
-        }
-        "header_align" => {
-            let style = color_hm.get("header_align");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Center, *s),
-                None => TextStyle::default_header(),
-            }
-        }
-        "header_color" => {
-            let style = color_hm.get("header_color");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Center, *s),
-                None => TextStyle::default_header().bold(Some(true)),
-            }
-        }
-        "header_style" => {
-            let style = color_hm.get("header_style");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Center, *s),
-                None => TextStyle::default_header(),
-            }
-        }
-        "index_color" => {
-            let style = color_hm.get("index_color");
-            match style {
-                Some(s) => TextStyle::with_style(Alignment::Right, *s),
-                None => TextStyle::new()
-                    .alignment(Alignment::Right)
-                    .fg(Color::Green)
-                    .bold(Some(true)),
-            }
-        }
-        _ => TextStyle::basic_center(),
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/utils/group.rs b/old_nushell/crates/nu-data/src/utils/group.rs
deleted file mode 100644
index 75c020887..000000000
--- a/old_nushell/crates/nu-data/src/utils/group.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tag;
-use nu_value_ext::as_string;
-
-#[allow(clippy::type_complexity)]
-pub fn group(
-    values: &Value,
-    grouper: &Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut groups: IndexMap<String, Vec<Value>> = IndexMap::new();
-
-    for (idx, value) in values.table_entries().enumerate() {
-        let group_key = if let Some(ref grouper) = grouper {
-            grouper(idx, value)
-        } else {
-            as_string(value)
-        };
-
-        let group = groups.entry(group_key?).or_insert(vec![]);
-        group.push((*value).clone());
-    }
-
-    let mut out = TaggedDictBuilder::new(&tag);
-
-    for (k, v) in &groups {
-        out.insert_untagged(k, UntaggedValue::table(v));
-    }
-
-    Ok(out.into_value())
-}
diff --git a/old_nushell/crates/nu-data/src/utils/internal.rs b/old_nushell/crates/nu-data/src/utils/internal.rs
deleted file mode 100644
index b9b05ef65..000000000
--- a/old_nushell/crates/nu-data/src/utils/internal.rs
+++ /dev/null
@@ -1,332 +0,0 @@
-#![allow(clippy::type_complexity)]
-
-use crate::value::unsafe_compute_values;
-use derive_new::new;
-use nu_errors::ShellError;
-use nu_protocol::hir::Operator;
-use nu_protocol::{UntaggedValue, Value};
-use nu_source::{SpannedItem, Tag, TaggedItem};
-use nu_value_ext::ValueExt;
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, new)]
-pub struct Labels {
-    pub x: Vec<String>,
-    pub y: Vec<String>,
-}
-
-impl Labels {
-    pub fn at(&self, idx: usize) -> Option<&str> {
-        self.x.get(idx).map(|k| &k[..])
-    }
-
-    pub fn at_split(&self, idx: usize) -> Option<&str> {
-        self.y.get(idx).map(|k| &k[..])
-    }
-
-    pub fn grouped(&self) -> impl Iterator<Item = &String> {
-        self.x.iter()
-    }
-
-    pub fn grouping_total(&self) -> Value {
-        UntaggedValue::int(self.x.len() as i64).into_untagged_value()
-    }
-
-    pub fn splits(&self) -> impl Iterator<Item = &String> {
-        self.y.iter()
-    }
-
-    pub fn splits_total(&self) -> Value {
-        UntaggedValue::big_int(self.y.len()).into_untagged_value()
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, new)]
-pub struct Range {
-    pub start: Value,
-    pub end: Value,
-}
-
-fn formula(
-    acc_begin: Value,
-    calculator: Box<dyn Fn(Vec<&Value>) -> Result<Value, ShellError> + Send + Sync + 'static>,
-) -> Box<dyn Fn(&Value, Vec<&Value>) -> Result<Value, ShellError> + Send + Sync + 'static> {
-    Box::new(move |acc, datax| -> Result<Value, ShellError> {
-        let result = match unsafe_compute_values(Operator::Multiply, acc, &acc_begin) {
-            Ok(v) => v.into_untagged_value(),
-            Err((left_type, right_type)) => {
-                return Err(ShellError::coerce_error(
-                    left_type.spanned_unknown(),
-                    right_type.spanned_unknown(),
-                ))
-            }
-        };
-
-        match calculator(datax) {
-            Ok(total) => Ok(
-                match unsafe_compute_values(Operator::Plus, &result, &total) {
-                    Ok(v) => v.into_untagged_value(),
-                    Err((left_type, right_type)) => {
-                        return Err(ShellError::coerce_error(
-                            left_type.spanned_unknown(),
-                            right_type.spanned_unknown(),
-                        ))
-                    }
-                },
-            ),
-            Err(reason) => Err(reason),
-        }
-    })
-}
-
-pub fn reducer_for(
-    command: &Reduction,
-) -> Box<dyn Fn(&Value, Vec<&Value>) -> Result<Value, ShellError> + Send + Sync + 'static> {
-    match command {
-        Reduction::Accumulate => Box::new(formula(
-            UntaggedValue::int(1).into_untagged_value(),
-            Box::new(sum),
-        )),
-        Reduction::Count => Box::new(formula(
-            UntaggedValue::int(0).into_untagged_value(),
-            Box::new(sum),
-        )),
-    }
-}
-
-pub fn max(values: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut x = UntaggedValue::int(0);
-
-    for split in values.table_entries() {
-        match split.value {
-            UntaggedValue::Table(ref values) => {
-                let inner = inner_max(values)?;
-
-                if let Ok(greater_than) =
-                    crate::value::compare_values(Operator::GreaterThan, &inner.value, &x)
-                {
-                    if greater_than {
-                        x = inner.value.clone();
-                    }
-                } else {
-                    return Err(ShellError::unexpected(format!(
-                        "Could not compare\nleft: {:?}\nright: {:?}",
-                        inner.value, x
-                    )));
-                }
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute the sum of a value that cannot be summed.",
-                    "value appears here",
-                    split.tag.span,
-                ))
-            }
-        }
-    }
-
-    Ok(x.into_value(&tag))
-}
-
-pub fn inner_max(data: &[Value]) -> Result<Value, ShellError> {
-    let mut biggest = data
-        .first()
-        .ok_or_else(|| {
-            ShellError::unexpected("Cannot perform aggregate math operation on empty data")
-        })?
-        .value
-        .clone();
-
-    for value in data {
-        if let Ok(greater_than) =
-            crate::value::compare_values(Operator::GreaterThan, &value.value, &biggest)
-        {
-            if greater_than {
-                biggest = value.value.clone();
-            }
-        } else {
-            return Err(ShellError::unexpected(format!(
-                "Could not compare\nleft: {:?}\nright: {:?}",
-                biggest, value.value
-            )));
-        }
-    }
-    Ok(Value {
-        value: biggest,
-        tag: Tag::unknown(),
-    })
-}
-
-pub fn sum(data: Vec<&Value>) -> Result<Value, ShellError> {
-    let mut acc = UntaggedValue::int(0);
-
-    for value in data {
-        match value.value {
-            UntaggedValue::Primitive(_) => {
-                acc = match unsafe_compute_values(Operator::Plus, &acc, value) {
-                    Ok(v) => v,
-                    Err((left_type, right_type)) => {
-                        return Err(ShellError::coerce_error(
-                            left_type.spanned_unknown(),
-                            right_type.spanned_unknown(),
-                        ))
-                    }
-                };
-            }
-            _ => {
-                return Err(ShellError::labeled_error(
-                    "Attempted to compute the sum of a value that cannot be summed.",
-                    "value appears here",
-                    value.tag.span,
-                ))
-            }
-        }
-    }
-    Ok(acc.into_untagged_value())
-}
-
-pub fn sort_columns(
-    values: &[String],
-    format: &Option<Box<dyn Fn(&Value, String) -> Result<String, ShellError>>>,
-) -> Result<Vec<String>, ShellError> {
-    let mut keys = values.to_vec();
-
-    if format.is_none() {
-        keys.sort();
-    }
-
-    Ok(keys)
-}
-
-pub fn sort(planes: &Labels, values: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut x = vec![];
-    for column in planes.splits() {
-        let key = column.clone().tagged_unknown();
-        let groups = values
-            .get_data_by_key(key.borrow_spanned())
-            .ok_or_else(|| {
-                ShellError::labeled_error("unknown column", "unknown column", key.span())
-            })?;
-
-        let mut y = vec![];
-        for inner_column in planes.grouped() {
-            let key = inner_column.clone().tagged_unknown();
-            let grouped = groups.get_data_by_key(key.borrow_spanned());
-
-            if let Some(grouped) = grouped {
-                y.push(grouped);
-            } else {
-                y.push(UntaggedValue::Table(vec![]).into_value(&tag));
-            }
-        }
-
-        x.push(UntaggedValue::table(&y).into_value(&tag));
-    }
-
-    Ok(UntaggedValue::table(&x).into_value(&tag))
-}
-
-pub fn evaluate(
-    values: &Value,
-    evaluator: &Option<Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send>>,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut x = vec![];
-    for split in values.table_entries() {
-        let mut y = vec![];
-
-        for (idx, subset) in split.table_entries().enumerate() {
-            if let UntaggedValue::Table(values) = &subset.value {
-                if let Some(ref evaluator) = evaluator {
-                    let mut evaluations = vec![];
-
-                    for set in values {
-                        evaluations.push(evaluator(idx, set)?);
-                    }
-
-                    y.push(UntaggedValue::Table(evaluations).into_value(&tag));
-                } else {
-                    y.push(
-                        UntaggedValue::Table(
-                            values
-                                .iter()
-                                .map(|_| UntaggedValue::int(1).into_value(&tag))
-                                .collect::<Vec<_>>(),
-                        )
-                        .into_value(&tag),
-                    );
-                }
-            }
-        }
-
-        x.push(UntaggedValue::table(&y).into_value(&tag));
-    }
-
-    Ok(UntaggedValue::table(&x).into_value(&tag))
-}
-
-pub enum Reduction {
-    Count,
-    Accumulate,
-}
-
-pub fn reduce(
-    values: &Value,
-    reduction_with: &Reduction,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    let reduce_with = reducer_for(reduction_with);
-
-    let mut datasets = vec![];
-    for dataset in values.table_entries() {
-        let mut acc = UntaggedValue::int(0).into_value(&tag);
-
-        let mut subsets = vec![];
-        for subset in dataset.table_entries() {
-            acc = reduce_with(&acc, subset.table_entries().collect::<Vec<_>>())?;
-            subsets.push(acc.clone());
-        }
-        datasets.push(UntaggedValue::table(&subsets).into_value(&tag));
-    }
-
-    Ok(UntaggedValue::table(&datasets).into_value(&tag))
-}
-
-pub fn percentages(
-    maxima: &Value,
-    values: &Value,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut x = vec![];
-    for split in values.table_entries() {
-        x.push(
-            UntaggedValue::table(
-                &split
-                    .table_entries()
-                    .filter_map(|s| {
-                        let hundred = UntaggedValue::decimal_from_float(100.0, tag.span);
-
-                        match unsafe_compute_values(Operator::Divide, &hundred, maxima) {
-                            Ok(v) => match unsafe_compute_values(Operator::Multiply, s, &v) {
-                                Ok(v) => Some(v.into_untagged_value()),
-                                Err(_) => None,
-                            },
-                            Err(_) => None,
-                        }
-                    })
-                    .collect::<Vec<_>>(),
-            )
-            .into_value(&tag),
-        );
-    }
-
-    Ok(UntaggedValue::table(&x).into_value(&tag))
-}
diff --git a/old_nushell/crates/nu-data/src/utils/mod.rs b/old_nushell/crates/nu-data/src/utils/mod.rs
deleted file mode 100644
index d2712b14d..000000000
--- a/old_nushell/crates/nu-data/src/utils/mod.rs
+++ /dev/null
@@ -1,292 +0,0 @@
-pub mod group;
-pub mod split;
-
-mod internal;
-
-pub use crate::utils::group::group;
-pub use crate::utils::split::split;
-
-pub use crate::utils::internal::Reduction;
-use crate::utils::internal::*;
-
-use derive_new::new;
-use getset::Getters;
-use nu_errors::ShellError;
-use nu_protocol::{UntaggedValue, Value};
-use nu_source::Tag;
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Getters, Clone, new)]
-pub struct Model {
-    pub labels: Labels,
-    pub ranges: (Range, Range),
-
-    pub data: Value,
-    pub percentages: Value,
-}
-
-#[allow(clippy::type_complexity)]
-pub struct Operation<'a> {
-    pub grouper: Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
-    pub splitter: Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
-    pub format: &'a Option<Box<dyn Fn(&Value, String) -> Result<String, ShellError>>>,
-    pub eval: &'a Option<Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send>>,
-    pub reduction: &'a Reduction,
-}
-
-pub fn report(
-    values: &Value,
-    options: Operation,
-    tag: impl Into<Tag>,
-) -> Result<Model, ShellError> {
-    let tag = tag.into();
-
-    let grouped = group(values, &options.grouper, &tag)?;
-    let splitted = split(&grouped, &options.splitter, &tag)?;
-
-    let x = grouped
-        .row_entries()
-        .map(|(key, _)| key.clone())
-        .collect::<Vec<_>>();
-
-    let x = sort_columns(&x, options.format)?;
-
-    let mut y = splitted
-        .row_entries()
-        .map(|(key, _)| key.clone())
-        .collect::<Vec<_>>();
-
-    y.sort();
-
-    let planes = Labels { x, y };
-
-    let sorted = sort(&planes, &splitted, &tag)?;
-
-    let evaluated = evaluate(
-        &sorted,
-        if options.eval.is_some() {
-            options.eval
-        } else {
-            &None
-        },
-        &tag,
-    )?;
-
-    let group_labels = planes.grouping_total();
-
-    let reduced = reduce(&evaluated, options.reduction, &tag)?;
-
-    let maxima = max(&reduced, &tag)?;
-
-    let percents = percentages(&maxima, &reduced, &tag)?;
-
-    Ok(Model {
-        labels: planes,
-        ranges: (
-            Range {
-                start: UntaggedValue::int(0).into_untagged_value(),
-                end: group_labels,
-            },
-            Range {
-                start: UntaggedValue::int(0).into_untagged_value(),
-                end: maxima,
-            },
-        ),
-        data: reduced,
-        percentages: percents,
-    })
-}
-
-pub mod helpers {
-    use nu_errors::ShellError;
-    use nu_protocol::{row, Value};
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::{date, int, string, table};
-    use nu_value_ext::ValueExt;
-
-    pub fn committers() -> Vec<Value> {
-        vec![
-            row! {
-                   "date".into() => date("2019-07-23"),
-                   "name".into() =>       string("AR"),
-                "country".into() =>       string("EC"),
-              "chickens".into() =>             int(10)
-            },
-            row! {
-                   "date".into() => date("2019-07-23"),
-                   "name".into() =>       string("JT"),
-                "country".into() =>       string("NZ"),
-               "chickens".into() =>             int(5)
-            },
-            row! {
-                   "date".into() => date("2019-10-10"),
-                   "name".into() =>       string("YK"),
-                "country".into() =>       string("US"),
-               "chickens".into() =>             int(6)
-            },
-            row! {
-                   "date".into() => date("2019-09-24"),
-                   "name".into() =>       string("AR"),
-                "country".into() =>       string("EC"),
-               "chickens".into() =>            int(20)
-            },
-            row! {
-                   "date".into() => date("2019-10-10"),
-                   "name".into() =>       string("JT"),
-                "country".into() =>       string("NZ"),
-               "chickens".into() =>            int(15)
-            },
-            row! {
-                   "date".into() => date("2019-09-24"),
-                   "name".into() =>       string("YK"),
-                "country".into() =>       string("US"),
-               "chickens".into() =>             int(4)
-            },
-            row! {
-                   "date".into() => date("2019-10-10"),
-                   "name".into() =>       string("AR"),
-                "country".into() =>       string("EC"),
-               "chickens".into() =>            int(30)
-            },
-            row! {
-                   "date".into() => date("2019-09-24"),
-                   "name".into() =>       string("JT"),
-                "country".into() =>       string("NZ"),
-              "chickens".into() =>             int(10)
-            },
-            row! {
-                   "date".into() => date("2019-07-23"),
-                   "name".into() =>       string("YK"),
-                "country".into() =>       string("US"),
-               "chickens".into() =>             int(2)
-            },
-        ]
-    }
-
-    pub fn committers_grouped_by_date() -> Value {
-        let sample = table(&committers());
-
-        let grouper = Box::new(move |_, row: &Value| {
-            let key = String::from("date").tagged_unknown();
-            let group_key = row
-                .get_data_by_key(key.borrow_spanned())
-                .expect("get key failed");
-
-            group_key.format("%Y-%m-%d")
-        });
-
-        crate::utils::group(&sample, &Some(grouper), Tag::unknown())
-            .expect("failed to create group")
-    }
-
-    pub fn date_formatter(
-        fmt: String,
-    ) -> Box<dyn Fn(&Value, String) -> Result<String, ShellError>> {
-        Box::new(move |date: &Value, _: String| {
-            let fmt = fmt.clone();
-            date.format(&fmt)
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::helpers::{committers, date_formatter};
-    use super::{report, Labels, Model, Operation, Range, Reduction};
-    use nu_errors::ShellError;
-    use nu_protocol::Value;
-    use nu_source::{Tag, TaggedItem};
-    use nu_test_support::value::{decimal_from_float, int, table};
-    use nu_value_ext::ValueExt;
-
-    pub fn assert_without_checking_percentages(report_a: Model, report_b: Model) {
-        assert_eq!(report_a.labels.x, report_b.labels.x);
-        assert_eq!(report_a.labels.y, report_b.labels.y);
-        assert_eq!(report_a.ranges, report_b.ranges);
-        assert_eq!(report_a.data, report_b.data);
-    }
-
-    #[test]
-    fn prepares_report_using_counting_value() {
-        let committers = table(&committers());
-
-        let by_date = Box::new(move |_, row: &Value| {
-            let key = String::from("date").tagged_unknown();
-            let key = row.get_data_by_key(key.borrow_spanned()).unwrap();
-
-            let callback = date_formatter("%Y-%m-%d".to_string());
-            callback(&key, "nothing".to_string())
-        });
-
-        let by_country = Box::new(move |_, row: &Value| {
-            let key = String::from("country").tagged_unknown();
-            let key = row.get_data_by_key(key.borrow_spanned()).unwrap();
-            nu_value_ext::as_string(&key)
-        });
-
-        let options = Operation {
-            grouper: Some(by_date),
-            splitter: Some(by_country),
-            format: &None,
-            eval: /* value to be used for accumulation */ &Some(Box::new(move |_, value: &Value| {
-                let chickens_key = String::from("chickens").tagged_unknown();
-
-                value
-                    .get_data_by_key(chickens_key.borrow_spanned())
-                    .ok_or_else(|| {
-                        ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            chickens_key.span(),
-                        )
-                    })
-            })),
-            reduction: &Reduction::Count
-        };
-
-        assert_without_checking_percentages(
-            report(&committers, options, Tag::unknown()).unwrap(),
-            Model {
-                labels: Labels {
-                    x: vec![
-                        String::from("2019-07-23"),
-                        String::from("2019-09-24"),
-                        String::from("2019-10-10"),
-                    ],
-                    y: vec![String::from("EC"), String::from("NZ"), String::from("US")],
-                },
-                ranges: (
-                    Range {
-                        start: int(0),
-                        end: int(3),
-                    },
-                    Range {
-                        start: int(0),
-                        end: int(30),
-                    },
-                ),
-                data: table(&[
-                    table(&[int(10), int(20), int(30)]),
-                    table(&[int(5), int(10), int(15)]),
-                    table(&[int(2), int(4), int(6)]),
-                ]),
-                percentages: table(&[
-                    table(&[
-                        decimal_from_float(33.33),
-                        decimal_from_float(66.66),
-                        decimal_from_float(99.99),
-                    ]),
-                    table(&[
-                        decimal_from_float(16.66),
-                        decimal_from_float(33.33),
-                        decimal_from_float(49.99),
-                    ]),
-                    table(&[
-                        decimal_from_float(6.66),
-                        decimal_from_float(13.33),
-                        decimal_from_float(19.99),
-                    ]),
-                ]),
-            },
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-data/src/utils/split.rs b/old_nushell/crates/nu-data/src/utils/split.rs
deleted file mode 100644
index 94c43befd..000000000
--- a/old_nushell/crates/nu-data/src/utils/split.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{SpannedTypeName, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tag;
-
-use crate::utils::group;
-
-#[allow(clippy::type_complexity)]
-pub fn split(
-    value: &Value,
-    splitter: &Option<Box<dyn Fn(usize, &Value) -> Result<String, ShellError> + Send>>,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-
-    let mut splits = indexmap::IndexMap::new();
-    let mut out = TaggedDictBuilder::new(&tag);
-
-    if splitter.is_none() {
-        out.insert_untagged("table", value.clone());
-        return Ok(out.into_value());
-    }
-
-    for (column, value) in value.row_entries() {
-        if !&value.is_table() {
-            return Err(ShellError::type_error(
-                "a table value",
-                value.spanned_type_name(),
-            ));
-        }
-
-        match group(value, splitter, &tag) {
-            Ok(grouped) => {
-                for (split_label, subset) in grouped.row_entries() {
-                    let s = splits
-                        .entry(split_label.clone())
-                        .or_insert(indexmap::IndexMap::new());
-
-                    if !&subset.is_table() {
-                        return Err(ShellError::type_error(
-                            "a table value",
-                            subset.spanned_type_name(),
-                        ));
-                    }
-
-                    s.insert(column.clone(), subset.clone());
-                }
-            }
-            Err(err) => return Err(err),
-        }
-    }
-
-    let mut out = TaggedDictBuilder::new(&tag);
-
-    for (k, v) in splits {
-        out.insert_untagged(k, UntaggedValue::row(v));
-    }
-
-    Ok(out.into_value())
-}
diff --git a/old_nushell/crates/nu-data/src/value.rs b/old_nushell/crates/nu-data/src/value.rs
deleted file mode 100644
index c4e85016c..000000000
--- a/old_nushell/crates/nu-data/src/value.rs
+++ /dev/null
@@ -1,838 +0,0 @@
-use crate::base::coerce_compare;
-use crate::base::shape::{Column, InlineShape};
-use crate::primitive::style_primitive;
-use bigdecimal::Signed;
-use chrono::{DateTime, NaiveDate, Utc};
-use nu_errors::ShellError;
-use nu_protocol::hir::Operator;
-use nu_protocol::ShellTypeName;
-use nu_protocol::{Primitive, Type, UntaggedValue};
-use nu_source::{DebugDocBuilder, PrettyDebug, Span, Tagged};
-use nu_table::TextStyle;
-use num_bigint::BigInt;
-use num_bigint::ToBigInt;
-use num_traits::{ToPrimitive, Zero};
-use std::collections::HashMap;
-
-pub struct Date;
-
-impl Date {
-    pub fn from_regular_str(s: Tagged<&str>) -> Result<UntaggedValue, ShellError> {
-        let date = DateTime::parse_from_rfc3339(s.item).map_err(|err| {
-            ShellError::labeled_error(
-                &format!("Date parse error: {}", err),
-                "original value",
-                s.tag,
-            )
-        })?;
-
-        let date = date.with_timezone(&chrono::offset::Utc);
-
-        Ok(UntaggedValue::Primitive(Primitive::Date(date.into())))
-    }
-
-    pub fn naive_from_str(s: Tagged<&str>) -> Result<UntaggedValue, ShellError> {
-        let date = NaiveDate::parse_from_str(s.item, "%Y-%m-%d").map_err(|reason| {
-            ShellError::labeled_error(
-                &format!("Date parse error: {}", reason),
-                "original value",
-                s.tag,
-            )
-        })?;
-
-        Ok(UntaggedValue::Primitive(Primitive::Date(
-            DateTime::<Utc>::from_utc(date.and_hms(12, 34, 56), Utc).into(),
-        )))
-    }
-}
-
-pub fn date_from_str(s: Tagged<&str>) -> Result<UntaggedValue, ShellError> {
-    Date::from_regular_str(s)
-}
-
-pub fn date_naive_from_str(s: Tagged<&str>) -> Result<UntaggedValue, ShellError> {
-    Date::naive_from_str(s)
-}
-
-pub fn merge_values(
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    match (left, right) {
-        (UntaggedValue::Row(columns), UntaggedValue::Row(columns_b)) => {
-            Ok(UntaggedValue::Row(columns.merge_from(columns_b)))
-        }
-        (left, right) => Err((left.type_name(), right.type_name())),
-    }
-}
-
-fn zero_division_error() -> UntaggedValue {
-    UntaggedValue::Error(ShellError::untagged_runtime_error("division by zero"))
-}
-
-pub fn unsafe_compute_values(
-    operator: Operator,
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    let computed = compute_values(operator, left, right);
-
-    if computed.is_ok() {
-        return computed;
-    }
-
-    match (left, right) {
-        (UntaggedValue::Primitive(lhs), UntaggedValue::Primitive(rhs)) => match (lhs, rhs) {
-            (Primitive::Filesize(x), Primitive::Int(y)) => match operator {
-                Operator::Multiply => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(x * *y as u64)))
-                }
-                Operator::Divide => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(x / *y as u64)))
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Int(x), Primitive::Filesize(y)) => match operator {
-                Operator::Multiply => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(*x as u64 * y)))
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            _ => Err((left.type_name(), right.type_name())),
-        },
-        _ => Err((left.type_name(), right.type_name())),
-    }
-}
-
-pub fn compute_values(
-    operator: Operator,
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    match (left, right) {
-        (UntaggedValue::Primitive(lhs), UntaggedValue::Primitive(rhs)) => match (lhs, rhs) {
-            (Primitive::Filesize(x), Primitive::Filesize(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + y),
-                    Operator::Minus => Ok(x - y),
-                    Operator::Multiply => Ok(x * y),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            Err((left.type_name(), right.type_name()))
-                        } else {
-                            Ok(x / y)
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Filesize(result)))
-            }
-            (Primitive::Filesize(x), Primitive::Int(y)) => match operator {
-                // Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::Filesize(x + *y as u64))),
-                // Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::Filesize(x - *y as u64))),
-                Operator::Multiply => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(x * *y as u64)))
-                }
-                Operator::Divide => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(x / *y as u64)))
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Int(x), Primitive::Filesize(y)) => match operator {
-                // Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::Filesize(*x as u64 + y))),
-                // Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::Filesize(*x as u64 - y))),
-                Operator::Multiply => {
-                    Ok(UntaggedValue::Primitive(Primitive::Filesize(*x as u64 * y)))
-                }
-                // Operator::Divide => {
-                //     Ok(UntaggedValue::Primitive(Primitive::Filesize(*x as u64 / y)))
-                // }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Int(x), Primitive::Int(y)) => match operator {
-                Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::Int(x + y))),
-                Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::Int(x - y))),
-                Operator::Multiply => Ok(UntaggedValue::Primitive(Primitive::Int(x * y))),
-                Operator::Divide => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else if x - (y * (x / y)) == 0 {
-                        Ok(UntaggedValue::Primitive(Primitive::Int(x / y)))
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::Decimal(
-                            bigdecimal::BigDecimal::from(*x) / bigdecimal::BigDecimal::from(*y),
-                        )))
-                    }
-                }
-                Operator::Modulo => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::Int(x % y)))
-                    }
-                }
-                Operator::Pow => {
-                    let prim_u32 = ToPrimitive::to_u32(y);
-
-                    let sign = match x.is_negative() {
-                        true => -1,
-                        false => 1,
-                    };
-
-                    if !y.is_negative() {
-                        match prim_u32 {
-                            Some(num) => Ok(UntaggedValue::Primitive(Primitive::Int(
-                                sign * (x.pow(num)),
-                            ))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    } else {
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-
-                        match pow {
-                            Some(p) => Ok(UntaggedValue::Primitive(Primitive::Decimal(p))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Int(x), Primitive::BigInt(y)) => match operator {
-                Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    BigInt::from(*x) + y,
-                ))),
-                Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    BigInt::from(*x) - y,
-                ))),
-                Operator::Multiply => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    BigInt::from(*x) * y,
-                ))),
-                Operator::Divide => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else if x - (y * (x / y)) == BigInt::from(0) {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                            BigInt::from(*x) / y,
-                        )))
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::Decimal(
-                            bigdecimal::BigDecimal::from(*x)
-                                / bigdecimal::BigDecimal::from(y.clone()),
-                        )))
-                    }
-                }
-                Operator::Modulo => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(x % y)))
-                    }
-                }
-                Operator::Pow => {
-                    let prim_u32 = ToPrimitive::to_u32(y);
-
-                    let sign = match x.is_negative() {
-                        true => -1,
-                        false => 1,
-                    };
-
-                    if !y.is_negative() {
-                        match prim_u32 {
-                            Some(num) => Ok(UntaggedValue::Primitive(Primitive::Int(
-                                sign * (x.pow(num)),
-                            ))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    } else {
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(UntaggedValue::Primitive(Primitive::Decimal(p))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::BigInt(x), Primitive::Int(y)) => match operator {
-                Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    x + BigInt::from(*y),
-                ))),
-                Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    x - BigInt::from(*y),
-                ))),
-                Operator::Multiply => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                    x * BigInt::from(*y),
-                ))),
-                Operator::Divide => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else if x - (y * (x / y)) == BigInt::from(0) {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                            x / BigInt::from(*y),
-                        )))
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::Decimal(
-                            bigdecimal::BigDecimal::from(x.clone())
-                                / bigdecimal::BigDecimal::from(*y),
-                        )))
-                    }
-                }
-                Operator::Modulo => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(x % y)))
-                    }
-                }
-                Operator::Pow => {
-                    let prim_u32 = ToPrimitive::to_u32(y);
-
-                    let sign = match x.is_negative() {
-                        true => -1,
-                        false => 1,
-                    };
-
-                    if !y.is_negative() {
-                        match prim_u32 {
-                            Some(num) => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                                (sign.to_bigint().unwrap_or_default()) * x.pow(num),
-                            ))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    } else {
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow = bigdecimal::FromPrimitive::from_f64((sign as f64) * xp.powf(yp));
-                        match pow {
-                            Some(p) => Ok(UntaggedValue::Primitive(Primitive::Decimal(p))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::BigInt(x), Primitive::BigInt(y)) => match operator {
-                Operator::Plus => Ok(UntaggedValue::Primitive(Primitive::BigInt(x + y))),
-                Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::BigInt(x - y))),
-                Operator::Multiply => Ok(UntaggedValue::Primitive(Primitive::BigInt(x * y))),
-                Operator::Divide => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else if x - (y * (x / y)) == BigInt::from(0) {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(x / y)))
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::Decimal(
-                            bigdecimal::BigDecimal::from(x.clone())
-                                / bigdecimal::BigDecimal::from(y.clone()),
-                        )))
-                    }
-                }
-                Operator::Modulo => {
-                    if y.is_zero() {
-                        Ok(zero_division_error())
-                    } else {
-                        Ok(UntaggedValue::Primitive(Primitive::BigInt(x % y)))
-                    }
-                }
-                Operator::Pow => {
-                    let prim_u32 = ToPrimitive::to_u32(y);
-
-                    let sign = match x.is_negative() {
-                        true => -1,
-                        false => 1,
-                    };
-
-                    if !y.is_negative() {
-                        match prim_u32 {
-                            Some(num) => Ok(UntaggedValue::Primitive(Primitive::BigInt(
-                                (sign.to_bigint().unwrap_or_default()).pow(num),
-                            ))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    } else {
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-
-                        match pow {
-                            Some(p) => Ok(UntaggedValue::Primitive(Primitive::Decimal(p))),
-                            _ => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                }
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Decimal(x), Primitive::Int(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + bigdecimal::BigDecimal::from(*y)),
-                    Operator::Minus => Ok(x - bigdecimal::BigDecimal::from(*y)),
-                    Operator::Multiply => Ok(x * bigdecimal::BigDecimal::from(*y)),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x / bigdecimal::BigDecimal::from(*y))
-                    }
-                    Operator::Modulo => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x % bigdecimal::BigDecimal::from(*y))
-                    }
-
-                    Operator::Pow => {
-                        let sign = match x.is_negative() {
-                            true => -1,
-                            false => 1,
-                        };
-
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(p),
-                            None => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result)))
-            }
-            (Primitive::Int(x), Primitive::Decimal(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(bigdecimal::BigDecimal::from(*x) + y),
-                    Operator::Minus => Ok(bigdecimal::BigDecimal::from(*x) - y),
-                    Operator::Multiply => Ok(bigdecimal::BigDecimal::from(*x) * y),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(bigdecimal::BigDecimal::from(*x) / y)
-                    }
-                    Operator::Modulo => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(bigdecimal::BigDecimal::from(*x) % y)
-                    }
-
-                    Operator::Pow => {
-                        let sign = match x.is_negative() {
-                            true => -1,
-                            false => 1,
-                        };
-
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(p),
-                            None => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result)))
-            }
-            (Primitive::Decimal(x), Primitive::BigInt(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + bigdecimal::BigDecimal::from(y.clone())),
-                    Operator::Minus => Ok(x - bigdecimal::BigDecimal::from(y.clone())),
-                    Operator::Multiply => Ok(x * bigdecimal::BigDecimal::from(y.clone())),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x / bigdecimal::BigDecimal::from(y.clone()))
-                    }
-                    Operator::Modulo => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x % bigdecimal::BigDecimal::from(y.clone()))
-                    }
-
-                    Operator::Pow => {
-                        let sign = match x.is_negative() {
-                            true => -1,
-                            false => 1,
-                        };
-
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(p),
-                            None => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result)))
-            }
-            (Primitive::BigInt(x), Primitive::Decimal(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(bigdecimal::BigDecimal::from(x.clone()) + y),
-                    Operator::Minus => Ok(bigdecimal::BigDecimal::from(x.clone()) - y),
-                    Operator::Multiply => Ok(bigdecimal::BigDecimal::from(x.clone()) * y),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(bigdecimal::BigDecimal::from(x.clone()) / y)
-                    }
-                    Operator::Modulo => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(bigdecimal::BigDecimal::from(x.clone()) % y)
-                    }
-
-                    Operator::Pow => {
-                        let sign = match x.is_negative() {
-                            true => -1,
-                            false => 1,
-                        };
-
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(p),
-                            None => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result)))
-            }
-            (Primitive::Decimal(x), Primitive::Decimal(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + y),
-                    Operator::Minus => Ok(x - y),
-                    Operator::Multiply => Ok(x * y),
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x / y)
-                    }
-                    Operator::Modulo => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-                        Ok(x % y)
-                    }
-
-                    Operator::Pow => {
-                        let sign = match x.is_negative() {
-                            true => -1,
-                            false => 1,
-                        };
-
-                        let yp = bigdecimal::ToPrimitive::to_f64(y).unwrap_or(0.0);
-                        let xp = bigdecimal::ToPrimitive::to_f64(x).unwrap_or(0.0);
-                        let pow =
-                            bigdecimal::FromPrimitive::from_f64((sign as f64) * (xp.powf(yp)));
-                        match pow {
-                            Some(p) => Ok(p),
-                            None => Err((left.type_name(), right.type_name())),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Decimal(result)))
-            }
-            (Primitive::Date(x), Primitive::Date(y)) => match operator {
-                Operator::Minus => Ok(UntaggedValue::Primitive(Primitive::from(
-                    x.signed_duration_since(*y),
-                ))),
-                _ => Err((left.type_name(), right.type_name())),
-            },
-            (Primitive::Date(x), Primitive::Duration(_)) => {
-                let result = match operator {
-                    Operator::Plus => {
-                        // FIXME: Not sure if I could do something better with the Span.
-                        match Primitive::into_chrono_duration(rhs.clone(), Span::unknown()) {
-                            Ok(y) => match x.checked_add_signed(y) {
-                                Some(value) => Ok(value),
-                                None => Err(("Date", "Duration and date addition overflow")),
-                            },
-                            Err(_) => Err(("Date", "Duration overflow")),
-                        }
-                    }
-                    Operator::Minus => {
-                        match Primitive::into_chrono_duration(rhs.clone(), Span::unknown()) {
-                            Ok(y) => match x.checked_sub_signed(y) {
-                                Some(value) => Ok(value),
-                                None => Err(("Date", "Duration and date addition overflow")),
-                            },
-                            Err(_) => Err(("Date", "Duration overflow")),
-                        }
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-                Ok(UntaggedValue::Primitive(Primitive::Date(result)))
-            }
-            (Primitive::Duration(x), Primitive::Duration(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + y),
-                    Operator::Minus => Ok(x - y),
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-
-                Ok(UntaggedValue::Primitive(Primitive::Duration(result)))
-            }
-            (Primitive::Int(x), Primitive::Duration(y)) => {
-                let result = match operator {
-                    Operator::Plus => Ok(x + y),
-                    Operator::Minus => Ok(x - y),
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-
-                Ok(UntaggedValue::Primitive(Primitive::Duration(result)))
-            }
-            (Primitive::Duration(x), Primitive::Decimal(y)) => {
-                let result = match operator {
-                    Operator::Divide => {
-                        if y.is_zero() {
-                            return Ok(zero_division_error());
-                        }
-
-                        let y = y.as_bigint_and_exponent();
-                        Ok(x / y.0)
-                    }
-                    _ => Err((left.type_name(), right.type_name())),
-                }?;
-
-                Ok(UntaggedValue::Primitive(Primitive::Duration(result)))
-            }
-            (Primitive::String(x), Primitive::String(y)) => {
-                let mut new_string = x.clone();
-                new_string.push_str(y);
-                Ok(UntaggedValue::Primitive(Primitive::String(new_string)))
-            }
-            _ => Err((left.type_name(), right.type_name())),
-        },
-        _ => Err((left.type_name(), right.type_name())),
-    }
-}
-
-/// If left is {{ Operator }} right
-pub fn compare_values(
-    operator: Operator,
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<bool, (&'static str, &'static str)> {
-    let coerced = coerce_compare(left, right)?;
-    let ordering = coerced.compare();
-
-    use std::cmp::Ordering;
-
-    let result = matches!(
-        (operator, ordering),
-        (Operator::Equal, Ordering::Equal)
-            | (Operator::GreaterThan, Ordering::Greater)
-            | (Operator::GreaterThanOrEqual, Ordering::Greater)
-            | (Operator::GreaterThanOrEqual, Ordering::Equal)
-            | (Operator::LessThan, Ordering::Less)
-            | (Operator::LessThanOrEqual, Ordering::Less)
-            | (Operator::LessThanOrEqual, Ordering::Equal)
-            | (Operator::NotEqual, Ordering::Greater)
-            | (Operator::NotEqual, Ordering::Less)
-    );
-
-    Ok(result)
-}
-
-pub fn plain_type<'a>(value: impl Into<&'a UntaggedValue>, width: usize) -> String {
-    Type::from_value(value.into()).plain_string(width)
-}
-
-pub fn format_type<'a>(value: impl Into<&'a UntaggedValue>, width: usize) -> String {
-    Type::from_value(value.into()).colored_string(width)
-}
-
-pub fn format_leaf<'a>(value: impl Into<&'a UntaggedValue>) -> DebugDocBuilder {
-    InlineShape::from_value(value.into()).format().pretty()
-}
-
-pub fn style_leaf<'a>(
-    value: impl Into<&'a UntaggedValue>,
-    color_hash_map: &HashMap<String, nu_ansi_term::Style>,
-) -> TextStyle {
-    match value.into() {
-        UntaggedValue::Primitive(p) => {
-            // This is just to return the name of the type so that style_primitive
-            // can work on a string versus a type like String("some_text")
-            let str: &str = &p.to_string();
-            let str_len = str.len();
-            let paren_index = str.find('(').unwrap_or(str_len - 1);
-            let prim_type = str[0..paren_index].to_string();
-            style_primitive(&prim_type, color_hash_map)
-        }
-        _ => TextStyle::basic_left(),
-    }
-}
-
-pub fn format_for_column<'a>(
-    value: impl Into<&'a UntaggedValue>,
-    column: impl Into<Column>,
-) -> DebugDocBuilder {
-    InlineShape::from_value(value.into())
-        .format_for_column(column)
-        .pretty()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Date as d;
-    use super::UntaggedValue as v;
-    use super::{compute_values, merge_values};
-    use nu_protocol::hir::Operator;
-    use nu_protocol::{Primitive, UntaggedValue};
-    use nu_source::TaggedItem;
-
-    use indexmap::indexmap;
-
-    #[test]
-    fn merges_tables() {
-        let (author_1_date, author_2_date) = (
-            "2020-04-29".to_string().tagged_unknown(),
-            "2019-10-10".to_string().tagged_unknown(),
-        );
-
-        let table_author_row = v::row(indexmap! {
-            "name".into() => v::string("Andrés").into_untagged_value(),
-            "country".into() => v::string("EC").into_untagged_value(),
-            "date".into() => d::naive_from_str(author_1_date.borrow_tagged()).unwrap().into_untagged_value()
-        });
-
-        let other_table_author_row = v::row(indexmap! {
-            "name".into() => v::string("YK").into_untagged_value(),
-            "country".into() => v::string("US").into_untagged_value(),
-            "date".into() => d::naive_from_str(author_2_date.borrow_tagged()).unwrap().into_untagged_value()
-        });
-
-        assert_eq!(
-            other_table_author_row,
-            merge_values(&table_author_row, &other_table_author_row).unwrap()
-        );
-    }
-
-    #[test]
-    fn pow_operator_negatives_and_decimals() {
-        // test 2 ** 2
-        let result_one = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-        );
-
-        assert_eq!(
-            result_one.unwrap(),
-            UntaggedValue::Primitive(Primitive::Int(4))
-        );
-
-        // test 2 ** 2.0
-        let rhs_decimal = bigdecimal::FromPrimitive::from_f64(2.0).unwrap();
-
-        let result_two = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-            &UntaggedValue::Primitive(Primitive::Decimal(rhs_decimal)),
-        );
-
-        let should_equal_four_decimal = bigdecimal::FromPrimitive::from_f64(4.0).unwrap();
-
-        assert_eq!(
-            result_two.unwrap(),
-            UntaggedValue::Primitive(Primitive::Decimal(should_equal_four_decimal))
-        );
-
-        // test 2.0 ** 2.0
-        let rhs_decimal = bigdecimal::FromPrimitive::from_f64(2.0).unwrap();
-        let lhs_decimal = bigdecimal::FromPrimitive::from_f64(2.0).unwrap();
-        let should_equal_four_decimal = bigdecimal::FromPrimitive::from_f64(4.0).unwrap();
-
-        let result_three = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Decimal(lhs_decimal)),
-            &UntaggedValue::Primitive(Primitive::Decimal(rhs_decimal)),
-        );
-
-        assert_eq!(
-            result_three.unwrap(),
-            UntaggedValue::Primitive(Primitive::Decimal(should_equal_four_decimal))
-        );
-
-        // test 2 ** -2
-        let result_four = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-            &UntaggedValue::Primitive(Primitive::Int(-2)),
-        );
-
-        let should_equal_zero_decimal = bigdecimal::FromPrimitive::from_f64(0.25).unwrap();
-
-        assert_eq!(
-            result_four.unwrap(),
-            UntaggedValue::Primitive(Primitive::Decimal(should_equal_zero_decimal))
-        );
-
-        // test -2 ** -2
-        let result_five = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Int(-2)),
-            &UntaggedValue::Primitive(Primitive::Int(-2)),
-        );
-
-        let should_equal_neg_zero_decimal = bigdecimal::FromPrimitive::from_f64(-0.25).unwrap();
-
-        assert_eq!(
-            result_five.unwrap(),
-            UntaggedValue::Primitive(Primitive::Decimal(should_equal_neg_zero_decimal))
-        );
-
-        // test -2 ** 2
-        let result_six = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Int(-2)),
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-        );
-
-        assert_eq!(
-            result_six.unwrap(),
-            UntaggedValue::Primitive(Primitive::Int(-4))
-        );
-
-        // test -2.0 ** 2
-        let lhs_decimal = bigdecimal::FromPrimitive::from_f64(-2.0).unwrap();
-        let should_equal_neg_four_decimal = bigdecimal::FromPrimitive::from_f64(-4.0).unwrap();
-
-        let result_seven = compute_values(
-            Operator::Pow,
-            &UntaggedValue::Primitive(Primitive::Decimal(lhs_decimal)),
-            &UntaggedValue::Primitive(Primitive::Int(2)),
-        );
-
-        // Need to validate
-        assert_eq!(
-            result_seven.unwrap(),
-            UntaggedValue::Primitive(Primitive::Decimal(should_equal_neg_four_decimal))
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-engine/Cargo.toml b/old_nushell/crates/nu-engine/Cargo.toml
deleted file mode 100644
index 29f0adcff..000000000
--- a/old_nushell/crates/nu-engine/Cargo.toml
+++ /dev/null
@@ -1,59 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Core commands for nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-engine"
-version = "0.43.0"
-
-[dependencies]
-nu-data = { version = "0.43.0", path="../nu-data" }
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-parser = { version = "0.43.0", path="../nu-parser" }
-nu-plugin = { version = "0.43.0", path="../nu-plugin" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-stream = { version = "0.43.0", path="../nu-stream" }
-nu-value-ext = { version = "0.43.0", path="../nu-value-ext" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-
-trash = { version = "2.0.2", optional = true }
-which = { version="4.0.2", optional=true }
-codespan-reporting = "0.11.0"
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-bytes = "1.1.0"
-chrono = { version="0.4.19", features=["serde"] }
-derive-new = "0.5.8"
-dirs-next = "2.0.0"
-encoding_rs = "0.8.28"
-filesize = "0.2.0"
-fs_extra = "1.2.0"
-getset = "0.1.1"
-glob = "0.3.0"
-indexmap = { version="1.6.1", features=["serde-1"] }
-itertools = "0.10.0"
-lazy_static = "1.*"
-log = "0.4.14"
-num-bigint = { version="0.4.3", features=["serde"] }
-parking_lot = "0.11.1"
-rayon = "1.5.0"
-serde = { version="1.0.123", features=["derive"] }
-serde_json = "1.0.61"
-tempfile = "3.2.0"
-term_size = "0.3.2"
-termcolor = "1.1.2"
-
-[target.'cfg(unix)'.dependencies]
-umask = "1.0.0"
-users = "0.11.0"
-
-[dev-dependencies]
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-hamcrest2 = "0.3.0"
-
-[features]
-rustyline-support = []
-trash-support = ["trash"]
-dataframe = ["nu-protocol/dataframe"]
diff --git a/old_nushell/crates/nu-engine/README.md b/old_nushell/crates/nu-engine/README.md
deleted file mode 100644
index 1d4fb0588..000000000
--- a/old_nushell/crates/nu-engine/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Nu-Engine
-
-Nu-engine handles most of the core logic of nushell. For example, engine handles:
-
-- Passing of data between commands
-- Evaluating a commands return values
-- Loading of user configurations
-
-## Top level introduction
-The following topics shall give the reader a top level understanding how various topics are handled in nushell.
-
-### How are environment variables handled?
-Environment variables (or short envs) are stored in the `Scope` of the `EvaluationContext`. That means that environment variables are scoped by default and we don't use `std::env` to store envs (but make exceptions where convenient).
-
-Nushell handles environment variables and their lifetime the following:
-- At startup all existing environment variables are read and put into `Scope`. (Nushell reads existing environment variables platform independent by asking the `Host`. They will most likely come from `std::env::*`)
-- Envs can also be loaded from config files. Each loaded config produces a new `ScopeFrame` with the envs of the loaded config.
-- Nu-Script files and internal commands read and write env variables from / to the `Scope`. External scripts and binaries can't interact with the `Scope`. Therefore all env variables are read from the `Scope` and put into the external binaries environment-variables-memory area.
diff --git a/old_nushell/crates/nu-engine/src/call_info.rs b/old_nushell/crates/nu-engine/src/call_info.rs
deleted file mode 100644
index d6822017a..000000000
--- a/old_nushell/crates/nu-engine/src/call_info.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use crate::evaluate::evaluate_args::evaluate_args;
-use crate::evaluation_context::EvaluationContext;
-use nu_errors::ShellError;
-use nu_protocol::hir;
-use nu_protocol::CallInfo;
-use nu_source::Tag;
-
-#[derive(Debug, Clone)]
-pub struct UnevaluatedCallInfo {
-    pub args: hir::Call,
-    pub name_tag: Tag,
-}
-
-impl UnevaluatedCallInfo {
-    pub fn evaluate(self, ctx: &EvaluationContext) -> Result<CallInfo, ShellError> {
-        let args = evaluate_args(&self.args, ctx)?;
-
-        Ok(CallInfo {
-            args,
-            name_tag: self.name_tag,
-        })
-    }
-
-    pub fn switch_present(&self, switch: &str) -> bool {
-        self.args.switch_preset(switch)
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/command_args.rs b/old_nushell/crates/nu-engine/src/command_args.rs
deleted file mode 100644
index 124ef557e..000000000
--- a/old_nushell/crates/nu-engine/src/command_args.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use crate::evaluate::scope::Scope;
-use crate::evaluation_context::EvaluationContext;
-use crate::shell::shell_manager::ShellManager;
-use crate::FromValue;
-use crate::{call_info::UnevaluatedCallInfo, config_holder::ConfigHolder};
-use crate::{env::host::Host, evaluate_baseline_expr};
-use getset::Getters;
-use nu_errors::ShellError;
-use nu_protocol::hir::SpannedExpression;
-use nu_source::Tag;
-use nu_stream::InputStream;
-use parking_lot::Mutex;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-#[derive(Getters)]
-#[get = "pub"]
-pub struct CommandArgs {
-    pub context: EvaluationContext,
-    pub call_info: UnevaluatedCallInfo,
-    pub input: InputStream,
-}
-
-impl CommandArgs {
-    pub fn scope(&self) -> &Scope {
-        &self.context.scope
-    }
-
-    pub fn host(&self) -> Arc<parking_lot::Mutex<Box<dyn Host>>> {
-        self.context.host().clone()
-    }
-
-    pub fn current_errors(&self) -> Arc<Mutex<Vec<ShellError>>> {
-        self.context.current_errors().clone()
-    }
-
-    pub fn ctrl_c(&self) -> Arc<AtomicBool> {
-        self.context.ctrl_c().clone()
-    }
-
-    pub fn configs(&self) -> Arc<Mutex<ConfigHolder>> {
-        self.context.configs().clone()
-    }
-
-    pub fn shell_manager(&self) -> ShellManager {
-        self.context.shell_manager().clone()
-    }
-
-    pub fn nth(&self, pos: usize) -> Option<&SpannedExpression> {
-        if let Some(positional) = &self.call_info.args.positional {
-            positional.get(pos)
-        } else {
-            None
-        }
-    }
-
-    pub fn req<T: FromValue>(&self, pos: usize) -> Result<T, ShellError> {
-        if let Some(expr) = self.nth(pos) {
-            let result = evaluate_baseline_expr(expr, &self.context)?;
-            FromValue::from_value(&result)
-        } else {
-            Err(ShellError::labeled_error(
-                "Position beyond end of command arguments",
-                "can't access beyond end of command arguments",
-                self.call_info.name_tag.span,
-            ))
-        }
-    }
-
-    pub fn req_named<T: FromValue>(&self, name: &str) -> Result<T, ShellError> {
-        match self.get_flag(name)? {
-            Some(v) => Ok(v),
-            None => Err(ShellError::labeled_error(
-                "Missing flag",
-                format!("expected {} flag", name),
-                &self.call_info.name_tag,
-            )),
-        }
-    }
-
-    pub fn has_flag(&self, name: &str) -> bool {
-        self.call_info.args.switch_preset(name)
-    }
-
-    pub fn get_flag<T: FromValue>(&self, name: &str) -> Result<Option<T>, ShellError> {
-        if let Some(expr) = self.call_info.args.get_flag(name) {
-            let result = evaluate_baseline_expr(expr, &self.context)?;
-            FromValue::from_value(&result).map(Some)
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn opt<T: FromValue>(&self, pos: usize) -> Result<Option<T>, ShellError> {
-        if let Some(expr) = self.nth(pos) {
-            let result = evaluate_baseline_expr(expr, &self.context)?;
-            FromValue::from_value(&result).map(Some)
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn rest<T: FromValue>(&self, starting_pos: usize) -> Result<Vec<T>, ShellError> {
-        let mut output = vec![];
-
-        if let Some(positional) = &self.call_info.args.positional {
-            for expr in positional.iter().skip(starting_pos) {
-                let result = evaluate_baseline_expr(expr, &self.context)?;
-                output.push(FromValue::from_value(&result)?);
-            }
-        }
-
-        Ok(output)
-    }
-
-    pub fn rest_with_minimum<T: FromValue>(
-        &self,
-        pos: usize,
-        count: usize,
-    ) -> Result<Vec<T>, ShellError> {
-        let mut output = vec![];
-        for i in pos..pos + count {
-            output.push(self.req(i)?);
-        }
-        output.extend(self.rest(pos + count)?);
-
-        Ok(output)
-    }
-
-    pub fn name_tag(&self) -> Tag {
-        self.call_info.name_tag.clone()
-    }
-}
-
-pub type RunnableContext = CommandArgs;
-
-impl std::fmt::Debug for CommandArgs {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.call_info.fmt(f)
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/config_holder.rs b/old_nushell/crates/nu-engine/src/config_holder.rs
deleted file mode 100644
index 388460859..000000000
--- a/old_nushell/crates/nu-engine/src/config_holder.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use crate::shell::palette::ThemedPalette;
-use nu_data::config::NuConfig;
-use nu_protocol::ConfigPath;
-use std::path::Path;
-
-/// ConfigHolder holds information which configs have been loaded.
-#[derive(Clone)]
-pub struct ConfigHolder {
-    pub global_config: Option<NuConfig>,
-    pub local_configs: Vec<NuConfig>,
-    pub syntax_config: Option<ThemedPalette>,
-}
-
-impl Default for ConfigHolder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ConfigHolder {
-    pub fn new() -> ConfigHolder {
-        ConfigHolder {
-            global_config: None,
-            local_configs: vec![],
-            syntax_config: None,
-        }
-    }
-
-    pub fn global_config(&self) -> NuConfig {
-        match &self.global_config {
-            Some(config) => config.clone(),
-            None => NuConfig::default(),
-        }
-    }
-
-    pub fn syntax_colors(&self) -> ThemedPalette {
-        match &self.syntax_config {
-            Some(cfg) => cfg.clone(),
-            None => ThemedPalette::default(),
-        }
-    }
-
-    pub fn add_local_cfg(&mut self, cfg: NuConfig) {
-        self.local_configs.push(cfg);
-    }
-
-    pub fn set_global_cfg(&mut self, cfg: NuConfig) {
-        self.global_config = Some(cfg);
-    }
-
-    pub fn set_syntax_colors(&mut self, cfg: ThemedPalette) {
-        self.syntax_config = Some(cfg);
-    }
-
-    pub fn remove_cfg(&mut self, cfg_path: &ConfigPath) {
-        match cfg_path {
-            ConfigPath::Global(_) => self.global_config = None,
-            ConfigPath::Local(p) => self.remove_local_cfg(p),
-        }
-    }
-
-    fn remove_local_cfg<P: AsRef<Path>>(&mut self, cfg_path: P) {
-        // Remove the first loaded local config with specified cfg_path
-        if let Some(index) = self
-            .local_configs
-            .iter()
-            .rev()
-            .position(|cfg| cfg.file_path == cfg_path.as_ref())
-        {
-            self.local_configs.remove(index);
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/documentation.rs b/old_nushell/crates/nu-engine/src/documentation.rs
deleted file mode 100644
index bd8f1df74..000000000
--- a/old_nushell/crates/nu-engine/src/documentation.rs
+++ /dev/null
@@ -1,313 +0,0 @@
-use crate::evaluate::scope::Scope;
-use crate::whole_stream_command::WholeStreamCommand;
-use indexmap::IndexMap;
-use itertools::Itertools;
-use nu_protocol::{NamedType, PositionalType, Signature, UntaggedValue, Value};
-use nu_source::PrettyDebug;
-use std::collections::HashMap;
-
-const COMMANDS_DOCS_DIR: &str = "docs/commands";
-
-#[derive(Default)]
-pub struct DocumentationConfig {
-    no_subcommands: bool,
-    no_color: bool,
-    brief: bool,
-}
-
-fn generate_doc(name: &str, scope: &Scope) -> IndexMap<String, Value> {
-    let mut row_entries = IndexMap::new();
-    let command = scope
-        .get_command(name)
-        .unwrap_or_else(|| panic!("Expected command '{}' from names to be in registry", name));
-    row_entries.insert(
-        "name".to_owned(),
-        UntaggedValue::string(name).into_untagged_value(),
-    );
-    row_entries.insert(
-        "usage".to_owned(),
-        UntaggedValue::string(command.usage()).into_untagged_value(),
-    );
-    retrieve_doc_link(name).and_then(|link| {
-        row_entries.insert(
-            "doc_link".to_owned(),
-            UntaggedValue::string(link).into_untagged_value(),
-        )
-    });
-    row_entries.insert(
-        "documentation".to_owned(),
-        UntaggedValue::string(get_documentation(
-            command.stream_command(),
-            scope,
-            &DocumentationConfig {
-                no_subcommands: true,
-                no_color: true,
-                brief: false,
-            },
-        ))
-        .into_untagged_value(),
-    );
-    row_entries
-}
-
-// generate_docs gets the documentation from each command and returns a Table as output
-pub fn generate_docs(scope: &Scope) -> Value {
-    let mut sorted_names = scope.get_command_names();
-    sorted_names.sort();
-
-    // cmap will map parent commands to it's subcommands e.g. to -> [to csv, to yaml, to bson]
-    let mut cmap: HashMap<String, Vec<String>> = HashMap::new();
-    for name in &sorted_names {
-        if name.contains(' ') {
-            let split_name = name.split_whitespace().collect_vec();
-            let parent_name = split_name.first().expect("Expected a parent command name");
-            if cmap.contains_key(*parent_name) {
-                let sub_names = cmap
-                    .get_mut(*parent_name)
-                    .expect("Expected an entry for parent");
-                sub_names.push(name.to_owned());
-            }
-        } else {
-            cmap.insert(name.to_owned(), Vec::new());
-        };
-    }
-    // Return documentation for each command
-    // Sub-commands are nested under their respective parent commands
-    let mut table = Vec::new();
-    for name in &sorted_names {
-        // Must be a sub-command, skip since it's being handled underneath when we hit the parent command
-        if !cmap.contains_key(name) {
-            continue;
-        }
-        let mut row_entries = generate_doc(name, scope);
-        // Iterate over all the subcommands of the parent command
-        let mut sub_table = Vec::new();
-        for sub_name in cmap.get(name).unwrap_or(&Vec::new()) {
-            let sub_row = generate_doc(sub_name, scope);
-            sub_table.push(UntaggedValue::row(sub_row).into_untagged_value());
-        }
-
-        if !sub_table.is_empty() {
-            row_entries.insert(
-                "subcommands".to_owned(),
-                UntaggedValue::table(&sub_table).into_untagged_value(),
-            );
-        }
-        table.push(UntaggedValue::row(row_entries).into_untagged_value());
-    }
-    UntaggedValue::table(&table).into_untagged_value()
-}
-
-fn retrieve_doc_link(name: &str) -> Option<String> {
-    let doc_name = name.split_whitespace().join("_"); // Because .replace(" ", "_") didn't work
-    let mut entries =
-        std::fs::read_dir(COMMANDS_DOCS_DIR).expect("Directory for command docs are missing!");
-    entries.find_map(|r| {
-        r.map_or(None, |de| {
-            if de.file_name().to_string_lossy() == format!("{}.{}", &doc_name, "md") {
-                Some(format!("/commands/{}.{}", &doc_name, "html"))
-            } else {
-                None
-            }
-        })
-    })
-}
-
-#[allow(clippy::cognitive_complexity)]
-pub fn get_documentation(
-    cmd: &dyn WholeStreamCommand,
-    scope: &Scope,
-    config: &DocumentationConfig,
-) -> String {
-    let cmd_name = cmd.name();
-    let signature = cmd.signature();
-    let mut long_desc = String::new();
-
-    let usage = &cmd.usage();
-    if !usage.is_empty() {
-        long_desc.push_str(usage);
-        long_desc.push_str("\n\n");
-    }
-
-    let extra_usage = if config.brief { "" } else { &cmd.extra_usage() };
-    if !extra_usage.is_empty() {
-        long_desc.push_str(extra_usage);
-        long_desc.push_str("\n\n");
-    }
-
-    let mut subcommands = vec![];
-    if !config.no_subcommands {
-        for name in scope.get_command_names() {
-            if name.starts_with(&format!("{} ", cmd_name)) {
-                let subcommand = scope.get_command(&name).expect("This shouldn't happen");
-
-                subcommands.push(format!("  {} - {}", name, subcommand.usage()));
-            }
-        }
-    }
-
-    let mut one_liner = String::new();
-    one_liner.push_str(&signature.name);
-    one_liner.push(' ');
-
-    for positional in &signature.positional {
-        match &positional.0 {
-            PositionalType::Mandatory(name, _m) => {
-                one_liner.push_str(&format!("<{}> ", name));
-            }
-            PositionalType::Optional(name, _o) => {
-                one_liner.push_str(&format!("({}) ", name));
-            }
-        }
-    }
-
-    if signature.rest_positional.is_some() {
-        one_liner.push_str("...args ");
-    }
-
-    if !subcommands.is_empty() {
-        one_liner.push_str("<subcommand> ");
-    }
-
-    if !signature.named.is_empty() {
-        one_liner.push_str("{flags} ");
-    }
-
-    long_desc.push_str(&format!("Usage:\n  > {}\n", one_liner));
-
-    if !subcommands.is_empty() {
-        long_desc.push_str("\nSubcommands:\n");
-        subcommands.sort();
-        long_desc.push_str(&subcommands.join("\n"));
-        long_desc.push('\n');
-    }
-
-    if !signature.positional.is_empty() || signature.rest_positional.is_some() {
-        long_desc.push_str("\nParameters:\n");
-        for positional in &signature.positional {
-            match &positional.0 {
-                PositionalType::Mandatory(name, _m) => {
-                    long_desc.push_str(&format!("  <{}> {}\n", name, positional.1));
-                }
-                PositionalType::Optional(name, _o) => {
-                    long_desc.push_str(&format!("  ({}) {}\n", name, positional.1));
-                }
-            }
-        }
-
-        if let Some(rest_positional) = &signature.rest_positional {
-            long_desc.push_str(&format!("  ...args: {}\n", rest_positional.2));
-        }
-    }
-    if !signature.named.is_empty() {
-        long_desc.push_str(&get_flags_section(&signature))
-    }
-
-    let palette = crate::shell::palette::DefaultPalette {};
-    let examples = cmd.examples();
-    if !examples.is_empty() {
-        long_desc.push_str("\nExamples:");
-    }
-    for example in examples {
-        long_desc.push('\n');
-        long_desc.push_str("  ");
-        long_desc.push_str(example.description);
-
-        if config.no_color {
-            long_desc.push_str(&format!("\n  > {}\n", example.example));
-        } else {
-            let colored_example =
-                crate::shell::painter::Painter::paint_string(example.example, scope, &palette);
-            long_desc.push_str(&format!("\n  > {}\n", colored_example));
-        }
-    }
-
-    long_desc.push('\n');
-
-    long_desc
-}
-
-fn get_flags_section(signature: &Signature) -> String {
-    let mut long_desc = String::new();
-    long_desc.push_str("\nFlags:\n");
-    for (flag, ty) in &signature.named {
-        let msg = match ty.0 {
-            NamedType::Switch(s) => {
-                if let Some(c) = s {
-                    format!(
-                        "  -{}, --{}{} {}\n",
-                        c,
-                        flag,
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                } else {
-                    format!(
-                        "  --{}{} {}\n",
-                        flag,
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                }
-            }
-            NamedType::Mandatory(s, m) => {
-                if let Some(c) = s {
-                    format!(
-                        "  -{}, --{} <{}> (required parameter){} {}\n",
-                        c,
-                        flag,
-                        m.display(),
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                } else {
-                    format!(
-                        "  --{} <{}> (required parameter){} {}\n",
-                        flag,
-                        m.display(),
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                }
-            }
-            NamedType::Optional(s, o) => {
-                if let Some(c) = s {
-                    format!(
-                        "  -{}, --{} <{}>{} {}\n",
-                        c,
-                        flag,
-                        o.display(),
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                } else {
-                    format!(
-                        "  --{} <{}>{} {}\n",
-                        flag,
-                        o.display(),
-                        if !ty.1.is_empty() { ":" } else { "" },
-                        ty.1
-                    )
-                }
-            }
-        };
-        long_desc.push_str(&msg);
-    }
-    long_desc
-}
-
-pub fn get_brief_help(cmd: &dyn WholeStreamCommand, scope: &Scope) -> String {
-    get_documentation(
-        cmd,
-        scope,
-        &DocumentationConfig {
-            no_subcommands: false,
-            no_color: false,
-            brief: true,
-        },
-    )
-}
-
-pub fn get_full_help(cmd: &dyn WholeStreamCommand, scope: &Scope) -> String {
-    get_documentation(cmd, scope, &DocumentationConfig::default())
-}
diff --git a/old_nushell/crates/nu-engine/src/env/basic_host.rs b/old_nushell/crates/nu-engine/src/env/basic_host.rs
deleted file mode 100644
index 177558d34..000000000
--- a/old_nushell/crates/nu-engine/src/env/basic_host.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use crate::Host;
-use nu_errors::ShellError;
-use nu_protocol::{errln, outln};
-use nu_source::Text;
-use std::ffi::OsString;
-
-#[derive(Debug)]
-pub struct BasicHost;
-
-impl Host for BasicHost {
-    fn stdout(&mut self, out: &str) {
-        match out {
-            "\n" => outln!(""),
-            other => outln!("{}", other),
-        }
-    }
-
-    fn stderr(&mut self, out: &str) {
-        match out {
-            "\n" => errln!(""),
-            other => errln!("{}", other),
-        }
-    }
-
-    fn print_err(&mut self, err: ShellError, source: &Text) {
-        let diag = err.into_diagnostic();
-        let source = source.to_string();
-        let mut files = codespan_reporting::files::SimpleFiles::new();
-        files.add("shell", source);
-
-        let writer = termcolor::StandardStream::stderr(termcolor::ColorChoice::Auto);
-        let config = codespan_reporting::term::Config::default();
-
-        let _ = std::panic::catch_unwind(move || {
-            let _ = codespan_reporting::term::emit(&mut writer.lock(), &config, &files, &diag);
-        });
-    }
-
-    #[allow(unused_variables)]
-    fn vars(&self) -> Vec<(String, String)> {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            std::env::vars().collect::<Vec<_>>()
-        }
-
-        #[cfg(target_arch = "wasm32")]
-        {
-            vec![]
-        }
-    }
-
-    #[allow(unused_variables)]
-    fn env_get(&mut self, key: OsString) -> Option<OsString> {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            std::env::var_os(key)
-        }
-        #[cfg(target_arch = "wasm32")]
-        {
-            None
-        }
-    }
-
-    #[allow(unused_variables)]
-    fn env_set(&mut self, key: OsString, value: OsString) {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            std::env::set_var(key, value);
-        }
-    }
-
-    #[allow(unused_variables)]
-    fn env_rm(&mut self, key: OsString) {
-        #[cfg(not(target_arch = "wasm32"))]
-        {
-            std::env::remove_var(key);
-        }
-    }
-
-    fn width(&self) -> usize {
-        let (mut term_width, _) = term_size::dimensions().unwrap_or((80, 20));
-        term_width -= 1;
-        term_width
-    }
-
-    fn height(&self) -> usize {
-        let (_, term_height) = term_size::dimensions().unwrap_or((80, 20));
-        term_height
-    }
-
-    fn is_external_cmd(&self, #[allow(unused)] cmd_name: &str) -> bool {
-        #[cfg(any(target_arch = "wasm32", not(feature = "which")))]
-        {
-            true
-        }
-
-        #[cfg(all(unix, feature = "which"))]
-        {
-            which::which(cmd_name).is_ok()
-        }
-
-        #[cfg(all(windows, feature = "which"))]
-        {
-            if which::which(cmd_name).is_ok() {
-                true
-            } else {
-                // Reference: https://ss64.com/nt/syntax-internal.html
-                let cmd_builtins = [
-                    "assoc", "break", "color", "copy", "date", "del", "dir", "dpath", "echo",
-                    "erase", "for", "ftype", "md", "mkdir", "mklink", "move", "path", "ren",
-                    "rename", "rd", "rmdir", "start", "time", "title", "type", "ver", "verify",
-                    "vol",
-                ];
-
-                cmd_builtins.contains(&cmd_name)
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/env/host.rs b/old_nushell/crates/nu-engine/src/env/host.rs
deleted file mode 100644
index 0bc4ba710..000000000
--- a/old_nushell/crates/nu-engine/src/env/host.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_source::Text;
-use std::ffi::OsString;
-use std::fmt::Debug;
-
-use super::basic_host::BasicHost;
-
-pub trait Host: Debug + Send {
-    fn stdout(&mut self, out: &str);
-    fn stderr(&mut self, out: &str);
-    fn print_err(&mut self, err: ShellError, source: &Text);
-
-    fn vars(&self) -> Vec<(String, String)>;
-    fn env_get(&mut self, key: OsString) -> Option<OsString>;
-    fn env_set(&mut self, k: OsString, v: OsString);
-    fn env_rm(&mut self, k: OsString);
-
-    fn width(&self) -> usize;
-    fn height(&self) -> usize;
-
-    fn is_external_cmd(&self, cmd_name: &str) -> bool;
-}
-
-impl Default for Box<dyn Host> {
-    fn default() -> Self {
-        Box::new(BasicHost)
-    }
-}
-
-impl Host for Box<dyn Host> {
-    fn stdout(&mut self, out: &str) {
-        (**self).stdout(out)
-    }
-
-    fn stderr(&mut self, out: &str) {
-        (**self).stderr(out)
-    }
-
-    fn print_err(&mut self, err: ShellError, source: &Text) {
-        (**self).print_err(err, source)
-    }
-
-    fn vars(&self) -> Vec<(String, String)> {
-        (**self).vars()
-    }
-
-    fn env_get(&mut self, key: OsString) -> Option<OsString> {
-        (**self).env_get(key)
-    }
-
-    fn env_set(&mut self, key: OsString, value: OsString) {
-        (**self).env_set(key, value);
-    }
-
-    fn env_rm(&mut self, key: OsString) {
-        (**self).env_rm(key)
-    }
-
-    fn width(&self) -> usize {
-        (**self).width()
-    }
-
-    fn height(&self) -> usize {
-        (**self).height()
-    }
-
-    fn is_external_cmd(&self, name: &str) -> bool {
-        (**self).is_external_cmd(name)
-    }
-}
-
-#[derive(Debug)]
-pub struct FakeHost {
-    line_written: String,
-    env_vars: IndexMap<String, String>,
-}
-
-impl FakeHost {
-    pub fn new() -> FakeHost {
-        FakeHost {
-            line_written: String::from(""),
-            env_vars: IndexMap::default(),
-        }
-    }
-}
-
-impl Default for FakeHost {
-    fn default() -> Self {
-        FakeHost::new()
-    }
-}
-
-impl Host for FakeHost {
-    fn stdout(&mut self, out: &str) {
-        self.line_written = out.to_string();
-    }
-
-    fn stderr(&mut self, out: &str) {
-        self.line_written = out.to_string();
-    }
-
-    fn print_err(&mut self, err: ShellError, source: &Text) {
-        BasicHost {}.print_err(err, source);
-    }
-
-    fn vars(&self) -> Vec<(String, String)> {
-        self.env_vars
-            .iter()
-            .map(|(k, v)| (k.clone(), v.clone()))
-            .collect::<Vec<_>>()
-    }
-
-    fn env_get(&mut self, key: OsString) -> Option<OsString> {
-        let key = key.into_string().expect("Couldn't convert to string.");
-
-        self.env_vars.get(&key).map(OsString::from)
-    }
-
-    fn env_set(&mut self, key: OsString, value: OsString) {
-        self.env_vars.insert(
-            key.into_string().expect("Couldn't convert to string."),
-            value.into_string().expect("Couldn't convert to string."),
-        );
-    }
-
-    fn env_rm(&mut self, key: OsString) {
-        self.env_vars
-            .shift_remove(&key.into_string().expect("Couldn't convert to string."));
-    }
-
-    fn width(&self) -> usize {
-        1
-    }
-
-    fn height(&self) -> usize {
-        1
-    }
-
-    fn is_external_cmd(&self, _: &str) -> bool {
-        true
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/env/mod.rs b/old_nushell/crates/nu-engine/src/env/mod.rs
deleted file mode 100644
index 38a48cfe5..000000000
--- a/old_nushell/crates/nu-engine/src/env/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub(crate) mod basic_host;
-pub(crate) mod host;
diff --git a/old_nushell/crates/nu-engine/src/evaluate/block.rs b/old_nushell/crates/nu-engine/src/evaluate/block.rs
deleted file mode 100644
index 7607a6af5..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/block.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-use crate::evaluate::expr::run_expression_block;
-use crate::evaluate::internal::run_internal_command;
-use crate::evaluation_context::EvaluationContext;
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::hir::{
-    Block, Call, ClassifiedCommand, Expression, ExternalRedirection, Pipeline, SpannedExpression,
-    Synthetic,
-};
-use nu_protocol::{UntaggedValue, Value};
-use nu_source::{Span, Tag};
-use nu_stream::{InputStream, OutputStream};
-use std::sync::atomic::Ordering;
-
-pub fn run_block(
-    block: &Block,
-    ctx: &EvaluationContext,
-    mut input: InputStream,
-    external_redirection: ExternalRedirection,
-) -> Result<OutputStream, ShellError> {
-    let mut output: Result<InputStream, ShellError> = Ok(OutputStream::empty());
-    for definition in block.definitions.values() {
-        ctx.scope.add_definition(definition.clone());
-    }
-
-    let num_groups = block.block.len();
-    for (group_num, group) in block.block.iter().enumerate() {
-        let num_pipelines = group.pipelines.len();
-        for (pipeline_num, pipeline) in group.pipelines.iter().enumerate() {
-            match output {
-                Ok(inp) if inp.is_empty() => {}
-                Ok(inp) => {
-                    // Run autoview on the values we've seen so far
-                    // We may want to make this configurable for other kinds of hosting
-                    if let Some(autoview) = ctx.get_command("autoview") {
-                        let mut output_stream = match ctx.run_command(
-                            autoview,
-                            Tag::unknown(),
-                            Call::new(
-                                Box::new(SpannedExpression::new(
-                                    Expression::Synthetic(Synthetic::String("autoview".into())),
-                                    Span::unknown(),
-                                )),
-                                Span::unknown(),
-                            ),
-                            inp,
-                        ) {
-                            Ok(x) => x,
-                            Err(e) => {
-                                return Err(e);
-                            }
-                        };
-                        match output_stream.next() {
-                            Some(Value {
-                                value: UntaggedValue::Error(e),
-                                ..
-                            }) => {
-                                return Err(e);
-                            }
-                            Some(_item) => {
-                                if let Some(err) = ctx.get_errors().get(0) {
-                                    ctx.clear_errors();
-                                    return Err(err.clone());
-                                }
-                                if ctx.ctrl_c().load(Ordering::SeqCst) {
-                                    return Ok(InputStream::empty());
-                                }
-                            }
-                            None => {
-                                if let Some(err) = ctx.get_errors().get(0) {
-                                    ctx.clear_errors();
-                                    return Err(err.clone());
-                                }
-                            }
-                        }
-                    } else {
-                        let _: Vec<_> = inp.collect();
-                    }
-                }
-                Err(e) => {
-                    return Err(e);
-                }
-            }
-            output = Ok(OutputStream::empty());
-
-            match output {
-                Ok(inp) if inp.is_empty() => {}
-                Ok(mut output_stream) => {
-                    match output_stream.next() {
-                        Some(Value {
-                            value: UntaggedValue::Error(e),
-                            ..
-                        }) => {
-                            return Err(e);
-                        }
-                        Some(_item) => {
-                            if let Some(err) = ctx.get_errors().get(0) {
-                                ctx.clear_errors();
-                                return Err(err.clone());
-                            }
-                            if ctx.ctrl_c().load(Ordering::SeqCst) {
-                                // This early return doesn't return the result
-                                // we have so far, but breaking out of this loop
-                                // causes lifetime issues. A future contribution
-                                // could attempt to return the current output.
-                                // https://github.com/nushell/nushell/pull/2830#discussion_r550319687
-                                return Ok(InputStream::empty());
-                            }
-                        }
-                        None => {
-                            if let Some(err) = ctx.get_errors().get(0) {
-                                ctx.clear_errors();
-                                return Err(err.clone());
-                            }
-                        }
-                    }
-                }
-                Err(e) => {
-                    return Err(e);
-                }
-            }
-            output = if group_num == (num_groups - 1) && pipeline_num == (num_pipelines - 1) {
-                // we're at the end of the block, so use the given external redirection
-                run_pipeline(pipeline, ctx, input, external_redirection)
-            } else {
-                // otherwise, we're in the middle of the block, so use a default redirection
-                run_pipeline(pipeline, ctx, input, ExternalRedirection::None)
-            };
-
-            input = OutputStream::empty();
-        }
-    }
-
-    output
-}
-
-fn run_pipeline(
-    commands: &Pipeline,
-    ctx: &EvaluationContext,
-    mut input: InputStream,
-    external_redirection: ExternalRedirection,
-) -> Result<OutputStream, ShellError> {
-    let num_commands = commands.list.len();
-    for (command_num, command) in commands.list.iter().enumerate() {
-        input = match command {
-            ClassifiedCommand::Dynamic(call) => {
-                let mut args = vec![];
-                if let Some(positional) = &call.positional {
-                    for pos in positional {
-                        let result = run_expression_block(pos, ctx)?.into_vec();
-                        args.push(result);
-                    }
-                }
-
-                let block = run_expression_block(&call.head, ctx)?.into_vec();
-
-                if block.len() != 1 {
-                    return Err(ShellError::labeled_error(
-                        "Dynamic commands must start with a block",
-                        "needs to be a block",
-                        call.head.span,
-                    ));
-                }
-
-                match &block[0].value {
-                    UntaggedValue::Block(captured_block) => {
-                        ctx.scope.enter_scope();
-                        ctx.scope.add_vars(&captured_block.captured.entries);
-                        for (param, value) in
-                            captured_block.block.params.positional.iter().zip(&args)
-                        {
-                            ctx.scope.add_var(param.0.name(), value[0].clone());
-                        }
-
-                        let result =
-                            run_block(&captured_block.block, ctx, input, external_redirection);
-                        ctx.scope.exit_scope();
-
-                        result?
-                    }
-                    _ => {
-                        return Err(ShellError::labeled_error("Dynamic commands must start with a block (or variable pointing to a block)", "needs to be a block", call.head.span));
-                    }
-                }
-            }
-
-            ClassifiedCommand::Expr(expr) => run_expression_block(expr, ctx)?,
-
-            ClassifiedCommand::Error(err) => return Err(err.clone().into()),
-
-            ClassifiedCommand::Internal(left) => {
-                if command_num == (num_commands - 1) {
-                    let mut left = left.clone();
-                    left.args.external_redirection = external_redirection;
-                    run_internal_command(&left, ctx, input)?
-                } else {
-                    run_internal_command(left, ctx, input)?
-                }
-            }
-        };
-    }
-
-    Ok(input)
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/envvar.rs b/old_nushell/crates/nu-engine/src/evaluate/envvar.rs
deleted file mode 100644
index 068f204b0..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/envvar.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::convert::TryFrom;
-
-use nu_errors::ShellError;
-use nu_protocol::{SpannedTypeName, Value};
-
-#[derive(Debug, Clone)]
-pub enum EnvVar {
-    Proper(String),
-    Nothing,
-}
-
-impl TryFrom<Value> for EnvVar {
-    type Error = ShellError;
-
-    fn try_from(value: Value) -> Result<Self, Self::Error> {
-        if value.value.is_none() {
-            Ok(EnvVar::Nothing)
-        } else if value.is_primitive() {
-            Ok(EnvVar::Proper(value.convert_to_string()))
-        } else {
-            Err(ShellError::type_error(
-                "primitive",
-                value.spanned_type_name(),
-            ))
-        }
-    }
-}
-
-impl TryFrom<&Value> for EnvVar {
-    type Error = ShellError;
-
-    fn try_from(value: &Value) -> Result<Self, Self::Error> {
-        if value.value.is_none() {
-            Ok(EnvVar::Nothing)
-        } else if value.is_primitive() {
-            Ok(EnvVar::Proper(value.convert_to_string()))
-        } else {
-            Err(ShellError::type_error(
-                "primitive",
-                value.spanned_type_name(),
-            ))
-        }
-    }
-}
-
-impl From<String> for EnvVar {
-    fn from(string: String) -> Self {
-        EnvVar::Proper(string)
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/evaluate_args.rs b/old_nushell/crates/nu-engine/src/evaluate/evaluate_args.rs
deleted file mode 100644
index ecf47e244..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/evaluate_args.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// TODO: Temporary redirect
-use crate::evaluate::evaluator::evaluate_baseline_expr;
-use crate::evaluation_context::EvaluationContext;
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{hir, EvaluatedArgs, UntaggedValue, Value};
-
-pub(crate) fn evaluate_args(
-    call: &hir::Call,
-    ctx: &EvaluationContext,
-) -> Result<EvaluatedArgs, ShellError> {
-    let mut positional_args: Vec<Value> = vec![];
-
-    if let Some(positional) = &call.positional {
-        for pos in positional {
-            let result = evaluate_baseline_expr(pos, ctx)?;
-            positional_args.push(result);
-        }
-    }
-
-    let positional = if !positional_args.is_empty() {
-        Some(positional_args)
-    } else {
-        None
-    };
-
-    let mut named_args = IndexMap::new();
-
-    if let Some(named) = &call.named {
-        for (name, value) in named {
-            match value {
-                hir::NamedValue::PresentSwitch(tag) => {
-                    named_args.insert(name.clone(), UntaggedValue::boolean(true).into_value(tag));
-                }
-                hir::NamedValue::Value(_, expr) => {
-                    named_args.insert(name.clone(), evaluate_baseline_expr(expr, ctx)?);
-                }
-                _ => {}
-            };
-        }
-    }
-
-    let named = if !named_args.is_empty() {
-        Some(named_args)
-    } else {
-        None
-    };
-
-    Ok(EvaluatedArgs::new(positional, named))
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/evaluator.rs b/old_nushell/crates/nu-engine/src/evaluate/evaluator.rs
deleted file mode 100644
index 005f4d3dc..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/evaluator.rs
+++ /dev/null
@@ -1,328 +0,0 @@
-use crate::evaluate::block::run_block;
-use crate::evaluate::operator::apply_operator;
-use crate::evaluation_context::EvaluationContext;
-use indexmap::IndexMap;
-use log::trace;
-use nu_errors::{ArgumentError, ShellError};
-use nu_protocol::did_you_mean;
-use nu_protocol::{
-    hir::{self, CapturedBlock, Expression, RangeOperator, SpannedExpression},
-    Dictionary,
-};
-use nu_protocol::{
-    ColumnPath, Primitive, RangeInclusion, UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_source::{Span, SpannedItem, Tag};
-use nu_stream::InputStream;
-use nu_value_ext::ValueExt;
-
-pub fn evaluate_baseline_expr(
-    expr: &SpannedExpression,
-    ctx: &EvaluationContext,
-) -> Result<Value, ShellError> {
-    let tag = Tag {
-        span: expr.span,
-        anchor: None,
-    };
-    let span = expr.span;
-    match &expr.expr {
-        Expression::Literal(literal) => Ok(evaluate_literal(literal, span)),
-        Expression::ExternalWord => Err(ShellError::argument_error(
-            "Invalid external word".spanned(tag.span),
-            ArgumentError::InvalidExternalWord,
-        )),
-        Expression::FilePath(path) => Ok(UntaggedValue::filepath(path.clone()).into_value(tag)),
-        Expression::Synthetic(hir::Synthetic::String(s)) => {
-            Ok(UntaggedValue::string(s).into_untagged_value())
-        }
-        expr @ Expression::Variable(_, _) => evaluate_reference(&Variable::from(expr), ctx, span),
-        Expression::Command => unimplemented!(),
-        Expression::Subexpression(block) => evaluate_subexpression(block, ctx),
-        Expression::ExternalCommand(_) => unimplemented!(),
-        Expression::Binary(binary) => {
-            // TODO: If we want to add short-circuiting, we'll need to move these down
-            let left = evaluate_baseline_expr(&binary.left, ctx)?;
-            let right = evaluate_baseline_expr(&binary.right, ctx)?;
-
-            trace!("left={:?} right={:?}", left.value, right.value);
-
-            match binary.op.expr {
-                Expression::Literal(hir::Literal::Operator(op)) => {
-                    match apply_operator(op, &left, &right) {
-                        Ok(result) => match result {
-                            UntaggedValue::Error(shell_err) => Err(shell_err),
-                            _ => Ok(result.into_value(tag)),
-                        },
-                        Err((left_type, right_type)) => Err(ShellError::coerce_error(
-                            left_type.spanned(binary.left.span),
-                            right_type.spanned(binary.right.span),
-                        )),
-                    }
-                }
-                _ => Err(ShellError::labeled_error(
-                    "Unknown operator",
-                    "unknown operator",
-                    binary.op.span,
-                )),
-            }
-        }
-        Expression::Range(range) => {
-            let left = if let Some(left) = &range.left {
-                evaluate_baseline_expr(left, ctx)?
-            } else {
-                Value::nothing()
-            };
-
-            let right = if let Some(right) = &range.right {
-                evaluate_baseline_expr(right, ctx)?
-            } else {
-                Value::nothing()
-            };
-
-            let left_span = left.tag.span;
-            let right_span = right.tag.span;
-
-            let left = (
-                left.as_primitive()?.spanned(left_span),
-                RangeInclusion::Inclusive,
-            );
-            let right = (
-                right.as_primitive()?.spanned(right_span),
-                match &range.operator.item {
-                    RangeOperator::Inclusive => RangeInclusion::Inclusive,
-                    RangeOperator::RightExclusive => RangeInclusion::Exclusive,
-                },
-            );
-
-            Ok(UntaggedValue::range(left, right).into_value(tag))
-        }
-        Expression::Table(headers, cells) => {
-            let mut output_headers = vec![];
-
-            for expr in headers {
-                let val = evaluate_baseline_expr(expr, ctx)?;
-
-                let header = val.as_string()?;
-                output_headers.push(header);
-            }
-
-            let mut output_table = vec![];
-
-            for row in cells {
-                if row.len() != headers.len() {
-                    match (row.first(), row.last()) {
-                        (Some(first), Some(last)) => {
-                            return Err(ShellError::labeled_error(
-                                "Cell count doesn't match header count",
-                                format!("expected {} columns", headers.len()),
-                                Span::new(first.span.start(), last.span.end()),
-                            ));
-                        }
-                        _ => {
-                            return Err(ShellError::untagged_runtime_error(
-                                "Cell count doesn't match header count",
-                            ));
-                        }
-                    }
-                }
-
-                let mut row_output = IndexMap::new();
-                for cell in output_headers.iter().zip(row) {
-                    let val = evaluate_baseline_expr(cell.1, ctx)?;
-                    row_output.insert(cell.0.clone(), val);
-                }
-                output_table.push(UntaggedValue::row(row_output).into_value(tag.clone()));
-            }
-
-            Ok(UntaggedValue::Table(output_table).into_value(tag))
-        }
-        Expression::List(list) => {
-            let mut exprs = vec![];
-
-            for expr in list {
-                let expr = evaluate_baseline_expr(expr, ctx)?;
-                exprs.push(expr);
-            }
-
-            Ok(UntaggedValue::Table(exprs).into_value(tag))
-        }
-        Expression::Block(block) => {
-            // Capture the current values of all free variables
-            let mut known_variables = vec![];
-            let free_variables = block.get_free_variables(&mut known_variables);
-
-            let mut captured = Dictionary::new(IndexMap::new());
-            for free_variable in &free_variables {
-                if let Some(v) = ctx.scope.get_var(free_variable) {
-                    captured.insert(free_variable.into(), v.clone());
-                }
-            }
-
-            Ok(
-                UntaggedValue::Block(Box::new(CapturedBlock::new(block.clone(), captured)))
-                    .into_value(&tag),
-            )
-        }
-        Expression::FullColumnPath(path) => {
-            let value = evaluate_baseline_expr(&path.head, ctx)?;
-            let mut item = value;
-
-            for member in &path.tail {
-                let next = item.get_data_by_member(member);
-
-                match next {
-                    Err(err) => match &member.unspanned {
-                        UnspannedPathMember::String(_name) => {
-                            let possible_matches = did_you_mean(&item, member.as_string());
-
-                            match possible_matches {
-                                Some(p) => {
-                                    return Err(ShellError::labeled_error(
-                                        "Unknown column",
-                                        format!("did you mean '{}'?", p[0]),
-                                        &member.span,
-                                    ));
-                                }
-                                None => return Err(err),
-                            }
-                        }
-                        UnspannedPathMember::Int(_row) => {
-                            return Err(ShellError::labeled_error(
-                                "Unknown row",
-                                "unknown row",
-                                &member.span,
-                            ));
-                        }
-                    },
-                    Ok(next) => {
-                        item = next.clone().value.into_value(&tag);
-                    }
-                };
-            }
-
-            if path.tail.is_empty() {
-                Ok(item)
-            } else {
-                Ok(item.value.into_value(tag))
-            }
-        }
-        Expression::Boolean(_boolean) => Ok(UntaggedValue::boolean(*_boolean).into_value(tag)),
-        Expression::Garbage => unimplemented!(),
-    }
-}
-
-fn evaluate_literal(literal: &hir::Literal, span: Span) -> Value {
-    match &literal {
-        hir::Literal::ColumnPath(path) => {
-            let members = path.iter().map(|member| member.to_path_member()).collect();
-
-            UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::new(members)))
-                .into_value(span)
-        }
-        hir::Literal::Number(int) => match int {
-            nu_protocol::hir::Number::BigInt(i) => {
-                UntaggedValue::big_int(i.clone()).into_value(span)
-            }
-            nu_protocol::hir::Number::Int(i) => UntaggedValue::int(*i).into_value(span),
-            nu_protocol::hir::Number::Decimal(d) => {
-                UntaggedValue::decimal(d.clone()).into_value(span)
-            }
-        },
-        hir::Literal::Size(int, unit) => unit.compute(int).into_value(span),
-        hir::Literal::String(string) => UntaggedValue::string(string).into_value(span),
-        hir::Literal::GlobPattern(pattern) => UntaggedValue::glob_pattern(pattern).into_value(span),
-        hir::Literal::Bare(bare) => UntaggedValue::string(bare.clone()).into_value(span),
-        hir::Literal::Operator(_) => unimplemented!("Not sure what to do with operator yet"),
-    }
-}
-
-pub enum Variable<'a> {
-    Nu,
-    Scope,
-    True,
-    False,
-    Nothing,
-    Other(&'a str),
-}
-
-impl<'a> Variable<'a> {
-    pub fn list() -> Vec<String> {
-        vec![
-            String::from("$nu"),
-            String::from("$scope"),
-            String::from("$true"),
-            String::from("$false"),
-            String::from("$nothing"),
-        ]
-    }
-}
-
-impl<'a> From<&'a Expression> for Variable<'a> {
-    fn from(expr: &'a Expression) -> Self {
-        match &expr {
-            Expression::Variable(name, _) => match name.as_str() {
-                "$nu" => Self::Nu,
-                "$scope" => Self::Scope,
-                "$true" => Self::True,
-                "$false" => Self::False,
-                "$nothing" => Self::Nothing,
-                _ => Self::Other(name),
-            },
-            _ => unreachable!(),
-        }
-    }
-}
-
-pub fn evaluate_reference(
-    variable: &Variable,
-    ctx: &EvaluationContext,
-    tag: impl Into<Tag>,
-) -> Result<Value, ShellError> {
-    match variable {
-        Variable::Nu => crate::evaluate::variables::nu(&ctx.scope, ctx),
-        Variable::Scope => crate::evaluate::variables::scope(
-            &ctx.scope.get_aliases(),
-            &ctx.scope.get_commands(),
-            &ctx.scope.get_vars(),
-        ),
-        Variable::True => Ok(UntaggedValue::boolean(true).into_untagged_value()),
-        Variable::False => Ok(UntaggedValue::boolean(false).into_untagged_value()),
-        Variable::Nothing => Ok(UntaggedValue::nothing().into_untagged_value()),
-        Variable::Other(name) => match ctx.scope.get_var(name) {
-            Some(v) => Ok(v),
-            None => Err(ShellError::labeled_error(
-                "Variable not in scope",
-                format!("unknown variable: {}", name),
-                tag.into(),
-            )),
-        },
-    }
-}
-
-fn evaluate_subexpression(
-    block: &hir::Block,
-    ctx: &EvaluationContext,
-) -> Result<Value, ShellError> {
-    // FIXME: we should use a real context here
-    let input = match ctx.scope.get_var("$it") {
-        Some(it) => InputStream::one(it),
-        None => InputStream::empty(),
-    };
-
-    let result = run_block(block, ctx, input, hir::ExternalRedirection::Stdout)?;
-
-    let output = result.into_vec();
-
-    if let Some(e) = ctx.get_errors().get(0) {
-        return Err(e.clone());
-    }
-
-    match output.len() {
-        x if x > 1 => {
-            let tag = output[0].tag.clone();
-            Ok(UntaggedValue::Table(output).into_value(tag))
-        }
-        1 => Ok(output[0].clone()),
-        _ => Ok(UntaggedValue::nothing().into_value(Tag::unknown())),
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/expr.rs b/old_nushell/crates/nu-engine/src/evaluate/expr.rs
deleted file mode 100644
index 5fee9088a..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/expr.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use crate::evaluate_baseline_expr;
-
-use log::{log_enabled, trace};
-
-use crate::evaluation_context::EvaluationContext;
-use nu_errors::ShellError;
-use nu_protocol::hir::SpannedExpression;
-use nu_protocol::{UntaggedValue, Value};
-use nu_stream::{InputStream, IntoInputStream};
-
-pub(crate) fn run_expression_block(
-    expr: &SpannedExpression,
-    ctx: &EvaluationContext,
-) -> Result<InputStream, ShellError> {
-    if log_enabled!(log::Level::Trace) {
-        trace!(target: "nu::run::expr", "->");
-        trace!(target: "nu::run::expr", "{:?}", expr);
-    }
-
-    let output = evaluate_baseline_expr(expr, ctx)?;
-
-    match output {
-        Value {
-            value: UntaggedValue::Table(x),
-            ..
-        } => Ok(InputStream::from_stream(x.into_iter())),
-        output => Ok(std::iter::once(Ok(output)).into_input_stream()),
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/internal.rs b/old_nushell/crates/nu-engine/src/evaluate/internal.rs
deleted file mode 100644
index 7ec897805..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/internal.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use crate::call_info::UnevaluatedCallInfo;
-use crate::evaluation_context::EvaluationContext;
-use crate::filesystem::filesystem_shell::{FilesystemShell, FilesystemShellMode};
-use crate::shell::value_shell::ValueShell;
-use crate::CommandArgs;
-use log::{log_enabled, trace};
-use nu_errors::ShellError;
-use nu_protocol::hir::{
-    Expression, ExternalRedirection, InternalCommand, SpannedExpression, Synthetic,
-};
-use nu_protocol::{CommandAction, ReturnSuccess, UntaggedValue, Value};
-use nu_source::{PrettyDebug, Span, Tag};
-use nu_stream::{ActionStream, InputStream};
-
-pub(crate) fn run_internal_command(
-    command: &InternalCommand,
-    context: &EvaluationContext,
-    input: InputStream,
-) -> Result<InputStream, ShellError> {
-    if log_enabled!(log::Level::Trace) {
-        trace!(target: "nu::run::internal", "->");
-        trace!(target: "nu::run::internal", "{}", command.name);
-    }
-
-    let objects: InputStream = input;
-
-    let internal_command = context.scope.expect_command(&command.name);
-    let internal_command = internal_command?;
-
-    let result = context.run_command(
-        internal_command,
-        Tag::unknown_anchor(command.name_span),
-        command.args.clone(), // FIXME: this is inefficient
-        objects,
-    )?;
-    Ok(InputStream::from_stream(InternalIteratorSimple {
-        context: context.clone(),
-        input: result,
-    }))
-}
-
-struct InternalIteratorSimple {
-    context: EvaluationContext,
-    input: InputStream,
-}
-
-impl Iterator for InternalIteratorSimple {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self.input.next() {
-            Some(Value {
-                value: UntaggedValue::Error(err),
-                ..
-            }) => {
-                self.context.error(err);
-                None
-            }
-            x => x,
-        }
-    }
-}
-
-pub struct InternalIterator {
-    pub context: EvaluationContext,
-    pub leftovers: InputStream,
-    pub input: ActionStream,
-}
-
-impl Iterator for InternalIterator {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(output) = self.leftovers.next() {
-            return Some(output);
-        }
-
-        while let Some(item) = self.input.next() {
-            match item {
-                Ok(ReturnSuccess::Action(action)) => match action {
-                    CommandAction::ChangePath(path) => {
-                        self.context.shell_manager().set_path(path);
-                    }
-                    CommandAction::Exit(code) => std::process::exit(code), // TODO: save history.txt
-                    CommandAction::Error(err) => {
-                        self.context.error(err);
-                        return None;
-                    }
-                    CommandAction::AutoConvert(tagged_contents, extension) => {
-                        let contents_tag = tagged_contents.tag.clone();
-                        let command_name = format!("from {}", extension);
-                        if let Some(converter) = self.context.scope.get_command(&command_name) {
-                            let new_args = CommandArgs {
-                                context: self.context.clone(),
-                                call_info: UnevaluatedCallInfo {
-                                    args: nu_protocol::hir::Call {
-                                        head: Box::new(SpannedExpression {
-                                            expr: Expression::Synthetic(Synthetic::String(
-                                                command_name.clone(),
-                                            )),
-                                            span: tagged_contents.tag().span,
-                                        }),
-                                        positional: None,
-                                        named: None,
-                                        span: Span::unknown(),
-                                        external_redirection: ExternalRedirection::Stdout,
-                                    },
-                                    name_tag: tagged_contents.tag(),
-                                },
-                                input: InputStream::one(tagged_contents),
-                            };
-                            let result = converter.run(new_args);
-
-                            match result {
-                                Ok(mut result) => {
-                                    if let Some(x) = result.next() {
-                                        self.leftovers =
-                                            InputStream::from_stream(result.map(move |x| Value {
-                                                value: x.value,
-                                                tag: contents_tag.clone(),
-                                            }));
-                                        return Some(x);
-                                    } else {
-                                        return None;
-                                    }
-                                }
-                                Err(err) => {
-                                    self.leftovers = InputStream::empty();
-                                    return Some(Value::error(err));
-                                }
-                            }
-                        } else {
-                            return Some(tagged_contents);
-                        }
-                    }
-                    CommandAction::EnterValueShell(value) => {
-                        self.context
-                            .shell_manager()
-                            .insert_at_current(Box::new(ValueShell::new(value)));
-                    }
-                    CommandAction::EnterShell(location) => {
-                        let mode = if self.context.shell_manager().is_interactive() {
-                            FilesystemShellMode::Cli
-                        } else {
-                            FilesystemShellMode::Script
-                        };
-                        self.context.shell_manager().insert_at_current(Box::new(
-                            match FilesystemShell::with_location(location, mode) {
-                                Ok(v) => v,
-                                Err(err) => {
-                                    self.context.error(err.into());
-                                    break;
-                                }
-                            },
-                        ));
-                    }
-                    CommandAction::AddPlugins(path) => {
-                        match crate::plugin::build_plugin::scan(vec![std::path::PathBuf::from(
-                            path,
-                        )]) {
-                            Ok(plugins) => {
-                                self.context.add_commands(
-                                    plugins
-                                        .into_iter()
-                                        .filter(|p| !self.context.is_command_registered(p.name()))
-                                        .collect(),
-                                );
-                            }
-                            Err(reason) => {
-                                self.context.error(reason);
-                            }
-                        }
-                    }
-                    CommandAction::PreviousShell => {
-                        self.context.shell_manager().prev();
-                    }
-                    CommandAction::NextShell => {
-                        self.context.shell_manager().next();
-                    }
-                    CommandAction::GotoShell(i) => {
-                        self.context.shell_manager().goto(i);
-                    }
-                    CommandAction::LeaveShell(code) => {
-                        self.context.shell_manager().remove_at_current();
-                        if self.context.shell_manager().is_empty() {
-                            std::process::exit(code); // TODO: save history.txt
-                        }
-                    }
-                    CommandAction::UnloadConfig(cfg_path) => {
-                        self.context.unload_config(&cfg_path);
-                    }
-                    CommandAction::LoadConfig(cfg_path) => {
-                        if let Err(e) = self.context.load_config(&cfg_path) {
-                            return Some(UntaggedValue::Error(e).into_untagged_value());
-                        }
-                    }
-                },
-
-                Ok(ReturnSuccess::Value(Value {
-                    value: UntaggedValue::Error(err),
-                    ..
-                })) => {
-                    self.context.error(err);
-                    return None;
-                }
-
-                Ok(ReturnSuccess::Value(v)) => return Some(v),
-
-                Ok(ReturnSuccess::DebugValue(v)) => {
-                    let doc = PrettyDebug::pretty_doc(&v);
-                    let mut buffer = termcolor::Buffer::ansi();
-
-                    let _ = doc.render_raw(
-                        self.context.with_host(|host| host.width() - 5),
-                        &mut nu_source::TermColored::new(&mut buffer),
-                    );
-
-                    let value = String::from_utf8_lossy(buffer.as_slice());
-
-                    return Some(UntaggedValue::string(value).into_untagged_value());
-                }
-
-                Err(err) => {
-                    self.context.error(err);
-                }
-            }
-        }
-
-        None
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/lang.rs b/old_nushell/crates/nu-engine/src/evaluate/lang.rs
deleted file mode 100644
index 8afe7ac1b..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/lang.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use crate::Scope;
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Signature, UntaggedValue, Value};
-use nu_source::Tag;
-
-pub struct Lang;
-
-impl Lang {
-    pub fn query_commands(scope: &Scope) -> Result<Vec<Value>, ShellError> {
-        let tag = Tag::unknown();
-        let full_commands = scope.get_commands_info();
-        let mut cmd_vec = Vec::new();
-        for (key, cmd) in full_commands {
-            let mut indexmap = IndexMap::new();
-            let mut sig = cmd.signature();
-            // eprintln!("{}", get_signature(&sig));
-            indexmap.insert(
-                "name".to_string(),
-                UntaggedValue::string(key).into_value(&tag),
-            );
-            indexmap.insert(
-                "usage".to_string(),
-                UntaggedValue::string(cmd.usage().to_string()).into_value(&tag),
-            );
-            // let sig_deser = serde_json::to_string(&sig).unwrap();
-            // indexmap.insert(
-            //     "signature".to_string(),
-            //     UntaggedValue::string(sig_deser).into_value(&tag),
-            // );
-            let signature_table = get_signature(&mut sig, tag.clone());
-            indexmap.insert(
-                "signature".to_string(),
-                UntaggedValue::Table(signature_table).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_filter".to_string(),
-                UntaggedValue::boolean(sig.is_filter).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_builtin".to_string(),
-                UntaggedValue::boolean(cmd.is_builtin()).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_sub".to_string(),
-                UntaggedValue::boolean(cmd.is_sub()).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_plugin".to_string(),
-                UntaggedValue::boolean(cmd.is_plugin()).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_custom".to_string(),
-                UntaggedValue::boolean(cmd.is_custom()).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_private".to_string(),
-                UntaggedValue::boolean(cmd.is_private()).into_value(&tag),
-            );
-            indexmap.insert(
-                "is_binary".to_string(),
-                UntaggedValue::boolean(cmd.is_binary()).into_value(&tag),
-            );
-            indexmap.insert(
-                "extra_usage".to_string(),
-                UntaggedValue::string(cmd.extra_usage().to_string()).into_value(&tag),
-            );
-
-            cmd_vec.push(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag));
-        }
-
-        Ok(cmd_vec)
-    }
-}
-
-fn get_signature(sig: &mut Signature, tag: Tag) -> Vec<Value> {
-    sig.remove_named("help");
-    let p = &sig.positional;
-    let r = &sig.rest_positional;
-    let n = &sig.named;
-    let name = &sig.name;
-    let mut sig_vec: Vec<Value> = Vec::new();
-
-    for item in p {
-        let mut indexmap = IndexMap::new();
-
-        let (parameter, syntax_shape) = item.0.get_type_description();
-        let description = &item.1;
-        // let output = format!(
-        //     "Positional|{}|{}|{}|{}\n",
-        //     name, parameter, syntax_shape, description
-        // );
-        // eprintln!("{}", output);
-
-        indexmap.insert(
-            "cmd_name".to_string(),
-            UntaggedValue::string(name).into_value(&tag),
-        );
-        indexmap.insert(
-            "parameter_name".to_string(),
-            UntaggedValue::string(parameter).into_value(&tag),
-        );
-        indexmap.insert(
-            "parameter_type".to_string(),
-            UntaggedValue::string("positional".to_string()).into_value(&tag),
-        );
-        indexmap.insert(
-            "syntax_shape".to_string(),
-            UntaggedValue::string(syntax_shape).into_value(&tag),
-        );
-        indexmap.insert(
-            "description".to_string(),
-            UntaggedValue::string(description).into_value(&tag),
-        );
-        indexmap.insert(
-            "flag_name".to_string(),
-            UntaggedValue::string("".to_string()).into_value(&tag),
-        );
-        indexmap.insert(
-            "flag_type".to_string(),
-            UntaggedValue::string("".to_string()).into_value(&tag),
-        );
-
-        sig_vec.push(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag));
-    }
-
-    match r {
-        Some((rest_name, shape, desc)) => {
-            let mut indexmap = IndexMap::new();
-            // let output = format!("Rest|{}|{}|{}\n", name, shape.syntax_shape_name(), desc);
-            // eprintln!("{}", output);
-
-            indexmap.insert(
-                "cmd_name".to_string(),
-                UntaggedValue::string(name).into_value(&tag),
-            );
-            indexmap.insert(
-                "parameter_name".to_string(),
-                UntaggedValue::string(rest_name.to_string()).into_value(&tag),
-            );
-            indexmap.insert(
-                "parameter_type".to_string(),
-                UntaggedValue::string("rest".to_string()).into_value(&tag),
-            );
-            indexmap.insert(
-                "syntax_shape".to_string(),
-                UntaggedValue::string(shape.syntax_shape_name()).into_value(&tag),
-            );
-            indexmap.insert(
-                "description".to_string(),
-                UntaggedValue::string(desc).into_value(&tag),
-            );
-            indexmap.insert(
-                "flag_name".to_string(),
-                UntaggedValue::string("".to_string()).into_value(&tag),
-            );
-            indexmap.insert(
-                "flag_type".to_string(),
-                UntaggedValue::string("".to_string()).into_value(&tag),
-            );
-
-            sig_vec.push(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag));
-        }
-        None => {}
-    }
-
-    for (parameter, (b, description)) in n {
-        let mut indexmap = IndexMap::new();
-
-        let (named_type, flag_name, shape) = b.get_type_description();
-        // let output = format!(
-        //     "Named|{}|{}|{}|{}|{}|{}\n",
-        //     name, parameter, named_type, flag_name, shape, description
-        // );
-        // eprint!("{}", output);
-
-        indexmap.insert(
-            "cmd_name".to_string(),
-            UntaggedValue::string(name).into_value(&tag),
-        );
-        indexmap.insert(
-            "parameter_name".to_string(),
-            UntaggedValue::string(parameter).into_value(&tag),
-        );
-        indexmap.insert(
-            "parameter_type".to_string(),
-            UntaggedValue::string("named".to_string()).into_value(&tag),
-        );
-        indexmap.insert(
-            "syntax_shape".to_string(),
-            UntaggedValue::string(shape).into_value(&tag),
-        );
-        indexmap.insert(
-            "description".to_string(),
-            UntaggedValue::string(description).into_value(&tag),
-        );
-        indexmap.insert(
-            "flag_name".to_string(),
-            UntaggedValue::string(flag_name).into_value(&tag),
-        );
-        indexmap.insert(
-            "flag_type".to_string(),
-            UntaggedValue::string(named_type).into_value(&tag),
-        );
-        sig_vec.push(UntaggedValue::Row(Dictionary::from(indexmap)).into_value(&tag));
-    }
-
-    sig_vec
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/mod.rs b/old_nushell/crates/nu-engine/src/evaluate/mod.rs
deleted file mode 100644
index 5bfc7fded..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub(crate) mod block;
-pub(crate) mod envvar;
-pub(crate) mod evaluate_args;
-pub mod evaluator;
-pub(crate) mod expr;
-pub mod internal;
-pub(crate) mod lang;
-pub(crate) mod operator;
-pub(crate) mod scope;
-pub(crate) mod variables;
diff --git a/old_nushell/crates/nu-engine/src/evaluate/operator.rs b/old_nushell/crates/nu-engine/src/evaluate/operator.rs
deleted file mode 100644
index c6318382d..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/operator.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use nu_data::{value, value::compare_values};
-use nu_errors::ShellError;
-use nu_protocol::hir::Operator;
-use nu_protocol::{Primitive, ShellTypeName, UntaggedValue, Value};
-use std::ops::Not;
-
-#[cfg(feature = "dataframe")]
-use nu_protocol::dataframe::{compute_between_dataframes, compute_series_single_value};
-
-pub fn apply_operator(
-    op: Operator,
-    left: &Value,
-    right: &Value,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    #[cfg(feature = "dataframe")]
-    if let (UntaggedValue::DataFrame(_), UntaggedValue::DataFrame(_)) = (&left.value, &right.value)
-    {
-        return compute_between_dataframes(op, left, right);
-    } else if let (UntaggedValue::DataFrame(_), UntaggedValue::Primitive(_)) =
-        (&left.value, &right.value)
-    {
-        return compute_series_single_value(op, left, right);
-    }
-
-    match op {
-        Operator::Equal
-        | Operator::NotEqual
-        | Operator::LessThan
-        | Operator::GreaterThan
-        | Operator::LessThanOrEqual
-        | Operator::GreaterThanOrEqual => {
-            value::compare_values(op, left, right).map(UntaggedValue::boolean)
-        }
-        Operator::Contains => string_contains(left, right).map(UntaggedValue::boolean),
-        Operator::NotContains => string_contains(left, right)
-            .map(Not::not)
-            .map(UntaggedValue::boolean),
-        Operator::Plus => value::compute_values(op, left, right),
-        Operator::Minus => value::compute_values(op, left, right),
-        Operator::Multiply => value::compute_values(op, left, right),
-        Operator::Pow => value::compute_values(op, left, right),
-        Operator::Divide => value::compute_values(op, left, right).map(|res| match res {
-            UntaggedValue::Error(_) => UntaggedValue::Error(ShellError::labeled_error(
-                "Evaluation error",
-                "division by zero",
-                &right.tag.span,
-            )),
-            _ => res,
-        }),
-        Operator::Modulo => value::compute_values(op, left, right).map(|res| match res {
-            UntaggedValue::Error(_) => UntaggedValue::Error(ShellError::labeled_error(
-                "Evaluation error",
-                "division by zero",
-                &right.tag.span,
-            )),
-            _ => res,
-        }),
-        Operator::In => inside_of(left, right).map(UntaggedValue::boolean),
-        Operator::NotIn => inside_of(left, right).map(|x| UntaggedValue::boolean(!x)),
-        Operator::And => match (left.as_bool(), right.as_bool()) {
-            (Ok(left), Ok(right)) => Ok(UntaggedValue::boolean(left && right)),
-            _ => Err((left.type_name(), right.type_name())),
-        },
-        Operator::Or => match (left.as_bool(), right.as_bool()) {
-            (Ok(left), Ok(right)) => Ok(UntaggedValue::boolean(left || right)),
-            _ => Err((left.type_name(), right.type_name())),
-        },
-    }
-}
-
-fn string_contains(
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<bool, (&'static str, &'static str)> {
-    match (left, right) {
-        (
-            UntaggedValue::Primitive(Primitive::String(l)),
-            UntaggedValue::Primitive(Primitive::String(r)),
-        ) => Ok(l.contains(r)),
-        (
-            UntaggedValue::Primitive(Primitive::FilePath(l)),
-            UntaggedValue::Primitive(Primitive::String(r)),
-        ) => Ok(l.as_path().display().to_string().contains(r)),
-        (
-            UntaggedValue::Primitive(Primitive::String(l)),
-            UntaggedValue::Primitive(Primitive::FilePath(r)),
-        ) => Ok(l.contains(&r.as_path().display().to_string())),
-        _ => Err((left.type_name(), right.type_name())),
-    }
-}
-
-fn inside_of(
-    left: &UntaggedValue,
-    right: &UntaggedValue,
-) -> Result<bool, (&'static str, &'static str)> {
-    match (left, right) {
-        (_, UntaggedValue::Table(values)) => {
-            Ok(values
-                .iter()
-                .any(|x| match compare_values(Operator::Equal, left, &x.value) {
-                    Ok(coerced) => coerced,
-                    _ => false,
-                }))
-        }
-        (
-            UntaggedValue::Primitive(Primitive::String(lhs)),
-            UntaggedValue::Primitive(Primitive::String(rhs)),
-        ) => Ok(rhs.contains(lhs)),
-        _ => Err((left.type_name(), right.type_name())),
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/scope.rs b/old_nushell/crates/nu-engine/src/evaluate/scope.rs
deleted file mode 100644
index 32b6dc472..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/scope.rs
+++ /dev/null
@@ -1,508 +0,0 @@
-use crate::{
-    evaluate::envvar::EnvVar,
-    whole_stream_command::{whole_stream_command, Command},
-};
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::{hir::Block, Signature, SignatureRegistry, Value};
-use nu_source::Spanned;
-use std::sync::Arc;
-
-#[derive(Debug, Clone)]
-pub struct Scope {
-    frames: Arc<parking_lot::Mutex<Vec<ScopeFrame>>>,
-}
-
-impl Default for Scope {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Scope {
-    pub fn new() -> Scope {
-        Scope {
-            frames: Arc::new(parking_lot::Mutex::new(vec![ScopeFrame::new()])),
-        }
-    }
-
-    pub fn get_command(&self, name: &str) -> Option<Command> {
-        for frame in self.frames.lock().iter().rev() {
-            if let Some(command) = frame.get_command(name) {
-                return Some(command);
-            }
-        }
-
-        None
-    }
-
-    pub fn get_aliases(&self) -> IndexMap<String, Vec<Spanned<String>>> {
-        let mut output: IndexMap<String, Vec<Spanned<String>>> = IndexMap::new();
-
-        for frame in self.frames.lock().iter().rev() {
-            for v in &frame.aliases {
-                if !output.contains_key(v.0) {
-                    output.insert(v.0.clone(), v.1.clone());
-                }
-            }
-        }
-
-        output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
-    }
-
-    pub fn get_commands(&self) -> IndexMap<String, Signature> {
-        let mut output: IndexMap<String, Signature> = IndexMap::new();
-
-        for frame in self.frames.lock().iter().rev() {
-            for (name, command) in &frame.commands {
-                if !output.contains_key(name) {
-                    let mut sig = command.signature();
-                    // don't show --help and -h in the command arguments for $scope.commands
-                    sig.remove_named("help");
-                    output.insert(name.clone(), sig);
-                }
-            }
-        }
-
-        output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
-    }
-
-    pub fn get_commands_info(&self) -> IndexMap<String, Command> {
-        let mut output: IndexMap<String, Command> = IndexMap::new();
-
-        for frame in self.frames.lock().iter().rev() {
-            for (name, command) in &frame.commands {
-                if !output.contains_key(name) {
-                    output.insert(name.clone(), command.clone());
-                }
-            }
-        }
-
-        output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
-    }
-
-    pub fn get_variable_names(&self) -> Vec<String> {
-        self.get_vars().iter().map(|(k, _)| k.to_string()).collect()
-    }
-
-    pub fn get_vars(&self) -> IndexMap<String, Value> {
-        //FIXME: should this be an iterator?
-        let mut output: IndexMap<String, Value> = IndexMap::new();
-
-        for frame in self.frames.lock().iter().rev() {
-            for v in &frame.vars {
-                if !output.contains_key(v.0) {
-                    output.insert(v.0.clone(), v.1.clone());
-                }
-            }
-        }
-
-        output.sorted_by(|k1, _v1, k2, _v2| k1.cmp(k2)).collect()
-    }
-
-    pub fn get_aliases_with_name(&self, name: &str) -> Option<Vec<Vec<Spanned<String>>>> {
-        let aliases: Vec<_> = self
-            .frames
-            .lock()
-            .iter()
-            .rev()
-            .filter_map(|frame| frame.aliases.get(name).cloned())
-            .collect();
-        if aliases.is_empty() {
-            None
-        } else {
-            Some(aliases)
-        }
-    }
-
-    pub fn get_custom_commands_with_name(&self, name: &str) -> Option<Vec<Arc<Block>>> {
-        let custom_commands: Vec<_> = self
-            .frames
-            .lock()
-            .iter()
-            .rev()
-            .filter_map(|frame| frame.custom_commands.get(name).cloned())
-            .collect();
-
-        if custom_commands.is_empty() {
-            None
-        } else {
-            Some(custom_commands)
-        }
-    }
-
-    pub fn add_command(&self, name: String, command: Command) {
-        // Note: this is assumed to always be true, as there is always a global top frame
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.add_command(name, command)
-        }
-    }
-
-    pub fn get_alias_names(&self) -> Vec<String> {
-        let mut names = vec![];
-
-        for frame in self.frames.lock().iter() {
-            let mut frame_command_names = frame.get_alias_names();
-            names.append(&mut frame_command_names);
-        }
-
-        // Sort needs to happen first because dedup works on consecutive dupes only
-        names.sort();
-        names.dedup();
-
-        names
-    }
-
-    pub fn get_command_names(&self) -> Vec<String> {
-        let mut names = vec![];
-
-        for frame in self.frames.lock().iter() {
-            let mut frame_command_names = frame.get_command_names();
-            frame_command_names.extend(frame.get_alias_names());
-            frame_command_names.extend(frame.get_custom_command_names());
-            names.append(&mut frame_command_names);
-        }
-
-        // Sort needs to happen first because dedup works on consecutive dupes only
-        names.sort();
-        names.dedup();
-
-        names
-    }
-
-    pub fn len(&self) -> usize {
-        self.frames.lock().len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.frames.lock().is_empty()
-    }
-
-    fn has_cmd_helper(&self, name: &str, f: fn(&ScopeFrame, &str) -> bool) -> bool {
-        self.frames.lock().iter().any(|frame| f(frame, name))
-    }
-
-    pub fn has_command(&self, name: &str) -> bool {
-        self.has_cmd_helper(name, ScopeFrame::has_command)
-    }
-
-    pub fn has_custom_command(&self, name: &str) -> bool {
-        self.has_cmd_helper(name, ScopeFrame::has_custom_command)
-    }
-
-    pub fn has_alias(&self, name: &str) -> bool {
-        self.has_cmd_helper(name, ScopeFrame::has_alias)
-    }
-
-    pub fn expect_command(&self, name: &str) -> Result<Command, ShellError> {
-        if let Some(c) = self.get_command(name) {
-            Ok(c)
-        } else {
-            Err(ShellError::untagged_runtime_error(format!(
-                "Missing command '{}'",
-                name
-            )))
-        }
-    }
-
-    // This is used for starting processes, keep it string -> string
-    pub fn get_env_vars(&self) -> IndexMap<String, String> {
-        //FIXME: should this be an iterator?
-        let mut output = IndexMap::new();
-
-        for frame in self.frames.lock().iter().rev() {
-            for v in &frame.env {
-                if !output.contains_key(v.0) {
-                    output.insert(v.0.clone(), v.1.clone());
-                }
-            }
-        }
-
-        output
-            .into_iter()
-            .filter_map(|(k, v)| match v {
-                EnvVar::Proper(s) => Some((k, s)),
-                EnvVar::Nothing => None,
-            })
-            .collect()
-    }
-
-    pub fn get_env(&self, name: &str) -> Option<String> {
-        for frame in self.frames.lock().iter().rev() {
-            if let Some(v) = frame.env.get(name) {
-                return match v {
-                    EnvVar::Proper(string) => Some(string.clone()),
-                    EnvVar::Nothing => None,
-                };
-            }
-        }
-
-        None
-    }
-
-    pub fn get_var(&self, name: &str) -> Option<Value> {
-        for frame in self.frames.lock().iter().rev() {
-            if let Some(v) = frame.vars.get(name) {
-                return Some(v.clone());
-            }
-        }
-
-        None
-    }
-
-    pub fn add_var(&self, name: impl Into<String>, value: Value) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.vars.insert(name.into(), value);
-        }
-    }
-
-    pub fn add_vars(&self, vars: &IndexMap<String, Value>) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame
-                .vars
-                .extend(vars.iter().map(|(s, v)| (s.clone(), v.clone())))
-        }
-    }
-
-    pub fn add_env_var(&self, name: impl Into<String>, value: impl Into<EnvVar>) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.env.insert(name.into(), value.into());
-        }
-    }
-
-    pub fn remove_env_var(&self, name: impl Into<String>) -> Option<String> {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            if let Some(val) = frame.env.remove_entry(&name.into()) {
-                return Some(val.0);
-            }
-        }
-        None
-    }
-
-    pub fn add_env(&self, env_vars: IndexMap<String, EnvVar>) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.env.extend(env_vars)
-        }
-    }
-
-    pub fn add_env_to_base(&self, env_vars: IndexMap<String, EnvVar>) {
-        if let Some(frame) = self.frames.lock().first_mut() {
-            frame.env.extend(env_vars)
-        }
-    }
-
-    pub fn add_env_var_to_base(&self, name: impl Into<String>, value: impl Into<EnvVar>) {
-        if let Some(frame) = self.frames.lock().first_mut() {
-            frame.env.insert(name.into(), value.into());
-        }
-    }
-
-    pub fn set_exit_scripts(&self, scripts: Vec<String>) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.exitscripts = scripts
-        }
-    }
-
-    pub fn enter_scope_with_tag(&self, tag: String) {
-        self.frames.lock().push(ScopeFrame::with_tag(tag));
-    }
-
-    //Removes the scopeframe with tag.
-    pub fn exit_scope_with_tag(&self, tag: &str) {
-        let mut frames = self.frames.lock();
-        let tag = Some(tag);
-        if let Some(i) = frames.iter().rposition(|f| f.tag.as_deref() == tag) {
-            frames.remove(i);
-        }
-    }
-
-    pub fn get_exitscripts_of_frame_with_tag(&self, tag: &str) -> Option<Vec<String>> {
-        let frames = self.frames.lock();
-        let tag = Some(tag);
-        frames.iter().find_map(|f| {
-            if f.tag.as_deref() == tag {
-                Some(f.exitscripts.clone())
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn get_frame_with_tag(&self, tag: &str) -> Option<ScopeFrame> {
-        let frames = self.frames.lock();
-        let tag = Some(tag);
-        frames.iter().rev().find_map(|f| {
-            if f.tag.as_deref() == tag {
-                Some(f.clone())
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn update_frame_with_tag(&self, frame: ScopeFrame, tag: &str) -> Result<(), ShellError> {
-        let mut frames = self.frames.lock();
-        let tag = Some(tag);
-        for f in frames.iter_mut().rev() {
-            if f.tag.as_deref() == tag {
-                *f = frame;
-                return Ok(());
-            }
-        }
-
-        // Frame not found, return err
-        Err(ShellError::untagged_runtime_error(format!(
-            "Can't update frame with tag {:?}. No such frame present!",
-            tag
-        )))
-    }
-}
-
-impl SignatureRegistry for Scope {
-    fn names(&self) -> Vec<String> {
-        self.get_command_names()
-    }
-
-    fn has(&self, name: &str) -> bool {
-        self.get_signature(name).is_some()
-    }
-
-    fn get(&self, name: &str) -> Option<Signature> {
-        self.get_signature(name)
-    }
-
-    fn clone_box(&self) -> Box<dyn SignatureRegistry> {
-        Box::new(self.clone())
-    }
-}
-
-impl ParserScope for Scope {
-    fn get_signature(&self, name: &str) -> Option<Signature> {
-        self.get_command(name).map(|x| x.signature())
-    }
-
-    fn has_signature(&self, name: &str) -> bool {
-        self.get_command(name).is_some()
-    }
-
-    fn add_definition(&self, block: Arc<Block>) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            let name = block.params.name.clone();
-            frame.custom_commands.insert(name.clone(), block.clone());
-            frame.commands.insert(name, whole_stream_command(block));
-        }
-    }
-
-    fn get_definitions(&self) -> Vec<Arc<Block>> {
-        let mut blocks = vec![];
-        if let Some(frame) = self.frames.lock().last() {
-            for (_, custom_command) in &frame.custom_commands {
-                blocks.push(custom_command.clone());
-            }
-        }
-        blocks
-    }
-
-    fn get_alias(&self, name: &str) -> Option<Vec<Spanned<String>>> {
-        for frame in self.frames.lock().iter().rev() {
-            if let Some(x) = frame.aliases.get(name) {
-                return Some(x.clone());
-            }
-        }
-        None
-    }
-
-    fn add_alias(&self, name: &str, replacement: Vec<Spanned<String>>) {
-        // Note: this is assumed to always be true, as there is always a global top frame
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.aliases.insert(name.to_string(), replacement);
-        }
-    }
-
-    fn remove_alias(&self, name: &str) {
-        if let Some(frame) = self.frames.lock().last_mut() {
-            frame.aliases.remove(name);
-        }
-    }
-
-    fn enter_scope(&self) {
-        self.frames.lock().push(ScopeFrame::new());
-    }
-
-    fn exit_scope(&self) {
-        self.frames.lock().pop();
-    }
-}
-
-/// An evaluation scope. Scopes map variable names to Values and aid in evaluating blocks and expressions.
-#[derive(Debug, Clone)]
-pub struct ScopeFrame {
-    pub vars: IndexMap<String, Value>,
-    pub env: IndexMap<String, EnvVar>,
-    pub commands: IndexMap<String, Command>,
-    pub custom_commands: IndexMap<String, Arc<Block>>,
-    pub aliases: IndexMap<String, Vec<Spanned<String>>>,
-    ///Optional tag to better identify this scope frame later
-    pub tag: Option<String>,
-    pub exitscripts: Vec<String>,
-}
-
-impl Default for ScopeFrame {
-    fn default() -> Self {
-        ScopeFrame::new()
-    }
-}
-
-impl ScopeFrame {
-    pub fn has_command(&self, name: &str) -> bool {
-        self.commands.contains_key(name)
-    }
-
-    pub fn has_custom_command(&self, name: &str) -> bool {
-        self.custom_commands.contains_key(name)
-    }
-
-    pub fn has_alias(&self, name: &str) -> bool {
-        self.aliases.contains_key(name)
-    }
-
-    pub fn get_alias_names(&self) -> Vec<String> {
-        self.aliases.keys().map(|x| x.to_string()).collect()
-    }
-
-    pub fn get_command_names(&self) -> Vec<String> {
-        self.commands.keys().map(|x| x.to_string()).collect()
-    }
-
-    pub fn get_custom_command_names(&self) -> Vec<String> {
-        self.custom_commands.keys().map(|x| x.to_string()).collect()
-    }
-
-    pub fn add_command(&mut self, name: String, command: Command) {
-        self.commands.insert(name, command);
-    }
-
-    pub fn get_command(&self, name: &str) -> Option<Command> {
-        self.commands.get(name).cloned()
-    }
-
-    pub fn new() -> ScopeFrame {
-        ScopeFrame {
-            vars: IndexMap::new(),
-            env: IndexMap::new(),
-            commands: IndexMap::new(),
-            custom_commands: IndexMap::new(),
-            aliases: IndexMap::new(),
-            tag: None,
-            exitscripts: Vec::new(),
-        }
-    }
-
-    pub fn with_tag(tag: String) -> ScopeFrame {
-        let mut scope = ScopeFrame::new();
-        scope.tag = Some(tag);
-
-        scope
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluate/variables.rs b/old_nushell/crates/nu-engine/src/evaluate/variables.rs
deleted file mode 100644
index 492b4afd9..000000000
--- a/old_nushell/crates/nu-engine/src/evaluate/variables.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use crate::{
-    evaluate::{lang, scope::Scope},
-    EvaluationContext,
-};
-use indexmap::IndexMap;
-use nu_data::config::path::{default_history_path, history_path};
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, ShellTypeName, Signature, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::{Spanned, Tag};
-
-pub fn nu(scope: &Scope, ctx: &EvaluationContext) -> Result<Value, ShellError> {
-    let env = &scope.get_env_vars();
-    let tag = Tag::unknown();
-
-    let mut nu_dict = TaggedDictBuilder::new(&tag);
-
-    let mut dict = TaggedDictBuilder::new(&tag);
-
-    for v in env {
-        if v.0 != "PATH" && v.0 != "Path" {
-            dict.insert_untagged(v.0, UntaggedValue::string(v.1));
-        }
-    }
-
-    nu_dict.insert_value("env", dict.into_value());
-
-    nu_dict.insert_value(
-        "history-path",
-        UntaggedValue::filepath(default_history_path()).into_value(&tag),
-    );
-
-    if let Some(global_cfg) = &ctx.configs().lock().global_config {
-        nu_dict.insert_value(
-            "config",
-            UntaggedValue::row(global_cfg.vars.clone()).into_value(&tag),
-        );
-
-        nu_dict.insert_value(
-            "config-path",
-            UntaggedValue::filepath(global_cfg.file_path.clone()).into_value(&tag),
-        );
-
-        // overwrite hist-path if present
-        if let Some(hist_path) = history_path(global_cfg) {
-            nu_dict.insert_value(
-                "history-path",
-                UntaggedValue::filepath(hist_path).into_value(&tag),
-            );
-        }
-    }
-
-    // A note about environment variables:
-    //
-    // Environment variables in Unix platforms are case-sensitive. On Windows, case-sensitivity is context-dependent.
-    // In cmd.exe, running `SET` will show you the list of environment variables and their names will be mixed case.
-    // In PowerShell, running `Get-ChildItem Env:` will show you a list of environment variables, and they will match
-    // the case in the environment variable section of the user configuration
-    //
-    // Rust currently returns the DOS-style, all-uppercase environment variables on Windows (as of 1.52) when running
-    // std::env::vars(), rather than the case-sensitive Environment.GetEnvironmentVariables() of .NET that PowerShell
-    // uses.
-    //
-    // For now, we work around the discrepancy as best we can by merging the two into what is shown to the user as the
-    // 'path' column of `$nu`
-    let mut table = vec![];
-    for v in env {
-        if v.0 == "PATH" || v.0 == "Path" {
-            for path in std::env::split_paths(&v.1) {
-                table.push(UntaggedValue::filepath(path).into_value(&tag));
-            }
-        }
-    }
-    nu_dict.insert_value("path", UntaggedValue::table(&table).into_value(&tag));
-
-    let path = std::env::current_dir()?;
-    nu_dict.insert_value("cwd", UntaggedValue::filepath(path).into_value(&tag));
-
-    if let Some(home) = crate::filesystem::filesystem_shell::homedir_if_possible() {
-        nu_dict.insert_value("home-dir", UntaggedValue::filepath(home).into_value(&tag));
-    }
-
-    let temp = std::env::temp_dir();
-    nu_dict.insert_value("temp-dir", UntaggedValue::filepath(temp).into_value(&tag));
-
-    #[cfg(feature = "rustyline-support")]
-    {
-        let keybinding_path = nu_data::keybinding::keybinding_path()?;
-        nu_dict.insert_value(
-            "keybinding-path",
-            UntaggedValue::filepath(keybinding_path).into_value(&tag),
-        );
-    }
-
-    let cmd_info = lang::Lang::query_commands(scope);
-    match cmd_info {
-        Ok(cmds) => nu_dict.insert_value("lang", UntaggedValue::table(&cmds).into_value(&tag)),
-        Err(_) => nu_dict.insert_value("lang", UntaggedValue::string("no commands found")),
-    }
-
-    Ok(nu_dict.into_value())
-}
-
-pub fn scope(
-    aliases: &IndexMap<String, Vec<Spanned<String>>>,
-    commands: &IndexMap<String, Signature>,
-    variables: &IndexMap<String, Value>,
-) -> Result<Value, ShellError> {
-    let tag = Tag::unknown();
-
-    let mut scope_dict = TaggedDictBuilder::new(&tag);
-
-    let mut aliases_dict = TaggedDictBuilder::new(&tag);
-    for v in aliases {
-        let values = v.1.clone();
-        let mut vec = Vec::new();
-
-        for k in &values {
-            vec.push(k.to_string());
-        }
-
-        let alias = vec.join(" ");
-
-        aliases_dict.insert_untagged(v.0, UntaggedValue::string(alias));
-    }
-
-    let mut commands_dict = TaggedDictBuilder::new(&tag);
-    for (name, signature) in commands {
-        commands_dict.insert_untagged(name, UntaggedValue::string(&signature.allowed().join(" ")))
-    }
-
-    let var_list: Vec<Value> = variables
-        .iter()
-        .map(|var| {
-            let mut entries: IndexMap<String, Value> = IndexMap::new();
-            let name = var.0.trim_start_matches('$');
-            entries.insert(
-                "name".to_string(),
-                UntaggedValue::string(name).into_value(&tag),
-            );
-            entries.insert(
-                "value".to_string(),
-                UntaggedValue::string(var.1.convert_to_string()).into_value(&tag),
-            );
-            entries.insert(
-                "type".to_string(),
-                UntaggedValue::string(ShellTypeName::type_name(&var.1)).into_value(&tag),
-            );
-            UntaggedValue::Row(Dictionary { entries }).into_value(&tag)
-        })
-        .collect();
-
-    scope_dict.insert_value("aliases", aliases_dict.into_value());
-
-    scope_dict.insert_value("commands", commands_dict.into_value());
-
-    scope_dict.insert_value("variables", UntaggedValue::Table(var_list).into_value(&tag));
-
-    Ok(scope_dict.into_value())
-}
diff --git a/old_nushell/crates/nu-engine/src/evaluation_context.rs b/old_nushell/crates/nu-engine/src/evaluation_context.rs
deleted file mode 100644
index cab85f129..000000000
--- a/old_nushell/crates/nu-engine/src/evaluation_context.rs
+++ /dev/null
@@ -1,440 +0,0 @@
-use crate::evaluate::envvar::EnvVar;
-use crate::evaluate::evaluator::Variable;
-use crate::evaluate::scope::{Scope, ScopeFrame};
-use crate::shell::palette::ThemedPalette;
-use crate::shell::shell_manager::ShellManager;
-use crate::whole_stream_command::Command;
-use crate::{call_info::UnevaluatedCallInfo, config_holder::ConfigHolder};
-use crate::{command_args::CommandArgs, script};
-use crate::{env::basic_host::BasicHost, Host};
-
-use nu_data::config::{self, Conf, NuConfig};
-use nu_errors::ShellError;
-use nu_path::expand_path;
-use nu_protocol::{hir, ConfigPath, VariableRegistry};
-use nu_source::Spanned;
-use nu_source::{Span, Tag};
-use nu_stream::InputStream;
-use nu_test_support::NATIVE_PATH_ENV_VAR;
-
-use indexmap::IndexMap;
-use log::trace;
-use parking_lot::Mutex;
-use std::fs::File;
-use std::io::BufReader;
-use std::sync::atomic::AtomicBool;
-use std::{path::Path, sync::Arc};
-
-#[derive(Clone, Default)]
-pub struct EngineState {
-    pub host: Arc<parking_lot::Mutex<Box<dyn Host>>>,
-    pub current_errors: Arc<Mutex<Vec<ShellError>>>,
-    pub ctrl_c: Arc<AtomicBool>,
-    pub configs: Arc<Mutex<ConfigHolder>>,
-    pub shell_manager: ShellManager,
-
-    /// Windows-specific: keep track of previous cwd on each drive
-    pub windows_drives_previous_cwd: Arc<Mutex<std::collections::HashMap<String, String>>>,
-}
-#[derive(Clone, Default)]
-pub struct EvaluationContext {
-    pub scope: Scope,
-    pub engine_state: Arc<EngineState>,
-}
-
-impl EvaluationContext {
-    pub fn new(
-        scope: Scope,
-        host: Arc<parking_lot::Mutex<Box<dyn Host>>>,
-        current_errors: Arc<Mutex<Vec<ShellError>>>,
-        ctrl_c: Arc<AtomicBool>,
-        configs: Arc<Mutex<ConfigHolder>>,
-        shell_manager: ShellManager,
-        windows_drives_previous_cwd: Arc<Mutex<std::collections::HashMap<String, String>>>,
-    ) -> Self {
-        Self {
-            scope,
-            engine_state: Arc::new(EngineState {
-                host,
-                current_errors,
-                ctrl_c,
-                configs,
-                shell_manager,
-                windows_drives_previous_cwd,
-            }),
-        }
-    }
-
-    pub fn basic() -> EvaluationContext {
-        let scope = Scope::new();
-        let host = BasicHost {};
-        let env_vars: IndexMap<String, EnvVar> = host
-            .vars()
-            .iter()
-            .cloned()
-            .map(|(k, v)| (k, v.into()))
-            .collect();
-        scope.add_env(env_vars);
-
-        EvaluationContext {
-            scope,
-            engine_state: Arc::new(EngineState {
-                host: Arc::new(parking_lot::Mutex::new(Box::new(host))),
-                current_errors: Arc::new(Mutex::new(vec![])),
-                ctrl_c: Arc::new(AtomicBool::new(false)),
-                configs: Arc::new(Mutex::new(ConfigHolder::new())),
-                shell_manager: ShellManager::basic(),
-                windows_drives_previous_cwd: Arc::new(Mutex::new(std::collections::HashMap::new())),
-            }),
-        }
-    }
-
-    pub fn error(&self, error: ShellError) {
-        self.with_errors(|errors| errors.push(error))
-    }
-
-    pub fn host(&self) -> &Arc<parking_lot::Mutex<Box<dyn Host>>> {
-        &self.engine_state.host
-    }
-
-    pub fn current_errors(&self) -> &Arc<Mutex<Vec<ShellError>>> {
-        &self.engine_state.current_errors
-    }
-
-    pub fn ctrl_c(&self) -> &Arc<AtomicBool> {
-        &self.engine_state.ctrl_c
-    }
-
-    pub fn configs(&self) -> &Arc<Mutex<ConfigHolder>> {
-        &self.engine_state.configs
-    }
-
-    pub fn shell_manager(&self) -> &ShellManager {
-        &self.engine_state.shell_manager
-    }
-
-    pub fn windows_drives_previous_cwd(
-        &self,
-    ) -> &Arc<Mutex<std::collections::HashMap<String, String>>> {
-        &self.engine_state.windows_drives_previous_cwd
-    }
-
-    pub fn clear_errors(&self) {
-        self.engine_state.current_errors.lock().clear()
-    }
-
-    pub fn get_errors(&self) -> Vec<ShellError> {
-        self.engine_state.current_errors.lock().clone()
-    }
-
-    pub fn configure<T>(
-        &mut self,
-        config: &dyn nu_data::config::Conf,
-        block: impl FnOnce(&dyn nu_data::config::Conf, &mut Self) -> T,
-    ) {
-        block(config, &mut *self);
-    }
-
-    pub fn with_host<T>(&self, block: impl FnOnce(&mut dyn Host) -> T) -> T {
-        let mut host = self.engine_state.host.lock();
-
-        block(&mut *host)
-    }
-
-    pub fn with_errors<T>(&self, block: impl FnOnce(&mut Vec<ShellError>) -> T) -> T {
-        let mut errors = self.engine_state.current_errors.lock();
-
-        block(&mut *errors)
-    }
-
-    pub fn add_commands(&self, commands: Vec<Command>) {
-        for command in commands {
-            self.scope.add_command(command.name().to_string(), command);
-        }
-    }
-
-    pub fn sync_path_to_env(&self) {
-        let env_vars = self.scope.get_env_vars();
-
-        for (var, val) in env_vars {
-            if var == NATIVE_PATH_ENV_VAR {
-                std::env::set_var(var, expand_path(val));
-                break;
-            }
-        }
-    }
-
-    pub fn get_command(&self, name: &str) -> Option<Command> {
-        self.scope.get_command(name)
-    }
-
-    pub fn is_command_registered(&self, name: &str) -> bool {
-        self.scope.has_command(name)
-    }
-
-    pub fn run_command(
-        &self,
-        command: Command,
-        name_tag: Tag,
-        args: hir::Call,
-        input: InputStream,
-    ) -> Result<InputStream, ShellError> {
-        let command_args = self.command_args(args, input, name_tag);
-        command.run(command_args)
-    }
-
-    fn call_info(&self, args: hir::Call, name_tag: Tag) -> UnevaluatedCallInfo {
-        UnevaluatedCallInfo { args, name_tag }
-    }
-
-    fn command_args(&self, args: hir::Call, input: InputStream, name_tag: Tag) -> CommandArgs {
-        CommandArgs {
-            context: self.clone(),
-            call_info: self.call_info(args, name_tag),
-            input,
-        }
-    }
-
-    /// Loads config under cfg_path.
-    /// If an error occurs while loading the config:
-    ///     The config is not loaded
-    ///     The error is returned
-    /// After successful loading of the config the startup scripts are run
-    /// as normal scripts (Errors are printed out, ...)
-    /// After executing the startup scripts, true is returned to indicate successful loading
-    /// of the config
-    //
-    // The rational here is that, we should not partially load any config
-    // that might be damaged. However, startup scripts might fail for various reasons.
-    // A failure there is not as crucial as wrong config files.
-    pub fn load_config(&self, cfg_path: &ConfigPath) -> Result<(), ShellError> {
-        trace!("Loading cfg {:?}", cfg_path);
-
-        let cfg = NuConfig::load(Some(cfg_path.get_path().clone()))?;
-        let exit_scripts = cfg.exit_scripts()?;
-        let startup_scripts = cfg.startup_scripts()?;
-        let cfg_paths = cfg.path()?;
-
-        let joined_paths = cfg_paths
-            .map(|mut cfg_paths| {
-                //existing paths are prepended to path
-                let env_paths = self.scope.get_env(NATIVE_PATH_ENV_VAR);
-
-                if let Some(env_paths) = env_paths {
-                    let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>();
-                    //No duplicates! Remove env_paths already existing in cfg_paths
-                    env_paths.retain(|env_path| !cfg_paths.contains(env_path));
-                    //env_paths entries are appended at the end
-                    //nu config paths have a higher priority
-                    cfg_paths.extend(env_paths);
-                }
-                cfg_paths
-            })
-            .map(|paths| {
-                std::env::join_paths(paths)
-                    .map(|s| s.to_string_lossy().to_string())
-                    .map_err(|e| {
-                        ShellError::labeled_error(
-                            &format!("Error while joining paths from config: {:?}", e),
-                            "Config path error",
-                            Span::unknown(),
-                        )
-                    })
-            })
-            .transpose()?;
-
-        let tag = config::cfg_path_to_scope_tag(cfg_path.get_path());
-
-        self.scope.enter_scope_with_tag(tag);
-        let config_env = cfg.env_map();
-        let env_vars = config_env
-            .into_iter()
-            .map(|(k, v)| (k, EnvVar::from(v)))
-            .collect();
-        self.scope.add_env(env_vars);
-        if let Some(path) = joined_paths {
-            self.scope.add_env_var(NATIVE_PATH_ENV_VAR, path);
-        }
-        self.scope.set_exit_scripts(exit_scripts);
-
-        match cfg_path {
-            ConfigPath::Global(_) => self.engine_state.configs.lock().set_global_cfg(cfg),
-            ConfigPath::Local(_) => {
-                self.engine_state.configs.lock().add_local_cfg(cfg);
-            }
-        }
-
-        // The syntax_theme is really the file stem of a json file i.e.
-        // grape.json is the theme file and grape is the file stem and
-        // the syntax_theme and grape.json would be located in the same
-        // folder as the config.toml
-
-        // Let's open the config
-        let global_config = self.engine_state.configs.lock().global_config();
-        // Get the root syntax_theme value
-        let syntax_theme = global_config.var("syntax_theme");
-        // If we have a syntax_theme let's process it
-        if let Some(theme_value) = syntax_theme {
-            // Append the .json to the syntax_theme to form the file name
-            let syntax_theme_filename = format!("{}.json", theme_value.convert_to_string());
-            // Load the syntax config json
-            let config_file_path = cfg_path.get_path();
-            // The syntax file should be in the same location as the config.toml
-            let syntax_file_path = if config_file_path.ends_with("config.toml") {
-                config_file_path
-                    .display()
-                    .to_string()
-                    .replace("config.toml", &syntax_theme_filename)
-            } else {
-                "".to_string()
-            };
-            // if we have a syntax_file_path use it otherwise default
-            if Path::new(&syntax_file_path).exists() {
-                // eprintln!("Loading syntax file: [{:?}]", syntax_file_path);
-                let syntax_theme_file = File::open(syntax_file_path)?;
-                let mut reader = BufReader::new(syntax_theme_file);
-                let theme = ThemedPalette::new(&mut reader).unwrap_or_default();
-                // eprintln!("Theme: [{:?}]", theme);
-                self.engine_state.configs.lock().set_syntax_colors(theme);
-            } else {
-                // If the file was missing, use the default
-                self.engine_state
-                    .configs
-                    .lock()
-                    .set_syntax_colors(ThemedPalette::default())
-            }
-        } else {
-            // if there's no syntax_theme, use the default
-            self.engine_state
-                .configs
-                .lock()
-                .set_syntax_colors(ThemedPalette::default())
-        };
-
-        if !startup_scripts.is_empty() {
-            self.run_scripts(startup_scripts, cfg_path.get_path().parent());
-        }
-
-        Ok(())
-    }
-
-    /// Reloads config with a path of cfg_path.
-    /// If an error occurs while reloading the config:
-    ///     The config is not reloaded
-    ///     The error is returned
-    pub fn reload_config(&self, cfg: &mut NuConfig) -> Result<(), ShellError> {
-        trace!("Reloading cfg {:?}", cfg.file_path);
-
-        cfg.reload();
-
-        let exit_scripts = cfg.exit_scripts()?;
-        let cfg_paths = cfg.path()?;
-
-        let joined_paths = cfg_paths
-            .map(|mut cfg_paths| {
-                //existing paths are prepended to path
-                let env_paths = self.scope.get_env(NATIVE_PATH_ENV_VAR);
-
-                if let Some(env_paths) = env_paths {
-                    let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>();
-                    //No duplicates! Remove env_paths already existing in cfg_paths
-                    env_paths.retain(|env_path| !cfg_paths.contains(env_path));
-                    //env_paths entries are appended at the end
-                    //nu config paths have a higher priority
-                    cfg_paths.extend(env_paths);
-                }
-                cfg_paths
-            })
-            .map(|paths| {
-                std::env::join_paths(paths)
-                    .map(|s| s.to_string_lossy().to_string())
-                    .map_err(|e| {
-                        ShellError::labeled_error(
-                            &format!("Error while joining paths from config: {:?}", e),
-                            "Config path error",
-                            Span::unknown(),
-                        )
-                    })
-            })
-            .transpose()?;
-
-        let tag = config::cfg_path_to_scope_tag(&cfg.file_path);
-        let mut frame = ScopeFrame::with_tag(tag.clone());
-        let config_env = cfg.env_map();
-        let env_vars = config_env
-            .into_iter()
-            .map(|(k, v)| (k, EnvVar::from(v)))
-            .collect();
-        frame.env = env_vars;
-        if let Some(path) = joined_paths {
-            frame
-                .env
-                .insert(NATIVE_PATH_ENV_VAR.to_string(), path.into());
-        }
-        frame.exitscripts = exit_scripts;
-
-        self.scope.update_frame_with_tag(frame, &tag)?;
-
-        Ok(())
-    }
-
-    /// Runs all exit_scripts before unloading the config with path of cfg_path
-    /// If an error occurs while running exit scripts:
-    ///     The error is added to `self.current_errors`
-    /// If no config with path of `cfg_path` is present, this method does nothing
-    pub fn unload_config(&self, cfg_path: &ConfigPath) {
-        trace!("UnLoading cfg {:?}", cfg_path);
-
-        let tag = config::cfg_path_to_scope_tag(cfg_path.get_path());
-
-        //Run exitscripts with scope frame and cfg still applied
-        if let Some(scripts) = self.scope.get_exitscripts_of_frame_with_tag(&tag) {
-            self.run_scripts(scripts, cfg_path.get_path().parent());
-        }
-
-        //Unload config
-        self.engine_state.configs.lock().remove_cfg(cfg_path);
-        self.scope.exit_scope_with_tag(&tag);
-    }
-
-    /// Runs scripts with cwd of dir. If dir is None, this method does nothing.
-    /// Each error is added to `self.current_errors`
-    pub fn run_scripts(&self, scripts: Vec<String>, dir: Option<&Path>) {
-        if let Some(dir) = dir {
-            for script in scripts {
-                match script::run_script_in_dir(script.clone(), dir, self) {
-                    Ok(_) => {}
-                    Err(e) => {
-                        let err = ShellError::untagged_runtime_error(format!(
-                            "Err while executing exitscript. Err was\n{:?}",
-                            e
-                        ));
-                        let text = script.into();
-                        self.engine_state.host.lock().print_err(err, &text);
-                    }
-                }
-            }
-        }
-    }
-}
-
-use itertools::Itertools;
-
-impl VariableRegistry for EvaluationContext {
-    fn get_variable(&self, name: &Spanned<&str>) -> Option<nu_protocol::Value> {
-        let span = name.span;
-        let name = nu_protocol::hir::Expression::variable(name.item.to_string(), name.span);
-
-        let var = Variable::from(&name);
-
-        crate::evaluate::evaluator::evaluate_reference(&var, self, span).ok()
-    }
-
-    fn variables(&self) -> Vec<String> {
-        Variable::list()
-            .into_iter()
-            .chain(self.scope.get_variable_names())
-            .unique()
-            .collect()
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/example.rs b/old_nushell/crates/nu-engine/src/example.rs
deleted file mode 100644
index 41a93ea5a..000000000
--- a/old_nushell/crates/nu-engine/src/example.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use nu_protocol::Value;
-
-pub struct Example {
-    pub example: &'static str,
-    pub description: &'static str,
-    pub result: Option<Vec<Value>>,
-}
diff --git a/old_nushell/crates/nu-engine/src/filesystem/dir_info.rs b/old_nushell/crates/nu-engine/src/filesystem/dir_info.rs
deleted file mode 100644
index da661b88f..000000000
--- a/old_nushell/crates/nu-engine/src/filesystem/dir_info.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use filesize::file_real_size_fast;
-use glob::Pattern;
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{UntaggedValue, Value};
-use nu_source::Tag;
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-
-pub struct DirBuilder {
-    pub tag: Tag,
-    pub min: Option<u64>,
-    pub deref: bool,
-    pub exclude: Option<Pattern>,
-    pub all: bool,
-}
-
-impl DirBuilder {
-    pub fn new(
-        tag: Tag,
-        min: Option<u64>,
-        deref: bool,
-        exclude: Option<Pattern>,
-        all: bool,
-    ) -> DirBuilder {
-        DirBuilder {
-            tag,
-            min,
-            deref,
-            exclude,
-            all,
-        }
-    }
-}
-
-pub struct DirInfo {
-    dirs: Vec<DirInfo>,
-    files: Vec<FileInfo>,
-    errors: Vec<ShellError>,
-    size: u64,
-    blocks: u64,
-    path: PathBuf,
-    tag: Tag,
-}
-
-pub struct FileInfo {
-    path: PathBuf,
-    size: u64,
-    blocks: Option<u64>,
-    tag: Tag,
-}
-
-impl FileInfo {
-    pub fn new(path: impl Into<PathBuf>, deref: bool, tag: Tag) -> Result<Self, ShellError> {
-        let path = path.into();
-        let m = if deref {
-            std::fs::metadata(&path)
-        } else {
-            std::fs::symlink_metadata(&path)
-        };
-
-        match m {
-            Ok(d) => {
-                let block_size = file_real_size_fast(&path, &d).ok();
-
-                Ok(FileInfo {
-                    path,
-                    blocks: block_size,
-                    size: d.len(),
-                    tag,
-                })
-            }
-            Err(e) => Err(e.into()),
-        }
-    }
-}
-
-impl DirInfo {
-    pub fn new(
-        path: impl Into<PathBuf>,
-        params: &DirBuilder,
-        depth: Option<u64>,
-        ctrl_c: Arc<AtomicBool>,
-    ) -> Self {
-        let path = path.into();
-
-        let mut s = Self {
-            dirs: Vec::new(),
-            errors: Vec::new(),
-            files: Vec::new(),
-            size: 0,
-            blocks: 0,
-            tag: params.tag.clone(),
-            path,
-        };
-
-        match std::fs::metadata(&s.path) {
-            Ok(d) => {
-                s.size = d.len(); // dir entry size
-                s.blocks = file_real_size_fast(&s.path, &d).ok().unwrap_or(0);
-            }
-            Err(e) => s = s.add_error(e.into()),
-        };
-
-        match std::fs::read_dir(&s.path) {
-            Ok(d) => {
-                for f in d {
-                    if ctrl_c.load(Ordering::SeqCst) {
-                        break;
-                    }
-
-                    match f {
-                        Ok(i) => match i.file_type() {
-                            Ok(t) if t.is_dir() => {
-                                s = s.add_dir(i.path(), depth, params, ctrl_c.clone())
-                            }
-                            Ok(_t) => s = s.add_file(i.path(), params),
-                            Err(e) => s = s.add_error(e.into()),
-                        },
-                        Err(e) => s = s.add_error(e.into()),
-                    }
-                }
-            }
-            Err(e) => s = s.add_error(e.into()),
-        }
-        s
-    }
-
-    fn add_dir(
-        mut self,
-        path: impl Into<PathBuf>,
-        mut depth: Option<u64>,
-        params: &DirBuilder,
-        ctrl_c: Arc<AtomicBool>,
-    ) -> Self {
-        if let Some(current) = depth {
-            if let Some(new) = current.checked_sub(1) {
-                depth = Some(new);
-            } else {
-                return self;
-            }
-        }
-
-        let d = DirInfo::new(path, params, depth, ctrl_c);
-        self.size += d.size;
-        self.blocks += d.blocks;
-        self.dirs.push(d);
-        self
-    }
-
-    fn add_file(mut self, f: impl Into<PathBuf>, params: &DirBuilder) -> Self {
-        let f = f.into();
-        let include = params
-            .exclude
-            .as_ref()
-            .map_or(true, |x| !x.matches_path(&f));
-        if include {
-            match FileInfo::new(f, params.deref, self.tag.clone()) {
-                Ok(file) => {
-                    let inc = params.min.map_or(true, |s| file.size >= s);
-                    if inc {
-                        self.size += file.size;
-                        self.blocks += file.blocks.unwrap_or(0);
-                        if params.all {
-                            self.files.push(file);
-                        }
-                    }
-                }
-                Err(e) => self = self.add_error(e),
-            }
-        }
-        self
-    }
-
-    fn add_error(mut self, e: ShellError) -> Self {
-        self.errors.push(e);
-        self
-    }
-
-    pub fn get_size(&self) -> u64 {
-        self.size
-    }
-}
-
-impl From<DirInfo> for Value {
-    fn from(d: DirInfo) -> Self {
-        let mut r: IndexMap<String, Value> = IndexMap::new();
-
-        r.insert(
-            "path".to_string(),
-            UntaggedValue::filepath(d.path).into_value(&d.tag),
-        );
-
-        r.insert(
-            "apparent".to_string(),
-            UntaggedValue::filesize(d.size).into_value(&d.tag),
-        );
-
-        r.insert(
-            "physical".to_string(),
-            UntaggedValue::filesize(d.blocks).into_value(&d.tag),
-        );
-
-        r.insert("directories".to_string(), value_from_vec(d.dirs, &d.tag));
-
-        r.insert("files".to_string(), value_from_vec(d.files, &d.tag));
-
-        if !d.errors.is_empty() {
-            let v = UntaggedValue::Table(
-                d.errors
-                    .into_iter()
-                    .map(move |e| UntaggedValue::Error(e).into_untagged_value())
-                    .collect::<Vec<Value>>(),
-            )
-            .into_value(&d.tag);
-
-            r.insert("errors".to_string(), v);
-        }
-
-        Value {
-            value: UntaggedValue::row(r),
-            tag: d.tag,
-        }
-    }
-}
-
-impl From<FileInfo> for Value {
-    fn from(f: FileInfo) -> Self {
-        let mut r: IndexMap<String, Value> = IndexMap::new();
-
-        r.insert(
-            "path".to_string(),
-            UntaggedValue::filepath(f.path).into_value(&f.tag),
-        );
-
-        r.insert(
-            "apparent".to_string(),
-            UntaggedValue::filesize(f.size).into_value(&f.tag),
-        );
-
-        let b = f
-            .blocks
-            .map(UntaggedValue::filesize)
-            .unwrap_or_else(UntaggedValue::nothing)
-            .into_value(&f.tag);
-
-        r.insert("physical".to_string(), b);
-
-        r.insert(
-            "directories".to_string(),
-            UntaggedValue::nothing().into_value(&f.tag),
-        );
-
-        r.insert(
-            "files".to_string(),
-            UntaggedValue::nothing().into_value(&f.tag),
-        );
-
-        UntaggedValue::row(r).into_value(&f.tag)
-    }
-}
-
-fn value_from_vec<V>(vec: Vec<V>, tag: &Tag) -> Value
-where
-    V: Into<Value>,
-{
-    if vec.is_empty() {
-        UntaggedValue::nothing()
-    } else {
-        let values = vec.into_iter().map(Into::into).collect::<Vec<Value>>();
-        UntaggedValue::Table(values)
-    }
-    .into_value(tag)
-}
diff --git a/old_nushell/crates/nu-engine/src/filesystem/filesystem_shell.rs b/old_nushell/crates/nu-engine/src/filesystem/filesystem_shell.rs
deleted file mode 100644
index f221553ae..000000000
--- a/old_nushell/crates/nu-engine/src/filesystem/filesystem_shell.rs
+++ /dev/null
@@ -1,1234 +0,0 @@
-use crate::filesystem::utils::FileStructure;
-use crate::maybe_text_codec::{MaybeTextCodec, StringOrBinary};
-use crate::shell::shell_args::{CdArgs, CopyArgs, LsArgs, MkdirArgs, MvArgs, RemoveArgs};
-use crate::shell::Shell;
-use crate::BufCodecReader;
-use crate::{
-    filesystem::dir_info::{DirBuilder, DirInfo},
-    CommandArgs,
-};
-use encoding_rs::Encoding;
-use nu_data::config::LocalConfigDiff;
-use nu_path::{canonicalize, canonicalize_with, expand_path_with};
-use nu_protocol::{CommandAction, ConfigPath, TaggedDictBuilder, Value};
-use nu_source::{Span, Tag};
-use nu_stream::{ActionStream, Interruptible, IntoActionStream, OutputStream};
-use std::collections::VecDeque;
-use std::fs::OpenOptions;
-use std::io::{ErrorKind, Write};
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::{collections::HashMap, io::BufReader};
-
-#[cfg(unix)]
-use std::os::unix::fs::PermissionsExt;
-
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, UntaggedValue};
-use nu_source::Tagged;
-
-const GLOB_PARAMS: glob::MatchOptions = glob::MatchOptions {
-    case_sensitive: true,
-    require_literal_separator: false,
-    require_literal_leading_dot: false,
-};
-
-#[derive(Eq, PartialEq, Clone, Copy)]
-pub enum FilesystemShellMode {
-    Cli,
-    Script,
-}
-
-pub struct FilesystemShell {
-    pub(crate) path: String,
-    pub(crate) last_path: String,
-    pub(crate) mode: FilesystemShellMode,
-}
-
-impl std::fmt::Debug for FilesystemShell {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "FilesystemShell @ {}", self.path)
-    }
-}
-
-impl Clone for FilesystemShell {
-    fn clone(&self) -> Self {
-        FilesystemShell {
-            path: self.path.clone(),
-            last_path: self.path.clone(),
-            mode: self.mode,
-        }
-    }
-}
-
-impl FilesystemShell {
-    fn is_cli(&self) -> bool {
-        matches!(&self.mode, FilesystemShellMode::Cli)
-    }
-
-    pub fn basic(mode: FilesystemShellMode) -> FilesystemShell {
-        let path = match std::env::current_dir() {
-            Ok(path) => path,
-            Err(_) => PathBuf::from("/"),
-        };
-
-        FilesystemShell {
-            path: path.to_string_lossy().to_string(),
-            last_path: path.to_string_lossy().to_string(),
-            mode,
-        }
-    }
-
-    pub fn with_location(
-        path: String,
-        mode: FilesystemShellMode,
-    ) -> Result<FilesystemShell, std::io::Error> {
-        let path = canonicalize_with(&path, std::env::current_dir()?)?;
-        let path = path.display().to_string();
-        let last_path = path.clone();
-
-        Ok(FilesystemShell {
-            path,
-            last_path,
-            mode,
-        })
-    }
-}
-
-pub fn homedir_if_possible() -> Option<PathBuf> {
-    dirs_next::home_dir()
-}
-
-impl Shell for FilesystemShell {
-    fn name(&self) -> String {
-        "filesystem".to_string()
-    }
-
-    fn homedir(&self) -> Option<PathBuf> {
-        homedir_if_possible()
-    }
-
-    fn ls(
-        &self,
-        LsArgs {
-            path,
-            all,
-            long,
-            short_names,
-            du,
-        }: LsArgs,
-        name_tag: Tag,
-        ctrl_c: Arc<AtomicBool>,
-    ) -> Result<ActionStream, ShellError> {
-        let ctrl_c_copy = ctrl_c.clone();
-        let (path, p_tag) = match path {
-            Some(p) => {
-                let p_tag = p.tag;
-                let mut p = p.item;
-                if p.is_dir() {
-                    if permission_denied(&p) {
-                        #[cfg(unix)]
-                        let error_msg = format!(
-                            "The permissions of {:o} do not allow access for this user",
-                            p.metadata()
-                                .expect(
-                                    "this shouldn't be called since we already know there is a dir"
-                                )
-                                .permissions()
-                                .mode()
-                                & 0o0777
-                        );
-                        #[cfg(not(unix))]
-                        let error_msg = String::from("Permission denied");
-                        return Err(ShellError::labeled_error(
-                            "Permission denied",
-                            error_msg,
-                            &p_tag,
-                        ));
-                    }
-                    if is_empty_dir(&p) {
-                        return Ok(ActionStream::empty());
-                    }
-                    p.push("*");
-                }
-                (p, p_tag)
-            }
-            None => {
-                if is_empty_dir(&self.path()) {
-                    return Ok(ActionStream::empty());
-                } else {
-                    (PathBuf::from("./*"), name_tag.clone())
-                }
-            }
-        };
-
-        let hidden_dir_specified = is_hidden_dir(&path);
-
-        let mut paths = glob::glob_with(&path.to_string_lossy(), GLOB_PARAMS)
-            .map_err(|e| ShellError::labeled_error(e.to_string(), "invalid pattern", &p_tag))?
-            .peekable();
-
-        if paths.peek().is_none() {
-            return Err(ShellError::labeled_error(
-                "No matches found",
-                "no matches found",
-                &p_tag,
-            ));
-        }
-
-        let mut hidden_dirs = vec![];
-
-        // Generated stream: impl Stream<Item = Result<ReturnSuccess, ShellError>
-
-        Ok(paths
-            .filter_map(move |path| {
-                let path = match path.map_err(|e| ShellError::from(e.into_error())) {
-                    Ok(path) => path,
-                    Err(err) => return Some(Err(err)),
-                };
-
-                if path_contains_hidden_folder(&path, &hidden_dirs) {
-                    return None;
-                }
-
-                if !all && !hidden_dir_specified && is_hidden_dir(&path) {
-                    if path.is_dir() {
-                        hidden_dirs.push(path);
-                    }
-                    return None;
-                }
-
-                let metadata = match std::fs::symlink_metadata(&path) {
-                    Ok(metadata) => Some(metadata),
-                    Err(e) => {
-                        if e.kind() == ErrorKind::PermissionDenied || e.kind() == ErrorKind::Other {
-                            None
-                        } else {
-                            return Some(Err(e.into()));
-                        }
-                    }
-                };
-
-                let entry = dir_entry_dict(
-                    &path,
-                    metadata.as_ref(),
-                    name_tag.clone(),
-                    long,
-                    short_names,
-                    du,
-                    ctrl_c.clone(),
-                )
-                .map(ReturnSuccess::Value);
-
-                Some(entry)
-            })
-            .interruptible(ctrl_c_copy)
-            .into_action_stream())
-    }
-
-    fn cd(&self, args: CdArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let path = match args.path {
-            None => match homedir_if_possible() {
-                Some(o) => o,
-                _ => {
-                    return Err(ShellError::labeled_error(
-                        "Cannot change to home directory",
-                        "cannot go to home",
-                        &name,
-                    ))
-                }
-            },
-            Some(v) => {
-                let Tagged { item: target, tag } = v;
-                if target == Path::new("-") {
-                    PathBuf::from(&self.last_path)
-                } else {
-                    // Extra expand attempt allows cd from /home/user/non-existent-dir/..
-                    // to /home/user
-                    let path = match canonicalize_with(&target, self.path()) {
-                        Ok(p) => p,
-                        _ => expand_path_with(&target, self.path()),
-                    };
-
-                    if !path.exists() {
-                        return Err(ShellError::labeled_error(
-                            "Cannot change to directory",
-                            "directory not found",
-                            &tag,
-                        ));
-                    }
-
-                    if !path.is_dir() {
-                        return Err(ShellError::labeled_error(
-                            "Cannot change to directory",
-                            "is not a directory",
-                            &tag,
-                        ));
-                    }
-
-                    #[cfg(unix)]
-                    {
-                        let has_exec = path
-                            .metadata()
-                            .map(|m| {
-                                umask::Mode::from(m.permissions().mode()).has(umask::USER_READ)
-                            })
-                            .map_err(|e| {
-                                ShellError::labeled_error(
-                                    "Cannot change to directory",
-                                    format!("cannot stat ({})", e),
-                                    &tag,
-                                )
-                            })?;
-
-                        if !has_exec {
-                            return Err(ShellError::labeled_error(
-                                "Cannot change to directory",
-                                "permission denied",
-                                &tag,
-                            ));
-                        }
-                    }
-
-                    path
-                }
-            }
-        };
-
-        let mut stream = VecDeque::new();
-
-        stream.push_back(ReturnSuccess::change_cwd(
-            path.to_string_lossy().to_string(),
-        ));
-
-        //Loading local configs in script mode, makes scripts behave different on different
-        //filesystems and might therefore surprise users. That's why we only load them in cli mode.
-        if self.is_cli() {
-            match canonicalize(self.path()) {
-                Err(e) => {
-                    let err = ShellError::untagged_runtime_error(format!(
-                        "Could not get absolute path from current fs shell. The error was: {:?}",
-                        e
-                    ));
-                    stream.push_back(ReturnSuccess::value(
-                        UntaggedValue::Error(err).into_value(Tag::unknown()),
-                    ));
-                }
-                Ok(current_pwd) => {
-                    let (changes, errs) = LocalConfigDiff::between(current_pwd, path);
-
-                    for err in errs {
-                        stream.push_back(ReturnSuccess::value(
-                            UntaggedValue::Error(err).into_value(Tag::unknown()),
-                        ));
-                    }
-
-                    for unload_cfg in changes.cfgs_to_unload {
-                        stream.push_back(ReturnSuccess::action(CommandAction::UnloadConfig(
-                            ConfigPath::Local(unload_cfg),
-                        )));
-                    }
-
-                    for load_cfg in changes.cfgs_to_load {
-                        stream.push_back(ReturnSuccess::action(CommandAction::LoadConfig(
-                            ConfigPath::Local(load_cfg),
-                        )));
-                    }
-                }
-            };
-        }
-
-        Ok(stream.into())
-    }
-
-    fn cp(
-        &self,
-        CopyArgs {
-            src,
-            dst,
-            recursive,
-        }: CopyArgs,
-        name: Tag,
-        path: &str,
-    ) -> Result<ActionStream, ShellError> {
-        let name_tag = name;
-
-        let path = Path::new(path);
-        let source = path.join(&src.item);
-        let destination = path.join(&dst.item);
-
-        let sources: Vec<_> = match glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS) {
-            Ok(files) => files.collect(),
-            Err(e) => {
-                return Err(ShellError::labeled_error(
-                    e.to_string(),
-                    "invalid pattern",
-                    src.tag,
-                ))
-            }
-        };
-
-        if sources.is_empty() {
-            return Err(ShellError::labeled_error(
-                "No matches found",
-                "no matches found",
-                src.tag,
-            ));
-        }
-
-        if sources.len() > 1 && !destination.is_dir() {
-            return Err(ShellError::labeled_error(
-                "Destination must be a directory when copying multiple files",
-                "is not a directory",
-                dst.tag,
-            ));
-        }
-
-        let any_source_is_dir = sources.iter().any(|f| matches!(f, Ok(f) if f.is_dir()));
-
-        if any_source_is_dir && !recursive {
-            return Err(ShellError::labeled_error(
-                "Directories must be copied using \"--recursive\"",
-                "resolves to a directory (not copied)",
-                src.tag,
-            ));
-        }
-
-        for entry in sources.into_iter().flatten() {
-            let mut sources = FileStructure::new();
-            sources.walk_decorate(&entry)?;
-
-            if entry.is_file() {
-                let sources = sources.paths_applying_with(|(source_file, _depth_level)| {
-                    if destination.is_dir() {
-                        let mut dest = canonicalize_with(&dst.item, &path)?;
-                        if let Some(name) = entry.file_name() {
-                            dest.push(name);
-                        }
-                        Ok((source_file, dest))
-                    } else {
-                        Ok((source_file, destination.clone()))
-                    }
-                })?;
-
-                for (src, dst) in sources {
-                    if src.is_file() {
-                        std::fs::copy(src, dst).map_err(|e| {
-                            ShellError::labeled_error(e.to_string(), e.to_string(), &name_tag)
-                        })?;
-                    }
-                }
-            } else if entry.is_dir() {
-                let destination = if !destination.exists() {
-                    destination.clone()
-                } else {
-                    match entry.file_name() {
-                        Some(name) => destination.join(name),
-                        None => {
-                            return Err(ShellError::labeled_error(
-                                "Copy aborted. Not a valid path",
-                                "not a valid path",
-                                dst.tag,
-                            ))
-                        }
-                    }
-                };
-
-                std::fs::create_dir_all(&destination).map_err(|e| {
-                    ShellError::labeled_error(e.to_string(), e.to_string(), &dst.tag)
-                })?;
-
-                let sources = sources.paths_applying_with(|(source_file, depth_level)| {
-                    let mut dest = destination.clone();
-                    let path = canonicalize_with(&source_file, &path)?;
-
-                    let comps: Vec<_> = path
-                        .components()
-                        .map(|fragment| fragment.as_os_str())
-                        .rev()
-                        .take(1 + depth_level)
-                        .collect();
-
-                    for fragment in comps.into_iter().rev() {
-                        dest.push(fragment);
-                    }
-
-                    Ok((PathBuf::from(&source_file), dest))
-                })?;
-
-                let dst_tag = &dst.tag;
-                for (src, dst) in sources {
-                    if src.is_dir() && !dst.exists() {
-                        std::fs::create_dir_all(&dst).map_err(|e| {
-                            ShellError::labeled_error(e.to_string(), e.to_string(), dst_tag)
-                        })?;
-                    }
-
-                    if src.is_file() {
-                        std::fs::copy(&src, &dst).map_err(|e| {
-                            ShellError::labeled_error(e.to_string(), e.to_string(), &name_tag)
-                        })?;
-                    }
-                }
-            }
-        }
-
-        Ok(ActionStream::empty())
-    }
-
-    fn mkdir(
-        &self,
-        MkdirArgs {
-            rest: directories,
-            show_created_paths,
-        }: MkdirArgs,
-        name: Tag,
-        path: &str,
-    ) -> Result<OutputStream, ShellError> {
-        let path = Path::new(path);
-        let mut stream = VecDeque::new();
-
-        if directories.is_empty() {
-            return Err(ShellError::labeled_error(
-                "mkdir requires directory paths",
-                "needs parameter",
-                name,
-            ));
-        }
-
-        for dir in &directories {
-            let create_at = path.join(&dir.item);
-
-            let dir_res = std::fs::create_dir_all(&create_at);
-            if let Err(reason) = dir_res {
-                return Err(ShellError::labeled_error(
-                    reason.to_string(),
-                    reason.to_string(),
-                    dir.tag(),
-                ));
-            }
-            if show_created_paths {
-                let val = format!("{:}", create_at.to_string_lossy()).into();
-                stream.push_back(val);
-            }
-        }
-
-        Ok(stream.into())
-    }
-
-    fn mv(
-        &self,
-        MvArgs { src, dst }: MvArgs,
-        _name: Tag,
-        path: &str,
-    ) -> Result<ActionStream, ShellError> {
-        let path = Path::new(path);
-        let source = path.join(&src.item);
-        let destination = path.join(&dst.item);
-
-        let mut sources = glob::glob_with(&source.to_string_lossy(), GLOB_PARAMS)
-            .map_or_else(|_| Vec::new(), Iterator::collect);
-
-        if sources.is_empty() {
-            return Err(ShellError::labeled_error(
-                "Invalid file or pattern",
-                "invalid file or pattern",
-                src.tag,
-            ));
-        }
-
-        // We have two possibilities.
-        //
-        // First, the destination exists.
-        //  - If a directory, move everything into that directory, otherwise
-        //  - if only a single source, overwrite the file, otherwise
-        //  - error.
-        //
-        // Second, the destination doesn't exist, so we can only rename a single source. Otherwise
-        // it's an error.
-
-        if (destination.exists() && !destination.is_dir() && sources.len() > 1)
-            || (!destination.exists() && sources.len() > 1)
-        {
-            return Err(ShellError::labeled_error(
-                "Can only move multiple sources if destination is a directory",
-                "destination must be a directory when multiple sources",
-                dst.tag,
-            ));
-        }
-
-        let some_if_source_is_destination = sources
-            .iter()
-            .find(|f| matches!(f, Ok(f) if destination.starts_with(f)));
-        if destination.exists() && destination.is_dir() && sources.len() == 1 {
-            if let Some(Ok(filename)) = some_if_source_is_destination {
-                return Err(ShellError::labeled_error(
-                    format!(
-                        "Not possible to move {:?} to itself",
-                        filename.file_name().expect("Invalid file name")
-                    ),
-                    "cannot move to itself",
-                    dst.tag,
-                ));
-            }
-        }
-
-        if let Some(Ok(_filename)) = some_if_source_is_destination {
-            sources = sources
-                .into_iter()
-                .filter(|f| matches!(f, Ok(f) if !destination.starts_with(f)))
-                .collect();
-        }
-
-        for entry in sources.into_iter().flatten() {
-            move_file(
-                TaggedPathBuf(&entry, &src.tag),
-                TaggedPathBuf(&destination, &dst.tag),
-            )?
-        }
-
-        Ok(ActionStream::empty())
-    }
-
-    fn rm(
-        &self,
-        RemoveArgs {
-            rest: targets,
-            recursive,
-            trash: _trash,
-            permanent: _permanent,
-            force: _force,
-        }: RemoveArgs,
-        name: Tag,
-        path: &str,
-    ) -> Result<ActionStream, ShellError> {
-        let rm_always_trash = nu_data::config::config(Tag::unknown())?
-            .get("rm_always_trash")
-            .map(|val| val.is_true())
-            .unwrap_or(false);
-
-        #[cfg(not(feature = "trash-support"))]
-        {
-            if rm_always_trash {
-                return Err(ShellError::untagged_runtime_error(
-                    "Cannot execute `rm`; the current configuration specifies \
-                    `rm_always_trash = true`, but the current nu executable was not \
-                    built with feature `trash_support`.",
-                ));
-            } else if _trash {
-                return Err(ShellError::labeled_error(
-                    "Cannot execute `rm` with option `--trash`; feature `trash-support` not enabled",
-                    "this option is only available if nu is built with the `trash-support` feature",
-                    name
-                ));
-            }
-        }
-
-        let name_tag = name;
-
-        if targets.is_empty() {
-            return Err(ShellError::labeled_error(
-                "rm requires target paths",
-                "needs parameter",
-                name_tag,
-            ));
-        }
-
-        let path = Path::new(path);
-        let mut all_targets: HashMap<PathBuf, Tag> = HashMap::new();
-        for target in targets {
-            let all_dots = target
-                .item
-                .to_str()
-                .map_or(false, |v| v.chars().all(|c| c == '.'));
-
-            if all_dots {
-                return Err(ShellError::labeled_error(
-                    "Cannot remove any parent directory",
-                    "cannot remove any parent directory",
-                    target.tag,
-                ));
-            }
-
-            let path = path.join(&target.item);
-            match glob::glob_with(
-                &path.to_string_lossy(),
-                glob::MatchOptions {
-                    require_literal_leading_dot: true,
-                    ..GLOB_PARAMS
-                },
-            ) {
-                Ok(files) => {
-                    for file in files {
-                        match file {
-                            Ok(ref f) => {
-                                // It is not appropriate to try and remove the
-                                // current directory or its parent when using
-                                // glob patterns.
-                                let name = f.display().to_string();
-                                if name.ends_with("/.") || name.ends_with("/..") {
-                                    continue;
-                                }
-
-                                all_targets
-                                    .entry(f.clone())
-                                    .or_insert_with(|| target.tag.clone());
-                            }
-                            Err(e) => {
-                                return Err(ShellError::labeled_error(
-                                    format!("Could not remove {:}", path.to_string_lossy()),
-                                    e.to_string(),
-                                    &target.tag,
-                                ));
-                            }
-                        }
-                    }
-                }
-                Err(e) => {
-                    return Err(ShellError::labeled_error(
-                        e.to_string(),
-                        e.to_string(),
-                        &name_tag,
-                    ))
-                }
-            };
-        }
-
-        if all_targets.is_empty() && !_force {
-            return Err(ShellError::labeled_error(
-                "No valid paths",
-                "no valid paths",
-                name_tag,
-            ));
-        }
-
-        Ok(all_targets
-            .into_iter()
-            .map(move |(f, tag)| {
-                let is_empty = || match f.read_dir() {
-                    Ok(mut p) => p.next().is_none(),
-                    Err(_) => false,
-                };
-
-                if let Ok(metadata) = f.symlink_metadata() {
-                    #[cfg(unix)]
-                    let is_socket = metadata.file_type().is_socket();
-                    #[cfg(unix)]
-                    let is_fifo = metadata.file_type().is_fifo();
-
-                    #[cfg(not(unix))]
-                    let is_socket = false;
-                    #[cfg(not(unix))]
-                    let is_fifo = false;
-
-                    if metadata.is_file()
-                        || metadata.file_type().is_symlink()
-                        || recursive
-                        || is_socket
-                        || is_fifo
-                        || is_empty()
-                    {
-                        let result;
-                        #[cfg(feature = "trash-support")]
-                        {
-                            use std::io::Error;
-                            result = if _trash || (rm_always_trash && !_permanent) {
-                                trash::delete(&f).map_err(|e: trash::Error| {
-                                    Error::new(ErrorKind::Other, format!("{:?}", e))
-                                })
-                            } else if metadata.is_file() {
-                                std::fs::remove_file(&f)
-                            } else {
-                                std::fs::remove_dir_all(&f)
-                            };
-                        }
-                        #[cfg(not(feature = "trash-support"))]
-                        {
-                            result = if metadata.is_file() || is_socket || is_fifo {
-                                std::fs::remove_file(&f)
-                            } else {
-                                std::fs::remove_dir_all(&f)
-                            };
-                        }
-
-                        if let Err(e) = result {
-                            let msg =
-                                format!("Could not delete because: {:}\nTry '--trash' flag", e);
-                            Err(ShellError::labeled_error(msg, e.to_string(), tag))
-                        } else {
-                            let val = format!("deleted {:}", f.to_string_lossy()).into();
-                            Ok(ReturnSuccess::Value(val))
-                        }
-                    } else {
-                        let msg =
-                            format!("Cannot remove {:}. try --recursive", f.to_string_lossy());
-                        Err(ShellError::labeled_error(
-                            msg,
-                            "cannot remove non-empty directory",
-                            tag,
-                        ))
-                    }
-                } else {
-                    let msg = format!("no such file or directory: {:}", f.to_string_lossy());
-                    Err(ShellError::labeled_error(
-                        msg,
-                        "no such file or directory",
-                        tag,
-                    ))
-                }
-            })
-            .into_action_stream())
-    }
-
-    fn path(&self) -> String {
-        self.path.clone()
-    }
-
-    fn pwd(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let path = PathBuf::from(self.path());
-        let p = match canonicalize(path.as_path()) {
-            Ok(p) => p,
-            Err(_) => {
-                return Err(ShellError::labeled_error(
-                    "unable to show current directory",
-                    "pwd command failed",
-                    &args.call_info.name_tag,
-                ));
-            }
-        };
-
-        Ok(ActionStream::one(ReturnSuccess::value(
-            UntaggedValue::Primitive(Primitive::String(p.to_string_lossy().to_string()))
-                .into_value(&args.call_info.name_tag),
-        )))
-    }
-
-    fn set_path(&mut self, path: String) {
-        let pathbuf = PathBuf::from(&path);
-        let path = match canonicalize_with(pathbuf.as_path(), self.path()) {
-            Ok(path) => {
-                let _ = std::env::set_current_dir(&path);
-                std::env::set_var("PWD", &path);
-                path
-            }
-            _ => {
-                // TODO: handle the case where the path cannot be canonicalized
-                pathbuf
-            }
-        };
-        self.last_path = self.path.clone();
-        self.path = path.to_string_lossy().to_string();
-    }
-
-    fn open(
-        &self,
-        path: &Path,
-        name: Span,
-        with_encoding: Option<&'static Encoding>,
-    ) -> Result<
-        Box<dyn Iterator<Item = Result<StringOrBinary, ShellError>> + Sync + Send>,
-        ShellError,
-    > {
-        let metadata = std::fs::metadata(&path);
-
-        let read_full = if let Ok(metadata) = metadata {
-            // Arbitrarily capping the file at 32 megs, so we don't try to read large files in all at once
-            metadata.is_file() && metadata.len() < (1024 * 1024 * 32)
-        } else {
-            false
-        };
-
-        if read_full {
-            // We should, in theory, be able to read in the whole file as one chunk
-            let buffer = std::fs::read(&path).map_err(|e| {
-                ShellError::labeled_error(
-                    format!("Error opening file: {:?}", e),
-                    "Error opening file",
-                    name,
-                )
-            })?;
-
-            let bytes_mut = bytes::BytesMut::from(&buffer[..]);
-
-            let mut codec = MaybeTextCodec::new(with_encoding);
-
-            match codec.decode(&bytes_mut).map_err(|_| {
-                ShellError::labeled_error("Error opening file", "error opening file", name)
-            })? {
-                Some(sb) => Ok(Box::new(vec![Ok(sb)].into_iter())),
-                None => Ok(Box::new(vec![].into_iter())),
-            }
-        } else {
-            // We don't know that this is a finite file, so treat it as a stream
-            let f = std::fs::File::open(&path).map_err(|e| {
-                ShellError::labeled_error(
-                    format!("Error opening file: {:?}", e),
-                    "Error opening file",
-                    name,
-                )
-            })?;
-            let buf_reader = BufReader::new(f);
-            let buf_codec = BufCodecReader::new(buf_reader, MaybeTextCodec::new(with_encoding));
-
-            Ok(Box::new(buf_codec))
-        }
-    }
-
-    fn save(
-        &mut self,
-        full_path: &Path,
-        save_data: &[u8],
-        name: Span,
-        append: bool,
-    ) -> Result<OutputStream, ShellError> {
-        let mut options = OpenOptions::new();
-        if append {
-            options.append(true).create(true)
-        } else {
-            options.write(true).create(true).truncate(true)
-        };
-
-        match options
-            .open(full_path)
-            .and_then(|ref mut file| file.write_all(save_data))
-        {
-            Ok(_) => Ok(OutputStream::empty()),
-            Err(e) => Err(ShellError::labeled_error(
-                e.to_string(),
-                "IO error while saving",
-                name,
-            )),
-        }
-    }
-
-    fn is_interactive(&self) -> bool {
-        self.mode == FilesystemShellMode::Cli
-    }
-}
-
-struct TaggedPathBuf<'a>(&'a PathBuf, &'a Tag);
-
-fn move_file(from: TaggedPathBuf, to: TaggedPathBuf) -> Result<(), ShellError> {
-    let TaggedPathBuf(from, from_tag) = from;
-    let TaggedPathBuf(to, to_tag) = to;
-
-    if to.exists() && from.is_dir() && to.is_file() {
-        return Err(ShellError::labeled_error(
-            "Cannot rename a directory to a file",
-            "invalid destination",
-            to_tag,
-        ));
-    }
-
-    let destination_dir_exists = if to.is_dir() {
-        true
-    } else {
-        to.parent().map(Path::exists).unwrap_or(true)
-    };
-
-    if !destination_dir_exists {
-        return Err(ShellError::labeled_error(
-            "Destination directory does not exist",
-            "destination does not exist",
-            to_tag,
-        ));
-    }
-
-    let mut to = to.clone();
-    if to.is_dir() {
-        let from_file_name = match from.file_name() {
-            Some(name) => name,
-            None => {
-                return Err(ShellError::labeled_error(
-                    "Not a valid entry name",
-                    "not a valid entry name",
-                    from_tag,
-                ))
-            }
-        };
-
-        to.push(from_file_name);
-    }
-
-    move_item(from, from_tag, &to)
-}
-
-fn move_item(from: &Path, from_tag: &Tag, to: &Path) -> Result<(), ShellError> {
-    // We first try a rename, which is a quick operation. If that doesn't work, we'll try a copy
-    // and remove the old file/folder. This is necessary if we're moving across filesystems or devices.
-    std::fs::rename(&from, &to).or_else(|_| {
-        match if from.is_file() {
-            let mut options = fs_extra::file::CopyOptions::new();
-            options.overwrite = true;
-            fs_extra::file::move_file(from, to, &options)
-        } else {
-            let mut options = fs_extra::dir::CopyOptions::new();
-            options.overwrite = true;
-            options.copy_inside = true;
-            fs_extra::dir::move_dir(from, to, &options)
-        } {
-            Ok(_) => Ok(()),
-            Err(e) => Err(ShellError::labeled_error(
-                format!("Could not move {:?} to {:?}. {:}", from, to, e),
-                "could not move",
-                from_tag,
-            )),
-        }
-    })
-}
-
-fn is_empty_dir(dir: impl AsRef<Path>) -> bool {
-    match dir.as_ref().read_dir() {
-        Err(_) => true,
-        Ok(mut s) => s.next().is_none(),
-    }
-}
-
-fn permission_denied(dir: impl AsRef<Path>) -> bool {
-    match dir.as_ref().read_dir() {
-        Err(e) => matches!(e.kind(), std::io::ErrorKind::PermissionDenied),
-        Ok(_) => false,
-    }
-}
-
-fn is_hidden_dir(dir: impl AsRef<Path>) -> bool {
-    #[cfg(windows)]
-    {
-        use std::os::windows::fs::MetadataExt;
-
-        if let Ok(metadata) = dir.as_ref().metadata() {
-            let attributes = metadata.file_attributes();
-            // https://docs.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants
-            (attributes & 0x2) != 0
-        } else {
-            false
-        }
-    }
-
-    #[cfg(not(windows))]
-    {
-        dir.as_ref()
-            .file_name()
-            .map(|name| name.to_string_lossy().starts_with('.'))
-            .unwrap_or(false)
-    }
-}
-
-#[cfg(unix)]
-use std::os::unix::fs::FileTypeExt;
-
-pub fn get_file_type(md: &std::fs::Metadata) -> &str {
-    let ft = md.file_type();
-    let mut file_type = "Unknown";
-    if ft.is_dir() {
-        file_type = "Dir";
-    } else if ft.is_file() {
-        file_type = "File";
-    } else if ft.is_symlink() {
-        file_type = "Symlink";
-    } else {
-        #[cfg(unix)]
-        {
-            if ft.is_block_device() {
-                file_type = "Block device";
-            } else if ft.is_char_device() {
-                file_type = "Char device";
-            } else if ft.is_fifo() {
-                file_type = "Pipe";
-            } else if ft.is_socket() {
-                file_type = "Socket";
-            }
-        }
-    }
-    file_type
-}
-
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn dir_entry_dict(
-    filename: &std::path::Path,
-    metadata: Option<&std::fs::Metadata>,
-    tag: impl Into<Tag>,
-    long: bool,
-    short_name: bool,
-    du: bool,
-    ctrl_c: Arc<AtomicBool>,
-) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    let mut dict = TaggedDictBuilder::new(&tag);
-    // Insert all columns first to maintain proper table alignment if we can't find (or are not allowed to view) any information
-    if long {
-        #[cfg(windows)]
-        {
-            for column in [
-                "name", "type", "target", "readonly", "size", "created", "accessed", "modified",
-            ] {
-                dict.insert_untagged(column, UntaggedValue::nothing());
-            }
-        }
-
-        #[cfg(unix)]
-        {
-            for column in [
-                "name",
-                "type",
-                "target",
-                "num_links",
-                "inode",
-                "readonly",
-                "mode",
-                "uid",
-                "group",
-                "size",
-                "created",
-                "accessed",
-                "modified",
-            ] {
-                dict.insert_untagged(column, UntaggedValue::nothing());
-            }
-        }
-    } else {
-        for column in ["name", "type", "target", "size", "modified"] {
-            if column == "target" {
-                continue;
-            }
-            dict.insert_untagged(column, UntaggedValue::nothing());
-        }
-    }
-
-    let name = if short_name {
-        filename.file_name().and_then(|s| s.to_str())
-    } else {
-        filename.to_str()
-    }
-    .ok_or_else(|| {
-        ShellError::labeled_error(
-            format!("Invalid file name: {:}", filename.to_string_lossy()),
-            "invalid file name",
-            tag,
-        )
-    })?;
-
-    dict.insert_untagged("name", UntaggedValue::filepath(name));
-
-    if let Some(md) = metadata {
-        dict.insert_untagged("type", get_file_type(md));
-    }
-
-    if long {
-        if let Some(md) = metadata {
-            if md.file_type().is_symlink() {
-                let symlink_target_untagged_value: UntaggedValue;
-                if let Ok(path_to_link) = filename.read_link() {
-                    symlink_target_untagged_value =
-                        UntaggedValue::string(path_to_link.to_string_lossy());
-                } else {
-                    symlink_target_untagged_value =
-                        UntaggedValue::string("Could not obtain target file's path");
-                }
-                dict.insert_untagged("target", symlink_target_untagged_value);
-            }
-        }
-    }
-
-    if long {
-        if let Some(md) = metadata {
-            dict.insert_untagged(
-                "readonly",
-                UntaggedValue::boolean(md.permissions().readonly()),
-            );
-
-            #[cfg(unix)]
-            {
-                use std::os::unix::fs::MetadataExt;
-                let mode = md.permissions().mode();
-                dict.insert_untagged(
-                    "mode",
-                    UntaggedValue::string(umask::Mode::from(mode).to_string()),
-                );
-
-                let nlinks = md.nlink();
-                dict.insert_untagged("num_links", UntaggedValue::string(nlinks.to_string()));
-
-                let inode = md.ino();
-                dict.insert_untagged("inode", UntaggedValue::string(inode.to_string()));
-
-                if let Some(user) = users::get_user_by_uid(md.uid()) {
-                    dict.insert_untagged(
-                        "uid",
-                        UntaggedValue::string(user.name().to_string_lossy()),
-                    );
-                }
-
-                if let Some(group) = users::get_group_by_gid(md.gid()) {
-                    dict.insert_untagged(
-                        "group",
-                        UntaggedValue::string(group.name().to_string_lossy()),
-                    );
-                }
-            }
-        }
-    }
-
-    if let Some(md) = metadata {
-        let mut size_untagged_value: UntaggedValue = UntaggedValue::nothing();
-
-        if md.is_dir() {
-            let dir_size: u64 = if du {
-                let params = DirBuilder::new(
-                    Tag {
-                        anchor: None,
-                        span: Span::new(0, 2),
-                    },
-                    None,
-                    false,
-                    None,
-                    false,
-                );
-
-                DirInfo::new(filename, &params, None, ctrl_c).get_size()
-            } else {
-                md.len()
-            };
-
-            size_untagged_value = UntaggedValue::filesize(dir_size);
-        } else if md.is_file() {
-            size_untagged_value = UntaggedValue::filesize(md.len());
-        } else if md.file_type().is_symlink() {
-            if let Ok(symlink_md) = filename.symlink_metadata() {
-                size_untagged_value = UntaggedValue::filesize(symlink_md.len() as u64);
-            }
-        }
-
-        dict.insert_untagged("size", size_untagged_value);
-    }
-
-    if let Some(md) = metadata {
-        if long {
-            if let Ok(c) = md.created() {
-                dict.insert_untagged("created", UntaggedValue::system_date(c));
-            }
-
-            if let Ok(a) = md.accessed() {
-                dict.insert_untagged("accessed", UntaggedValue::system_date(a));
-            }
-        }
-
-        if let Ok(m) = md.modified() {
-            dict.insert_untagged("modified", UntaggedValue::system_date(m));
-        }
-    }
-
-    Ok(dict.into_value())
-}
-
-fn path_contains_hidden_folder(path: &Path, folders: &[PathBuf]) -> bool {
-    let path_str = path.to_str().expect("failed to read path");
-    if folders
-        .iter()
-        .any(|p| path_str.starts_with(&p.to_str().expect("failed to read hidden paths")))
-    {
-        return true;
-    }
-    false
-}
diff --git a/old_nushell/crates/nu-engine/src/filesystem/mod.rs b/old_nushell/crates/nu-engine/src/filesystem/mod.rs
deleted file mode 100644
index 8c9b64452..000000000
--- a/old_nushell/crates/nu-engine/src/filesystem/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub(crate) mod dir_info;
-pub mod filesystem_shell;
-pub(crate) mod utils;
diff --git a/old_nushell/crates/nu-engine/src/filesystem/utils.rs b/old_nushell/crates/nu-engine/src/filesystem/utils.rs
deleted file mode 100644
index dbc823e28..000000000
--- a/old_nushell/crates/nu-engine/src/filesystem/utils.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-use nu_errors::ShellError;
-use nu_path::canonicalize_with;
-use std::path::{Path, PathBuf};
-
-#[derive(Default)]
-pub struct FileStructure {
-    pub resources: Vec<Res>,
-}
-
-impl FileStructure {
-    pub fn new() -> FileStructure {
-        FileStructure {
-            resources: Vec::<Res>::new(),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub fn contains_more_than_one_file(&self) -> bool {
-        self.resources.len() > 1
-    }
-
-    #[allow(dead_code)]
-    pub fn contains_files(&self) -> bool {
-        !self.resources.is_empty()
-    }
-
-    pub fn paths_applying_with<F>(
-        &mut self,
-        to: F,
-    ) -> Result<Vec<(PathBuf, PathBuf)>, Box<dyn std::error::Error>>
-    where
-        F: Fn((PathBuf, usize)) -> Result<(PathBuf, PathBuf), Box<dyn std::error::Error>>,
-    {
-        self.resources
-            .iter()
-            .map(|f| (PathBuf::from(&f.loc), f.at))
-            .map(to)
-            .collect()
-    }
-
-    pub fn walk_decorate(&mut self, start_path: &Path) -> Result<(), ShellError> {
-        self.resources = Vec::<Res>::new();
-        self.build(start_path, 0)?;
-        self.resources.sort();
-
-        Ok(())
-    }
-
-    fn build(&mut self, src: &Path, lvl: usize) -> Result<(), ShellError> {
-        let source = canonicalize_with(src, std::env::current_dir()?)?;
-
-        if source.is_dir() {
-            for entry in std::fs::read_dir(src)? {
-                let entry = entry?;
-                let path = entry.path();
-
-                if path.is_dir() {
-                    self.build(&path, lvl + 1)?;
-                }
-
-                self.resources.push(Res {
-                    loc: path.to_path_buf(),
-                    at: lvl,
-                });
-            }
-        } else {
-            self.resources.push(Res {
-                loc: source,
-                at: lvl,
-            });
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub struct Res {
-    pub at: usize,
-    pub loc: PathBuf,
-}
-
-impl Res {}
-
-#[cfg(test)]
-mod tests {
-    use super::{FileStructure, Res};
-    use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value, ValueResource, ValueStructure};
-    use nu_source::Tag;
-    use nu_test_support::{fs::Stub::EmptyFile, playground::Playground};
-    use std::path::PathBuf;
-
-    fn structured_sample_record(key: &str, value: &str) -> Value {
-        let mut record = TaggedDictBuilder::new(Tag::unknown());
-        record.insert_untagged(key, UntaggedValue::string(value));
-        record.into_value()
-    }
-
-    fn sample_nushell_source_code() -> Value {
-        /*
-            src
-             commands
-              plugins => "sys.rs"
-             tests
-              helpers => "mod.rs"
-        */
-
-        let mut src = TaggedDictBuilder::new(Tag::unknown());
-        let mut record = TaggedDictBuilder::new(Tag::unknown());
-
-        record.insert_value("commands", structured_sample_record("plugins", "sys.rs"));
-        record.insert_value("tests", structured_sample_record("helpers", "mod.rs"));
-        src.insert_value("src", record.into_value());
-
-        src.into_value()
-    }
-
-    #[test]
-    fn prepares_and_decorates_value_filesystemlike_sources() {
-        let mut res = ValueStructure::new();
-
-        res.walk_decorate(&sample_nushell_source_code())
-            .expect("Can not decorate values traversal.");
-
-        assert_eq!(
-            res.resources,
-            vec![
-                ValueResource {
-                    loc: PathBuf::from("src"),
-                    at: 0,
-                },
-                ValueResource {
-                    loc: PathBuf::from("commands"),
-                    at: 1,
-                },
-                ValueResource {
-                    loc: PathBuf::from("tests"),
-                    at: 1,
-                },
-                ValueResource {
-                    loc: PathBuf::from("helpers"),
-                    at: 2,
-                },
-                ValueResource {
-                    loc: PathBuf::from("plugins"),
-                    at: 2,
-                },
-            ]
-        );
-    }
-
-    #[test]
-    fn recognizes_if_path_exists_in_value_filesystemlike_sources() {
-        let mut res = ValueStructure::new();
-
-        res.walk_decorate(&sample_nushell_source_code())
-            .expect("Can not decorate values traversal.");
-
-        assert!(res.exists(&PathBuf::from("/")));
-
-        assert!(res.exists(&PathBuf::from("src/commands/plugins")));
-        assert!(res.exists(&PathBuf::from("src/commands")));
-        assert!(res.exists(&PathBuf::from("src/tests")));
-        assert!(res.exists(&PathBuf::from("src/tests/helpers")));
-        assert!(res.exists(&PathBuf::from("src")));
-
-        assert!(res.exists(&PathBuf::from("/src/commands/plugins")));
-        assert!(res.exists(&PathBuf::from("/src/commands")));
-        assert!(res.exists(&PathBuf::from("/src/tests")));
-        assert!(res.exists(&PathBuf::from("/src/tests/helpers")));
-        assert!(res.exists(&PathBuf::from("/src")));
-
-        assert!(!res.exists(&PathBuf::from("/not_valid")));
-        assert!(!res.exists(&PathBuf::from("/src/not_valid")));
-    }
-
-    #[test]
-    fn prepares_and_decorates_filesystem_source_files() {
-        Playground::setup("file_structure_test", |dirs, sandbox| {
-            sandbox.with_files(vec![
-                EmptyFile("sample.ini"),
-                EmptyFile("sample.eml"),
-                EmptyFile("cargo_sample.toml"),
-            ]);
-
-            let mut res = FileStructure::new();
-
-            res.walk_decorate(dirs.test())
-                .expect("Can not decorate files traversal.");
-
-            assert_eq!(
-                res.resources,
-                vec![
-                    Res {
-                        loc: dirs.test().join("cargo_sample.toml"),
-                        at: 0
-                    },
-                    Res {
-                        loc: dirs.test().join("sample.eml"),
-                        at: 0
-                    },
-                    Res {
-                        loc: dirs.test().join("sample.ini"),
-                        at: 0
-                    }
-                ]
-            );
-        })
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/from_value.rs b/old_nushell/crates/nu-engine/src/from_value.rs
deleted file mode 100644
index 05c627bf3..000000000
--- a/old_nushell/crates/nu-engine/src/from_value.rs
+++ /dev/null
@@ -1,487 +0,0 @@
-use std::path::PathBuf;
-
-use bigdecimal::{BigDecimal, ToPrimitive};
-use chrono::{DateTime, FixedOffset};
-use nu_errors::ShellError;
-use nu_path::expand_path;
-use nu_protocol::{
-    hir::CapturedBlock, ColumnPath, Dictionary, Primitive, Range, SpannedTypeName, UntaggedValue,
-    Value,
-};
-use nu_source::{Tagged, TaggedItem};
-use num_bigint::BigInt;
-
-pub trait FromValue: Sized {
-    fn from_value(v: &Value) -> Result<Self, ShellError>;
-}
-
-impl FromValue for Value {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        Ok(v.clone())
-    }
-}
-
-impl FromValue for Tagged<num_bigint::BigInt> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Int(i)),
-                ..
-            } => Ok(BigInt::from(*i).tagged(tag)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Filesize(i)),
-                ..
-            } => Ok(BigInt::from(*i).tagged(tag)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Duration(i)),
-                ..
-            } => Ok(i.clone().tagged(tag)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("integer", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("integer", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for num_bigint::BigInt {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Int(i)),
-                ..
-            } => Ok(BigInt::from(*i)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Filesize(i)),
-                ..
-            } => Ok(BigInt::from(*i)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Duration(i)),
-                ..
-            } => Ok(i.clone()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("integer", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("integer", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<u64> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_u64().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for u64 {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        v.as_u64()
-    }
-}
-
-impl FromValue for i64 {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        v.as_i64()
-    }
-}
-
-impl FromValue for Tagged<i64> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_i64().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for Tagged<u32> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_u32().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for Tagged<i16> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_i16().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for Tagged<usize> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_usize().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for Tagged<char> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_char().map(|c| c.tagged(tag))
-    }
-}
-
-impl FromValue for usize {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        v.as_usize()
-    }
-}
-
-impl FromValue for i32 {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        v.as_i32()
-    }
-}
-
-impl FromValue for bigdecimal::BigDecimal {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Decimal(d)),
-                ..
-            } => Ok(d.clone()),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Int(i)),
-                ..
-            } => Ok(BigDecimal::from(*i)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("decimal", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("decimal", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<bigdecimal::BigDecimal> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        match &v.value {
-            UntaggedValue::Primitive(Primitive::Decimal(d)) => Ok(d.clone().tagged(tag)),
-            UntaggedValue::Primitive(Primitive::Int(i)) => Ok(BigDecimal::from(*i).tagged(tag)),
-            _ => Err(ShellError::type_error("decimal", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<f64> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        let decimal: bigdecimal::BigDecimal = FromValue::from_value(v)?;
-
-        match decimal.to_f64() {
-            Some(d) => Ok(d.tagged(tag)),
-            _ => Err(ShellError::type_error("decimal", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for String {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => Ok(s.clone()),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::GlobPattern(s)),
-                ..
-            } => Ok(s.clone()),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::FilePath(p)),
-                ..
-            } => Ok(p.to_string_lossy().to_string()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("string", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("string", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<String> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        v.as_string().map(|s| s.tagged(tag))
-    }
-}
-
-impl FromValue for PathBuf {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => Ok(expand_path(s)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::FilePath(p)),
-                ..
-            } => Ok(expand_path(p)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("filepath", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("filepath", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<PathBuf> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                tag,
-            } => Ok(expand_path(s).tagged(tag)),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::FilePath(p)),
-                tag,
-            } => Ok(expand_path(p).tagged(tag)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("filepath", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("filepath", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for ColumnPath {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::ColumnPath(c)),
-                ..
-            } => Ok(c.clone()),
-            v => Err(ShellError::type_error("column path", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for bool {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Boolean(b)),
-                ..
-            } => Ok(*b),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("boolean", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("boolean", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<bool> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Boolean(b)),
-                tag,
-            } => Ok((*b).tagged(tag)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("boolean", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("boolean", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for DateTime<FixedOffset> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Date(d)),
-                ..
-            } => Ok(*d),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("date", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("date", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Range {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Range(r)),
-                ..
-            } => Ok((**r).clone()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("range", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("range", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Tagged<Range> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        let tag = v.tag.clone();
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Range(ref range)),
-                ..
-            } => Ok((*range.clone()).tagged(tag)),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("range", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("range", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Vec<u8> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                ..
-            } => Ok(b.clone()),
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => Ok(s.bytes().collect()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("binary data", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("binary data", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Dictionary {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Row(r),
-                ..
-            } => Ok(r.clone()),
-            v => Err(ShellError::type_error("row", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for CapturedBlock {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Block(b),
-                ..
-            } => Ok((**b).clone()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => {
-                let mut shell_error = ShellError::type_error("block", v.spanned_type_name());
-                shell_error.notes.push(
-                    "Note: you can access columns using dot. eg) $it.column or (ls).column".into(),
-                );
-                Err(shell_error)
-            }
-            v => Err(ShellError::type_error("block", v.spanned_type_name())),
-        }
-    }
-}
-
-impl FromValue for Vec<Value> {
-    fn from_value(v: &Value) -> Result<Self, ShellError> {
-        match v {
-            Value {
-                value: UntaggedValue::Table(t),
-                ..
-            } => Ok(t.clone()),
-            Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => Ok(vec![v.clone()]),
-            v => Err(ShellError::type_error("table", v.spanned_type_name())),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/lib.rs b/old_nushell/crates/nu-engine/src/lib.rs
deleted file mode 100644
index 607ab63e1..000000000
--- a/old_nushell/crates/nu-engine/src/lib.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-mod call_info;
-mod command_args;
-mod config_holder;
-pub mod documentation;
-mod env;
-pub mod evaluate;
-pub mod evaluation_context;
-mod example;
-pub mod filesystem;
-mod from_value;
-mod maybe_text_codec;
-pub mod plugin;
-mod print;
-pub mod script;
-pub mod shell;
-mod types;
-mod whole_stream_command;
-
-pub use crate::call_info::UnevaluatedCallInfo;
-pub use crate::command_args::{CommandArgs, RunnableContext};
-pub use crate::config_holder::ConfigHolder;
-pub use crate::documentation::{generate_docs, get_brief_help, get_documentation, get_full_help};
-pub use crate::env::host::FakeHost;
-pub use crate::env::host::Host;
-pub use crate::evaluate::block::run_block;
-pub use crate::evaluate::envvar::EnvVar;
-pub use crate::evaluate::scope::Scope;
-pub use crate::evaluate::{evaluator, evaluator::evaluate_baseline_expr};
-pub use crate::evaluation_context::EvaluationContext;
-pub use crate::example::Example;
-pub use crate::filesystem::dir_info::{DirBuilder, DirInfo, FileInfo};
-pub use crate::filesystem::filesystem_shell::FilesystemShell;
-pub use crate::from_value::FromValue;
-pub use crate::maybe_text_codec::{BufCodecReader, MaybeTextCodec, StringOrBinary};
-pub use crate::print::maybe_print_errors;
-pub use crate::shell::painter::Painter;
-pub use crate::shell::palette::{DefaultPalette, Palette};
-pub use crate::shell::shell_manager::ShellManager;
-pub use crate::shell::value_shell;
-pub use crate::whole_stream_command::{whole_stream_command, Command, WholeStreamCommand};
diff --git a/old_nushell/crates/nu-engine/src/maybe_text_codec.rs b/old_nushell/crates/nu-engine/src/maybe_text_codec.rs
deleted file mode 100644
index 60c011cf9..000000000
--- a/old_nushell/crates/nu-engine/src/maybe_text_codec.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-use std::io::{BufRead, BufReader, Read};
-
-use nu_errors::ShellError;
-
-use encoding_rs::{CoderResult, Decoder, Encoding, UTF_8};
-
-#[cfg(not(test))]
-const OUTPUT_BUFFER_SIZE: usize = 8192;
-#[cfg(test)]
-const OUTPUT_BUFFER_SIZE: usize = 4;
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum StringOrBinary {
-    String(String),
-    Binary(Vec<u8>),
-}
-
-pub struct MaybeTextCodec {
-    decoder: Decoder,
-}
-
-pub struct BufCodecReader<R: Read> {
-    maybe_text_codec: MaybeTextCodec,
-    input: BufReader<R>,
-}
-
-impl<R: Read> BufCodecReader<R> {
-    pub fn new(input: BufReader<R>, maybe_text_codec: MaybeTextCodec) -> Self {
-        BufCodecReader {
-            maybe_text_codec,
-            input,
-        }
-    }
-}
-
-impl<R: Read> Iterator for BufCodecReader<R> {
-    type Item = Result<StringOrBinary, ShellError>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let buffer = self.input.fill_buf();
-        match buffer {
-            Ok(s) => {
-                let result = self.maybe_text_codec.decode(s).transpose();
-
-                let buffer_len = s.len();
-                self.input.consume(buffer_len);
-
-                result
-            }
-            Err(e) => Some(Err(ShellError::untagged_runtime_error(e.to_string()))),
-        }
-    }
-}
-
-impl MaybeTextCodec {
-    // The constructor takes an Option<&'static Encoding>, because an absence of an encoding indicates that we want BOM sniffing enabled
-    pub fn new(encoding: Option<&'static Encoding>) -> Self {
-        let decoder = match encoding {
-            Some(e) => e.new_decoder_with_bom_removal(),
-            None => UTF_8.new_decoder(),
-        };
-        MaybeTextCodec { decoder }
-    }
-}
-
-impl Default for MaybeTextCodec {
-    fn default() -> Self {
-        MaybeTextCodec {
-            decoder: UTF_8.new_decoder(),
-        }
-    }
-}
-
-impl MaybeTextCodec {
-    pub fn decode(&mut self, src: &[u8]) -> Result<Option<StringOrBinary>, ShellError> {
-        if src.is_empty() {
-            return Ok(None);
-        }
-
-        let mut s = String::with_capacity(OUTPUT_BUFFER_SIZE);
-
-        let (res, _read, replacements) = self.decoder.decode_to_string(src, &mut s, false);
-
-        let result = if replacements {
-            // If we had to make replacements when converting to utf8, fall back to binary
-            StringOrBinary::Binary(src.to_vec())
-        } else {
-            // If original buffer size is too small, we continue to allocate new Strings and append
-            // them to the result until the input buffer is smaller than the allocated String
-            if let CoderResult::OutputFull = res {
-                let mut buffer = String::with_capacity(OUTPUT_BUFFER_SIZE);
-                loop {
-                    let (res, _read, _replacements) =
-                        self.decoder
-                            .decode_to_string(&src[s.len()..], &mut buffer, false);
-                    s.push_str(&buffer);
-
-                    if let CoderResult::InputEmpty = res {
-                        break;
-                    }
-
-                    buffer.clear();
-                }
-            }
-
-            StringOrBinary::String(s)
-        };
-
-        // src.clear();
-
-        Ok(Some(result))
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/plugin/build_plugin.rs b/old_nushell/crates/nu-engine/src/plugin/build_plugin.rs
deleted file mode 100644
index 7838ed9b1..000000000
--- a/old_nushell/crates/nu-engine/src/plugin/build_plugin.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use crate::plugin::run_plugin::PluginCommandBuilder;
-use log::trace;
-use nu_errors::ShellError;
-use nu_path::canonicalize;
-use nu_plugin::jsonrpc::JsonRpc;
-use nu_protocol::{Signature, Value};
-use std::io::{BufRead, BufReader, Write};
-use std::process::{Child, Command, Stdio};
-
-use rayon::prelude::*;
-
-pub fn build_plugin_command(
-    path: &std::path::Path,
-) -> Result<Option<PluginCommandBuilder>, ShellError> {
-    let ext = path.extension();
-    let ps1_file = match ext {
-        Some(ext) => ext == "ps1",
-        None => false,
-    };
-
-    let mut child: Child = if ps1_file {
-        Command::new("pwsh")
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .args([
-                "-NoLogo",
-                "-NoProfile",
-                "-ExecutionPolicy",
-                "Bypass",
-                "-File",
-                &path.to_string_lossy(),
-            ])
-            .spawn()
-            .expect("Failed to spawn PowerShell process")
-    } else {
-        Command::new(path)
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .spawn()
-            .expect("Failed to spawn child process")
-    };
-
-    let stdin = child.stdin.as_mut().expect("Failed to open stdin");
-    let stdout = child.stdout.as_mut().expect("Failed to open stdout");
-
-    let mut reader = BufReader::new(stdout);
-
-    let request = JsonRpc::new("config", Vec::<Value>::new());
-    let request_raw = serde_json::to_string(&request)?;
-    trace!(target: "nu::load", "plugin infrastructure config -> path {:#?}, request {:?}", &path, &request_raw);
-    stdin.write_all(format!("{}\n", request_raw).as_bytes())?;
-    let path = canonicalize(path)?;
-
-    let mut input = String::new();
-    let result = match reader.read_line(&mut input) {
-        Ok(count) => {
-            trace!(target: "nu::load", "plugin infrastructure -> config response for {:#?}", &path);
-            trace!(target: "nu::load", "plugin infrastructure -> processing response ({} bytes)", count);
-            trace!(target: "nu::load", "plugin infrastructure -> response: {}", input);
-
-            let response = serde_json::from_str::<JsonRpc<Result<Signature, ShellError>>>(&input);
-            match response {
-                Ok(jrpc) => match jrpc.params {
-                    Ok(params) => {
-                        let fname = path.to_string_lossy();
-
-                        trace!(target: "nu::load", "plugin infrastructure -> processing {:?}", params);
-
-                        let name = params.name.clone();
-
-                        let fname = fname.to_string();
-
-                        Ok(Some(PluginCommandBuilder::new(&name, &fname, params)))
-                    }
-                    Err(e) => Err(e),
-                },
-                Err(e) => {
-                    trace!(target: "nu::load", "plugin infrastructure -> incompatible {:?}", input);
-                    Err(ShellError::untagged_runtime_error(format!(
-                        "Error: {:?}",
-                        e
-                    )))
-                }
-            }
-        }
-        Err(e) => Err(ShellError::untagged_runtime_error(format!(
-            "Error: {:?}",
-            e
-        ))),
-    };
-
-    let _ = child.wait();
-
-    result
-}
-
-pub fn scan(
-    paths: Vec<std::path::PathBuf>,
-) -> Result<Vec<crate::whole_stream_command::Command>, ShellError> {
-    let mut plugins = vec![];
-
-    let opts = glob::MatchOptions {
-        case_sensitive: false,
-        require_literal_separator: false,
-        require_literal_leading_dot: false,
-    };
-
-    for path in paths {
-        let mut pattern = path.to_path_buf();
-
-        pattern.push(std::path::Path::new("nu_plugin_[a-z0-9][a-z0-9]*"));
-
-        let plugs: Vec<_> = glob::glob_with(&pattern.to_string_lossy(), opts)?
-            .filter_map(|x| x.ok())
-            .collect();
-
-        let plugs: Vec<_> = plugs
-            .par_iter()
-            .filter_map(|path| {
-                let bin_name = {
-                    if let Some(name) = path.file_name() {
-                        name.to_str().unwrap_or("")
-                    } else {
-                        ""
-                    }
-                };
-
-                // allow plugins with extensions on all platforms
-                let is_valid_name = {
-                    bin_name
-                        .chars()
-                        .all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '.')
-                };
-
-                let is_executable = {
-                    #[cfg(windows)]
-                    {
-                        bin_name.ends_with(".exe")
-                        || bin_name.ends_with(".bat")
-                        || bin_name.ends_with(".cmd")
-                        || bin_name.ends_with(".py")
-                        || bin_name.ends_with(".ps1")
-                    }
-
-                    #[cfg(not(windows))]
-                    {
-                        !bin_name.contains('.')
-                        || (bin_name.ends_with('.')
-                        || bin_name.ends_with(".py")
-                        || bin_name.ends_with(".rb")
-                        || bin_name.ends_with(".sh")
-                        || bin_name.ends_with(".bash")
-                        || bin_name.ends_with(".zsh")
-                        || bin_name.ends_with(".pl")
-                        || bin_name.ends_with(".awk")
-                        || bin_name.ends_with(".ps1"))
-                    }
-                };
-
-                if is_valid_name && is_executable {
-                    trace!(target: "nu::load", "plugin infrastructure -> Trying {:?}", path.display());
-                    build_plugin_command(path).unwrap_or(None)
-                } else {
-                    None
-                }
-            }).map(|p| p.build())
-            .collect::<Vec<crate::whole_stream_command::Command>>();
-        plugins.extend(plugs);
-    }
-
-    Ok(plugins)
-}
diff --git a/old_nushell/crates/nu-engine/src/plugin/mod.rs b/old_nushell/crates/nu-engine/src/plugin/mod.rs
deleted file mode 100644
index 1d1650c40..000000000
--- a/old_nushell/crates/nu-engine/src/plugin/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod build_plugin;
-pub(crate) mod run_plugin;
diff --git a/old_nushell/crates/nu-engine/src/plugin/run_plugin.rs b/old_nushell/crates/nu-engine/src/plugin/run_plugin.rs
deleted file mode 100644
index 0372185cc..000000000
--- a/old_nushell/crates/nu-engine/src/plugin/run_plugin.rs
+++ /dev/null
@@ -1,549 +0,0 @@
-use crate::{command_args::CommandArgs, evaluate_baseline_expr, UnevaluatedCallInfo};
-use crate::{
-    whole_stream_command::{whole_stream_command, WholeStreamCommand},
-    EvaluationContext,
-};
-use derive_new::new;
-
-use indexmap::IndexMap;
-use log::trace;
-use nu_errors::ShellError;
-use nu_plugin::jsonrpc::JsonRpc;
-use nu_protocol::{hir, Primitive, ReturnValue, Signature, UntaggedValue, Value};
-use nu_source::Tag;
-use nu_stream::{ActionStream, InputStream, IntoActionStream};
-use serde::{self, Deserialize, Serialize};
-use std::collections::VecDeque;
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::io::Write;
-use std::path::Path;
-use std::process::{Child, Command, Stdio};
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "method")]
-#[allow(non_camel_case_types)]
-pub enum NuResult {
-    response {
-        params: Result<VecDeque<ReturnValue>, ShellError>,
-    },
-}
-
-enum PluginCommand {
-    Filter(PluginFilter),
-    Sink(PluginSink),
-}
-
-impl PluginCommand {
-    fn command(self) -> crate::whole_stream_command::Command {
-        match self {
-            PluginCommand::Filter(cmd) => whole_stream_command(cmd),
-            PluginCommand::Sink(cmd) => whole_stream_command(cmd),
-        }
-    }
-}
-
-enum PluginMode {
-    Filter,
-    Sink,
-}
-
-pub struct PluginCommandBuilder {
-    mode: PluginMode,
-    name: String,
-    path: String,
-    config: Signature,
-}
-
-impl PluginCommandBuilder {
-    pub fn new(
-        name: impl Into<String>,
-        path: impl Into<String>,
-        config: impl Into<Signature>,
-    ) -> Self {
-        let config = config.into();
-
-        PluginCommandBuilder {
-            mode: if config.is_filter {
-                PluginMode::Filter
-            } else {
-                PluginMode::Sink
-            },
-            name: name.into(),
-            path: path.into(),
-            config,
-        }
-    }
-
-    pub fn build(&self) -> crate::whole_stream_command::Command {
-        let mode = &self.mode;
-
-        let name = self.name.clone();
-        let path = self.path.clone();
-        let config = self.config.clone();
-
-        let cmd = match mode {
-            PluginMode::Filter => PluginCommand::Filter(PluginFilter { name, path, config }),
-            PluginMode::Sink => PluginCommand::Sink(PluginSink { name, path, config }),
-        };
-
-        cmd.command()
-    }
-}
-
-#[derive(new)]
-pub struct PluginFilter {
-    name: String,
-    path: String,
-    config: Signature,
-}
-
-impl WholeStreamCommand for PluginFilter {
-    fn name(&self) -> &str {
-        &self.name
-    }
-
-    fn signature(&self) -> Signature {
-        self.config.clone()
-    }
-
-    fn usage(&self) -> &str {
-        &self.config.usage
-    }
-
-    fn extra_usage(&self) -> &str {
-        &self.config.extra_usage
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        run_filter(self.path.clone(), args)
-    }
-
-    fn is_plugin(&self) -> bool {
-        true
-    }
-
-    fn is_builtin(&self) -> bool {
-        false
-    }
-}
-
-fn run_filter(path: String, args: CommandArgs) -> Result<ActionStream, ShellError> {
-    trace!("filter_plugin :: {}", path);
-
-    let bos = vec![UntaggedValue::Primitive(Primitive::BeginningOfStream).into_untagged_value()]
-        .into_iter();
-    let eos = [UntaggedValue::Primitive(Primitive::EndOfStream).into_untagged_value()];
-
-    let (call_info, input) = evaluate_once(args)?;
-
-    let real_path = Path::new(&path);
-    let ext = real_path.extension();
-    let ps1_file = match ext {
-        Some(ext) => ext == "ps1",
-        None => false,
-    };
-
-    let mut child: Child = if ps1_file {
-        Command::new("pwsh")
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .args([
-                "-NoLogo",
-                "-NoProfile",
-                "-ExecutionPolicy",
-                "Bypass",
-                "-File",
-                &real_path.to_string_lossy(),
-            ])
-            .spawn()
-            .expect("Failed to spawn PowerShell process")
-    } else {
-        Command::new(path)
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .spawn()
-            .expect("Failed to spawn child process")
-    };
-
-    trace!("filtering :: {:?}", call_info);
-
-    Ok(bos
-        .chain(input)
-        .chain(eos)
-        .flat_map(move |item| {
-            match item {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::BeginningOfStream),
-                    ..
-                } => {
-                    // Beginning of the stream
-                    let stdin = child.stdin.as_mut().expect("Failed to open stdin");
-                    let stdout = child.stdout.as_mut().expect("Failed to open stdout");
-
-                    let mut reader = BufReader::new(stdout);
-
-                    let request = JsonRpc::new("begin_filter", call_info.clone());
-                    let request_raw = serde_json::to_string(&request);
-                    trace!("begin_filter:request {:?}", &request_raw);
-
-                    match request_raw {
-                        Err(_) => {
-                            return ActionStream::one(Err(ShellError::labeled_error(
-                                "Could not load json from plugin",
-                                "could not load json from plugin",
-                                &call_info.name_tag,
-                            )));
-                        }
-                        Ok(request_raw) => {
-                            match stdin.write(format!("{}\n", request_raw).as_bytes()) {
-                                Ok(_) => {}
-                                Err(err) => {
-                                    return ActionStream::one(Err(ShellError::unexpected(
-                                        err.to_string(),
-                                    )));
-                                }
-                            }
-                        }
-                    }
-
-                    let mut input = String::new();
-                    match reader.read_line(&mut input) {
-                        Ok(_) => {
-                            let response = serde_json::from_str::<NuResult>(&input);
-                            trace!("begin_filter:response {:?}", &response);
-
-                            match response {
-                                Ok(NuResult::response { params }) => match params {
-                                    Ok(params) => params.into_iter().into_action_stream(),
-                                    Err(e) => {
-                                        vec![ReturnValue::Err(e)].into_iter().into_action_stream()
-                                    }
-                                },
-
-                                Err(e) => ActionStream::one(Err(
-                                    ShellError::untagged_runtime_error(format!(
-                                        "Error while processing begin_filter response: {:?} {}",
-                                        e, input
-                                    )),
-                                )),
-                            }
-                        }
-                        Err(e) => ActionStream::one(Err(ShellError::untagged_runtime_error(
-                            format!("Error while reading begin_filter response: {:?}", e),
-                        ))),
-                    }
-                }
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::EndOfStream),
-                    ..
-                } => {
-                    // post stream contents
-                    let stdin = child.stdin.as_mut().expect("Failed to open stdin");
-                    let stdout = child.stdout.as_mut().expect("Failed to open stdout");
-
-                    let mut reader = BufReader::new(stdout);
-
-                    let request: JsonRpc<std::vec::Vec<Value>> = JsonRpc::new("end_filter", vec![]);
-                    let request_raw = serde_json::to_string(&request);
-                    trace!("end_filter:request {:?}", &request_raw);
-
-                    match request_raw {
-                        Err(_) => {
-                            return ActionStream::one(Err(ShellError::labeled_error(
-                                "Could not load json from plugin",
-                                "could not load json from plugin",
-                                &call_info.name_tag,
-                            )));
-                        }
-                        Ok(request_raw) => {
-                            match stdin.write(format!("{}\n", request_raw).as_bytes()) {
-                                Ok(_) => {}
-                                Err(err) => {
-                                    return ActionStream::one(Err(ShellError::unexpected(
-                                        err.to_string(),
-                                    )));
-                                }
-                            }
-                        }
-                    }
-
-                    let mut input = String::new();
-                    let stream = match reader.read_line(&mut input) {
-                        Ok(_) => {
-                            let response = serde_json::from_str::<NuResult>(&input);
-                            trace!("end_filter:response {:?}", &response);
-
-                            match response {
-                                Ok(NuResult::response { params }) => match params {
-                                    Ok(params) => params.into_iter().into_action_stream(),
-                                    Err(e) => {
-                                        vec![ReturnValue::Err(e)].into_iter().into_action_stream()
-                                    }
-                                },
-                                Err(e) => vec![Err(ShellError::untagged_runtime_error(format!(
-                                    "Error while processing end_filter response: {:?} {}",
-                                    e, input
-                                )))]
-                                .into_iter()
-                                .into_action_stream(),
-                            }
-                        }
-                        Err(e) => vec![Err(ShellError::untagged_runtime_error(format!(
-                            "Error while reading end_filter response: {:?}",
-                            e
-                        )))]
-                        .into_iter()
-                        .into_action_stream(),
-                    };
-
-                    let stdin = child.stdin.as_mut().expect("Failed to open stdin");
-
-                    let request: JsonRpc<std::vec::Vec<Value>> = JsonRpc::new("quit", vec![]);
-                    let request_raw = serde_json::to_string(&request);
-                    trace!("quit:request {:?}", &request_raw);
-
-                    match request_raw {
-                        Ok(request_raw) => {
-                            let _ = stdin.write(format!("{}\n", request_raw).as_bytes());
-                            // TODO: Handle error
-                        }
-                        Err(e) => {
-                            return ActionStream::one(Err(ShellError::untagged_runtime_error(
-                                format!("Error while processing quit response: {:?}", e),
-                            )));
-                        }
-                    }
-                    let _ = child.wait();
-
-                    stream
-                }
-
-                v => {
-                    // Stream contents
-                    let stdin = child.stdin.as_mut().expect("Failed to open stdin");
-                    let stdout = child.stdout.as_mut().expect("Failed to open stdout");
-
-                    let mut reader = BufReader::new(stdout);
-
-                    let request = JsonRpc::new("filter", v);
-                    let request_raw = serde_json::to_string(&request);
-                    trace!("filter:request {:?}", &request_raw);
-
-                    match request_raw {
-                        Ok(request_raw) => {
-                            let _ = stdin.write(format!("{}\n", request_raw).as_bytes());
-                            // TODO: Handle error
-                        }
-                        Err(e) => {
-                            return ActionStream::one(Err(ShellError::untagged_runtime_error(
-                                format!("Error while processing filter response: {:?}", e),
-                            )));
-                        }
-                    }
-
-                    let mut input = String::new();
-                    match reader.read_line(&mut input) {
-                        Ok(_) => {
-                            let response = serde_json::from_str::<NuResult>(&input);
-                            trace!("filter:response {:?}", &response);
-
-                            match response {
-                                Ok(NuResult::response { params }) => match params {
-                                    Ok(params) => params.into_iter().into_action_stream(),
-                                    Err(e) => {
-                                        vec![ReturnValue::Err(e)].into_iter().into_action_stream()
-                                    }
-                                },
-                                Err(e) => ActionStream::one(Err(
-                                    ShellError::untagged_runtime_error(format!(
-                                    "Error while processing filter response: {:?}\n== input ==\n{}",
-                                    e, input
-                                )),
-                                )),
-                            }
-                        }
-                        Err(e) => ActionStream::one(Err(ShellError::untagged_runtime_error(
-                            format!("Error while reading filter response: {:?}", e),
-                        ))),
-                    }
-                }
-            }
-        })
-        .into_action_stream())
-}
-
-#[derive(new)]
-pub struct PluginSink {
-    name: String,
-    path: String,
-    config: Signature,
-}
-
-impl WholeStreamCommand for PluginSink {
-    fn name(&self) -> &str {
-        &self.name
-    }
-
-    fn signature(&self) -> Signature {
-        self.config.clone()
-    }
-
-    fn usage(&self) -> &str {
-        &self.config.usage
-    }
-
-    fn extra_usage(&self) -> &str {
-        &self.config.extra_usage
-    }
-
-    fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        run_sink(self.path.clone(), args)
-    }
-
-    fn is_plugin(&self) -> bool {
-        true
-    }
-
-    fn is_builtin(&self) -> bool {
-        false
-    }
-}
-
-fn run_sink(path: String, args: CommandArgs) -> Result<ActionStream, ShellError> {
-    let (call_info, input) = evaluate_once(args)?;
-
-    let input: Vec<Value> = input.into_vec();
-
-    let request = JsonRpc::new("sink", (call_info, input));
-    let request_raw = serde_json::to_string(&request);
-    if let Ok(request_raw) = request_raw {
-        if let Ok(mut tmpfile) = tempfile::NamedTempFile::new() {
-            let _ = writeln!(tmpfile, "{}", request_raw);
-            let _ = tmpfile.flush();
-
-            let real_path = Path::new(&path);
-            let ext = real_path.extension();
-            let ps1_file = match ext {
-                Some(ext) => ext == "ps1",
-                None => false,
-            };
-
-            // TODO: This sink may not work in powershell, trying to find
-            // an example of what CallInfo would look like in this temp file
-            let child = if ps1_file {
-                Command::new("pwsh")
-                    .args([
-                        "-NoLogo",
-                        "-NoProfile",
-                        "-ExecutionPolicy",
-                        "Bypass",
-                        "-File",
-                        &real_path.to_string_lossy(),
-                        tmpfile
-                            .path()
-                            .to_str()
-                            .expect("Failed getting tmpfile path"),
-                    ])
-                    .spawn()
-            } else {
-                Command::new(path).arg(&tmpfile.path()).spawn()
-            };
-
-            if let Ok(mut child) = child {
-                let _ = child.wait();
-
-                Ok(ActionStream::empty())
-            } else {
-                Err(ShellError::untagged_runtime_error(
-                    "Could not create process for sink command",
-                ))
-            }
-        } else {
-            Err(ShellError::untagged_runtime_error(
-                "Could not open file to send sink command message",
-            ))
-        }
-    } else {
-        Err(ShellError::untagged_runtime_error(
-            "Could not create message to sink command",
-        ))
-    }
-}
-
-/// Associated information for the call of a command, including the args passed to the command and a tag that spans the name of the command being called
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct CallInfo {
-    /// The arguments associated with this call
-    pub args: EvaluatedArgs,
-    /// The tag (underline-able position) of the name of the call itself
-    pub name_tag: Tag,
-}
-
-/// The set of positional and named arguments, after their values have been evaluated.
-///
-/// * Positional arguments are those who are given as values, without any associated flag. For example, in `foo arg1 arg2`, both `arg1` and `arg2` are positional arguments.
-/// * Named arguments are those associated with a flag. For example, `foo --given bar` the named argument would be name `given` and the value `bar`.
-#[derive(Debug, Default, new, Serialize, Deserialize, Clone)]
-pub struct EvaluatedArgs {
-    pub positional: Option<Vec<Value>>,
-    pub named: Option<IndexMap<String, Value>>,
-}
-
-fn evaluate_once(args: CommandArgs) -> Result<(CallInfo, InputStream), ShellError> {
-    let input = args.input;
-    let call_info = evaluate_command(args.call_info, args.context)?;
-
-    Ok((call_info, input))
-}
-
-fn evaluate_command(
-    args: UnevaluatedCallInfo,
-    ctx: EvaluationContext,
-) -> Result<CallInfo, ShellError> {
-    let name_tag = args.name_tag.clone();
-    let args = evaluate_args(&args.args, &ctx)?;
-
-    Ok(CallInfo { args, name_tag })
-}
-
-fn evaluate_args(call: &hir::Call, ctx: &EvaluationContext) -> Result<EvaluatedArgs, ShellError> {
-    let mut positional_args: Vec<Value> = vec![];
-
-    if let Some(positional) = &call.positional {
-        for pos in positional {
-            let result = evaluate_baseline_expr(pos, ctx)?;
-            positional_args.push(result);
-        }
-    }
-
-    let positional = if !positional_args.is_empty() {
-        Some(positional_args)
-    } else {
-        None
-    };
-
-    let mut named_args = IndexMap::new();
-
-    if let Some(named) = &call.named {
-        for (name, value) in named {
-            match value {
-                hir::NamedValue::PresentSwitch(tag) => {
-                    named_args.insert(name.clone(), UntaggedValue::boolean(true).into_value(tag));
-                }
-                hir::NamedValue::Value(_, expr) => {
-                    named_args.insert(name.clone(), evaluate_baseline_expr(expr, ctx)?);
-                }
-                _ => {}
-            };
-        }
-    }
-
-    let named = if !named_args.is_empty() {
-        Some(named_args)
-    } else {
-        None
-    };
-
-    Ok(EvaluatedArgs::new(positional, named))
-}
diff --git a/old_nushell/crates/nu-engine/src/print.rs b/old_nushell/crates/nu-engine/src/print.rs
deleted file mode 100644
index f1072a472..000000000
--- a/old_nushell/crates/nu-engine/src/print.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use nu_source::Text;
-
-use crate::EvaluationContext;
-
-pub fn maybe_print_errors(context: &EvaluationContext, source: Text) -> bool {
-    let errors = context.current_errors().clone();
-    let mut errors = errors.lock();
-
-    if errors.len() > 0 {
-        let error = errors[0].clone();
-        *errors = vec![];
-
-        context.host().lock().print_err(error, &source);
-        true
-    } else {
-        false
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/script.rs b/old_nushell/crates/nu-engine/src/script.rs
deleted file mode 100644
index fd9c41f0c..000000000
--- a/old_nushell/crates/nu-engine/src/script.rs
+++ /dev/null
@@ -1,312 +0,0 @@
-use crate::{evaluate::internal::InternalIterator, maybe_print_errors, run_block, shell::CdArgs};
-use crate::{BufCodecReader, MaybeTextCodec, StringOrBinary};
-use nu_errors::ShellError;
-use nu_path::{canonicalize_with, trim_trailing_slash};
-use nu_protocol::hir::{
-    Call, ClassifiedCommand, Expression, ExternalRedirection, InternalCommand, Literal,
-    NamedArguments, SpannedExpression,
-};
-use nu_protocol::{Primitive, UntaggedValue, Value};
-use nu_stream::{InputStream, IntoInputStream};
-
-use crate::EvaluationContext;
-use log::{debug, trace};
-use nu_source::{AnchorLocation, Span, Tag, Tagged, Text};
-use std::path::{Path, PathBuf};
-use std::{error::Error, sync::atomic::Ordering};
-use std::{io::BufReader, iter::Iterator};
-
-#[derive(Debug)]
-pub enum LineResult {
-    Success(String),
-    Error(String, ShellError),
-    Break,
-    CtrlC,
-    CtrlD,
-    ClearHistory,
-}
-
-fn chomp_newline(s: &str) -> &str {
-    if let Some(s) = s.strip_suffix('\n') {
-        s
-    } else {
-        s
-    }
-}
-
-pub fn run_script_in_dir(
-    script: String,
-    dir: &Path,
-    ctx: &EvaluationContext,
-) -> Result<(), Box<dyn Error>> {
-    //Save path before to switch back to it after executing script
-    let path_before = ctx.shell_manager().path();
-
-    ctx.shell_manager()
-        .set_path(dir.to_string_lossy().to_string());
-    run_script_standalone(script, false, ctx, false)?;
-    ctx.shell_manager().set_path(path_before);
-
-    Ok(())
-}
-
-/// Process the line by parsing the text to turn it into commands, classify those commands so that we understand what is being called in the pipeline, and then run this pipeline
-pub fn process_script(
-    script_text: &str,
-    ctx: &EvaluationContext,
-    redirect_stdin: bool,
-    span_offset: usize,
-    cli_mode: bool,
-) -> LineResult {
-    if script_text.trim() == "" {
-        LineResult::Success(script_text.to_string())
-    } else {
-        let line = chomp_newline(script_text);
-
-        let (block, err) = nu_parser::parse(line, span_offset, &ctx.scope);
-
-        debug!("{:#?}", block);
-
-        if let Some(failure) = err {
-            return LineResult::Error(line.to_string(), failure.into());
-        }
-
-        // There's a special case to check before we process the pipeline:
-        // If we're giving a path by itself
-        // ...and it's not a command in the path
-        // ...and it doesn't have any arguments
-        // ...and we're in the CLI
-        // ...then change to this directory
-        if cli_mode
-            && block.block.len() == 1
-            && block.block[0].pipelines.len() == 1
-            && block.block[0].pipelines[0].list.len() == 1
-        {
-            if let ClassifiedCommand::Internal(InternalCommand {
-                ref name,
-                ref args,
-                name_span,
-            }) = block.block[0].pipelines[0].list[0]
-            {
-                let internal_name = name;
-                let name = args
-                    .positional
-                    .as_ref()
-                    .and_then(|positionals| {
-                        positionals.get(0).map(|e| {
-                            if let Expression::Literal(Literal::String(ref s)) = e.expr {
-                                &s
-                            } else {
-                                ""
-                            }
-                        })
-                    })
-                    .unwrap_or("");
-
-                ctx.sync_path_to_env();
-                if internal_name == "run_external"
-                    && args
-                        .positional
-                        .as_ref()
-                        .map(|v| v.len() == 1)
-                        .unwrap_or(true)
-                    && args
-                        .named
-                        .as_ref()
-                        .map(NamedArguments::is_empty)
-                        .unwrap_or(true)
-                    && canonicalize_with(name, ctx.shell_manager().path()).is_ok()
-                    && Path::new(&name).is_dir()
-                    && !ctx.host().lock().is_external_cmd(name)
-                {
-                    let tag = Tag {
-                        anchor: Some(AnchorLocation::Source(line.into())),
-                        span: name_span,
-                    };
-                    let path = {
-                        // Here we work differently if we're in Windows because of the expected Windows behavior
-                        #[cfg(windows)]
-                        {
-                            if name.ends_with(':') {
-                                // This looks like a drive shortcut. We need to a) switch drives and b) go back to the previous directory we were viewing on that drive
-                                // But first, we need to save where we are now
-                                let current_path = ctx.shell_manager().path();
-
-                                let split_path: Vec<_> = current_path.split(':').collect();
-                                if split_path.len() > 1 {
-                                    ctx.windows_drives_previous_cwd()
-                                        .lock()
-                                        .insert(split_path[0].to_string(), current_path);
-                                }
-
-                                let name = name.to_uppercase();
-                                let new_drive: Vec<_> = name.split(':').collect();
-
-                                if let Some(val) =
-                                    ctx.windows_drives_previous_cwd().lock().get(new_drive[0])
-                                {
-                                    val.to_string()
-                                } else {
-                                    format!("{}\\", name)
-                                }
-                            } else {
-                                name.to_string()
-                            }
-                        }
-                        #[cfg(not(windows))]
-                        {
-                            name.to_string()
-                        }
-                    };
-
-                    let path = trim_trailing_slash(&path);
-
-                    let cd_args = CdArgs {
-                        path: Some(Tagged {
-                            item: PathBuf::from(path),
-                            tag: tag.clone(),
-                        }),
-                    };
-
-                    return match ctx.shell_manager().cd(cd_args, tag) {
-                        Err(e) => LineResult::Error(line.to_string(), e),
-                        Ok(stream) => {
-                            let iter = InternalIterator {
-                                context: ctx.clone(),
-                                leftovers: InputStream::empty(),
-                                input: stream,
-                            };
-                            for _ in iter {
-                                //nullopt, commands are run by iterating over iter
-                            }
-                            LineResult::Success(line.to_string())
-                        }
-                    };
-                }
-            }
-        }
-
-        let input_stream = if redirect_stdin {
-            let file = std::io::stdin();
-            let buf_reader = BufReader::new(file);
-            let buf_codec = BufCodecReader::new(buf_reader, MaybeTextCodec::default());
-            let stream = buf_codec.map(|line| {
-                if let Ok(line) = line {
-                    let primitive = match line {
-                        StringOrBinary::String(s) => Primitive::String(s),
-                        StringOrBinary::Binary(b) => Primitive::Binary(b.into_iter().collect()),
-                    };
-
-                    Ok(Value {
-                        value: UntaggedValue::Primitive(primitive),
-                        tag: Tag::unknown(),
-                    })
-                } else {
-                    panic!("Internal error: could not read lines of text from stdin")
-                }
-            });
-            stream.into_input_stream()
-        } else {
-            InputStream::empty()
-        };
-
-        trace!("{:#?}", block);
-
-        let result = run_block(&block, ctx, input_stream, ExternalRedirection::None);
-
-        match result {
-            Ok(input) => {
-                // Running a pipeline gives us back a stream that we can then
-                // work through. At the top level, we just want to pull on the
-                // values to compute them.
-
-                let autoview_cmd = ctx
-                    .get_command("autoview")
-                    .expect("Could not find autoview command");
-
-                if let Ok(mut output_stream) = ctx.run_command(
-                    autoview_cmd,
-                    Tag::unknown(),
-                    Call::new(
-                        Box::new(SpannedExpression::new(
-                            Expression::string("autoview".to_string()),
-                            Span::unknown(),
-                        )),
-                        Span::unknown(),
-                    ),
-                    input,
-                ) {
-                    loop {
-                        match output_stream.next() {
-                            Some(Value {
-                                value: UntaggedValue::Error(e),
-                                ..
-                            }) => return LineResult::Error(line.to_string(), e),
-                            Some(_item) => {
-                                if ctx.ctrl_c().load(Ordering::SeqCst) {
-                                    break;
-                                }
-                            }
-                            None => break,
-                        }
-                    }
-                }
-
-                LineResult::Success(line.to_string())
-            }
-            Err(err) => LineResult::Error(line.to_string(), err),
-        }
-    }
-}
-
-pub fn run_script_standalone(
-    script_text: String,
-    redirect_stdin: bool,
-    context: &EvaluationContext,
-    exit_on_error: bool,
-) -> Result<(), ShellError> {
-    context
-        .shell_manager()
-        .enter_script_mode()
-        .map_err(ShellError::from)?;
-    let line = process_script(&script_text, context, redirect_stdin, 0, false);
-
-    match line {
-        LineResult::Success(line) => {
-            let error_code = {
-                let errors = context.current_errors().clone();
-                let errors = errors.lock();
-
-                if errors.len() > 0 {
-                    1
-                } else {
-                    0
-                }
-            };
-
-            maybe_print_errors(context, Text::from(line));
-            if error_code != 0 && exit_on_error {
-                std::process::exit(error_code);
-            }
-        }
-
-        LineResult::Error(line, err) => {
-            context
-                .host()
-                .lock()
-                .print_err(err, &Text::from(line.clone()));
-
-            maybe_print_errors(context, Text::from(line));
-            if exit_on_error {
-                std::process::exit(1);
-            }
-        }
-
-        _ => {}
-    }
-
-    //exit script mode shell
-    context.shell_manager().remove_at_current();
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/mod.rs b/old_nushell/crates/nu-engine/src/shell/mod.rs
deleted file mode 100644
index fce62a7c8..000000000
--- a/old_nushell/crates/nu-engine/src/shell/mod.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use nu_stream::{ActionStream, OutputStream};
-
-use crate::maybe_text_codec::StringOrBinary;
-pub use crate::shell::shell_args::{CdArgs, CopyArgs, LsArgs, MkdirArgs, MvArgs, RemoveArgs};
-use crate::CommandArgs;
-use encoding_rs::Encoding;
-use nu_errors::ShellError;
-use nu_source::{Span, Tag};
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-pub(crate) mod painter;
-pub(crate) mod palette;
-pub(crate) mod shell_args;
-pub(crate) mod shell_manager;
-pub mod value_shell;
-
-pub trait Shell: std::fmt::Debug {
-    fn is_interactive(&self) -> bool;
-    fn name(&self) -> String;
-    fn homedir(&self) -> Option<PathBuf>;
-
-    fn ls(
-        &self,
-        args: LsArgs,
-        name: Tag,
-        ctrl_c: Arc<AtomicBool>,
-    ) -> Result<ActionStream, ShellError>;
-    fn cd(&self, args: CdArgs, name: Tag) -> Result<ActionStream, ShellError>;
-    fn cp(&self, args: CopyArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
-    fn mkdir(&self, args: MkdirArgs, name: Tag, path: &str) -> Result<OutputStream, ShellError>;
-    fn mv(&self, args: MvArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
-    fn rm(&self, args: RemoveArgs, name: Tag, path: &str) -> Result<ActionStream, ShellError>;
-    fn path(&self) -> String;
-    fn pwd(&self, args: CommandArgs) -> Result<ActionStream, ShellError>;
-    fn set_path(&mut self, path: String);
-    fn open(
-        &self,
-        path: &Path,
-        name: Span,
-        with_encoding: Option<&'static Encoding>,
-    ) -> Result<
-        Box<dyn Iterator<Item = Result<StringOrBinary, ShellError>> + Send + Sync>,
-        ShellError,
-    >;
-    fn save(
-        &mut self,
-        path: &Path,
-        contents: &[u8],
-        name: Span,
-        append: bool,
-    ) -> Result<OutputStream, ShellError>;
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/painter.rs b/old_nushell/crates/nu-engine/src/shell/painter.rs
deleted file mode 100644
index bf1bcf908..000000000
--- a/old_nushell/crates/nu-engine/src/shell/painter.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use crate::evaluate::scope::Scope;
-use crate::shell::palette::Palette;
-use nu_ansi_term::{Color, Style};
-use nu_parser::ParserScope;
-use nu_protocol::hir::FlatShape;
-use nu_source::Spanned;
-use std::borrow::Cow;
-
-// FIXME: find a good home, as nu-engine may be too core for styling
-pub struct Painter {
-    original: Vec<u8>,
-    styles: Vec<Style>,
-}
-
-impl Painter {
-    fn new(original: &str) -> Painter {
-        let bytes: Vec<u8> = original.bytes().collect();
-        let bytes_count = bytes.len();
-        Painter {
-            original: bytes,
-            styles: vec![Color::White.normal(); bytes_count],
-        }
-    }
-
-    pub fn paint_string<'l, P: Palette>(line: &'l str, scope: &Scope, palette: &P) -> Cow<'l, str> {
-        scope.enter_scope();
-        let (block, _) = nu_parser::parse(line, 0, scope);
-        scope.exit_scope();
-
-        let shapes = nu_parser::shapes(&block);
-        let mut painter = Painter::new(line);
-
-        for shape in shapes {
-            painter.paint_shape(&shape, palette);
-        }
-
-        Cow::Owned(painter.into_string())
-    }
-
-    fn paint_shape<P: Palette>(&mut self, shape: &Spanned<FlatShape>, palette: &P) {
-        palette
-            .styles_for_shape(shape)
-            .iter()
-            .for_each(|x| self.paint(x));
-    }
-
-    fn paint(&mut self, styled_span: &Spanned<Style>) {
-        for pos in styled_span.span.start()..styled_span.span.end() {
-            if pos < self.styles.len() {
-                self.styles[pos] = styled_span.item;
-            }
-        }
-    }
-
-    fn into_string(self) -> String {
-        let mut idx_start = 0;
-        let mut idx_end = 1;
-
-        if self.original.is_empty() {
-            String::new()
-        } else {
-            let mut builder = String::new();
-
-            let mut current_style = self.styles[0];
-
-            while idx_end < self.styles.len() {
-                if self.styles[idx_end] != current_style {
-                    // Emit, as we changed styles
-                    let intermediate = String::from_utf8_lossy(&self.original[idx_start..idx_end]);
-
-                    builder.push_str(&current_style.paint(intermediate).to_string());
-
-                    current_style = self.styles[idx_end];
-                    idx_start = idx_end;
-                }
-                idx_end += 1;
-            }
-
-            let intermediate = String::from_utf8_lossy(&self.original[idx_start..idx_end]);
-            builder.push_str(&current_style.paint(intermediate).to_string());
-
-            builder
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/palette.rs b/old_nushell/crates/nu-engine/src/shell/palette.rs
deleted file mode 100644
index 5ad93f58b..000000000
--- a/old_nushell/crates/nu-engine/src/shell/palette.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-use nu_ansi_term::{Color, Style};
-use nu_protocol::hir::FlatShape;
-use nu_source::{Span, Spanned};
-use serde::{self, Deserialize, Deserializer, Serialize, Serializer};
-use std::error::Error;
-use std::ops::Deref;
-use std::str::Bytes;
-use std::{fmt, io};
-
-pub trait Palette {
-    fn styles_for_shape(&self, shape: &Spanned<FlatShape>) -> Vec<Spanned<Style>>;
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct DefaultPalette {}
-
-impl Palette for DefaultPalette {
-    fn styles_for_shape(&self, shape: &Spanned<FlatShape>) -> Vec<Spanned<Style>> {
-        match &shape.item {
-            FlatShape::BareMember => single_style_span(Color::Yellow.bold(), shape.span),
-            FlatShape::CloseDelimiter(_) => single_style_span(Color::White.normal(), shape.span),
-            FlatShape::Comment => single_style_span(Color::Green.bold(), shape.span),
-            FlatShape::Decimal => single_style_span(Color::Purple.bold(), shape.span),
-            FlatShape::Dot => single_style_span(Style::new().fg(Color::White), shape.span),
-            FlatShape::DotDot => single_style_span(Color::Yellow.bold(), shape.span),
-            FlatShape::DotDotLeftAngleBracket => {
-                single_style_span(Color::Yellow.bold(), shape.span)
-            }
-            FlatShape::ExternalCommand => single_style_span(Color::Cyan.normal(), shape.span),
-            FlatShape::ExternalWord => single_style_span(Color::Green.bold(), shape.span),
-            FlatShape::Flag => single_style_span(Color::Blue.bold(), shape.span),
-            FlatShape::Garbage => {
-                single_style_span(Style::new().fg(Color::White).on(Color::Red), shape.span)
-            }
-            FlatShape::GlobPattern => single_style_span(Color::Cyan.bold(), shape.span),
-            FlatShape::Identifier => single_style_span(Color::Purple.normal(), shape.span),
-            FlatShape::Int => single_style_span(Color::Purple.bold(), shape.span),
-            FlatShape::InternalCommand => single_style_span(Color::Cyan.bold(), shape.span),
-            FlatShape::ItVariable => single_style_span(Color::Purple.bold(), shape.span),
-            FlatShape::Keyword => single_style_span(Color::Purple.bold(), shape.span),
-            FlatShape::OpenDelimiter(_) => single_style_span(Color::White.normal(), shape.span),
-            FlatShape::Operator => single_style_span(Color::Yellow.normal(), shape.span),
-            FlatShape::Path => single_style_span(Color::Cyan.normal(), shape.span),
-            FlatShape::Pipe => single_style_span(Color::Purple.bold(), shape.span),
-            FlatShape::Separator => single_style_span(Color::White.normal(), shape.span),
-            FlatShape::ShorthandFlag => single_style_span(Color::Blue.bold(), shape.span),
-            FlatShape::Size { number, unit } => vec![
-                Spanned::<Style> {
-                    span: *number,
-                    item: Color::Purple.bold(),
-                },
-                Spanned::<Style> {
-                    span: *unit,
-                    item: Color::Cyan.bold(),
-                },
-            ],
-            FlatShape::String => single_style_span(Color::Green.normal(), shape.span),
-            FlatShape::StringMember => single_style_span(Color::Yellow.bold(), shape.span),
-            FlatShape::Type => single_style_span(Color::Blue.bold(), shape.span),
-            FlatShape::Variable => single_style_span(Color::Purple.normal(), shape.span),
-            FlatShape::Whitespace => single_style_span(Color::White.normal(), shape.span),
-            FlatShape::Word => single_style_span(Color::Green.normal(), shape.span),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct ThemedPalette {
-    theme: Theme,
-}
-
-impl ThemedPalette {
-    pub fn new<R: io::Read>(reader: &mut R) -> Result<ThemedPalette, ThemeError> {
-        let theme = serde_json::from_reader(reader)?;
-        Ok(ThemedPalette { theme })
-    }
-
-    pub fn default() -> ThemedPalette {
-        let theme = Theme::default();
-        ThemedPalette { theme }
-    }
-}
-
-impl Palette for ThemedPalette {
-    fn styles_for_shape(&self, shape: &Spanned<FlatShape>) -> Vec<Spanned<Style>> {
-        match &shape.item {
-            FlatShape::OpenDelimiter(_) => {
-                single_style_span(self.theme.open_delimiter.normal(), shape.span)
-            }
-            FlatShape::CloseDelimiter(_) => {
-                single_style_span(self.theme.close_delimiter.normal(), shape.span)
-            }
-            FlatShape::ItVariable => single_style_span(self.theme.it_variable.bold(), shape.span),
-            FlatShape::Keyword => single_style_span(self.theme.keyword.bold(), shape.span),
-            FlatShape::Variable => single_style_span(self.theme.variable.normal(), shape.span),
-            FlatShape::Identifier => single_style_span(self.theme.identifier.normal(), shape.span),
-            FlatShape::Type => single_style_span(self.theme.r#type.bold(), shape.span),
-            FlatShape::Operator => single_style_span(self.theme.operator.normal(), shape.span),
-            FlatShape::DotDotLeftAngleBracket => {
-                single_style_span(self.theme.dot_dot.bold(), shape.span)
-            }
-            FlatShape::DotDot => single_style_span(self.theme.dot_dot.bold(), shape.span),
-            FlatShape::Dot => single_style_span(Style::new().fg(*self.theme.dot), shape.span),
-            FlatShape::InternalCommand => {
-                single_style_span(self.theme.internal_command.bold(), shape.span)
-            }
-            FlatShape::ExternalCommand => {
-                single_style_span(self.theme.external_command.normal(), shape.span)
-            }
-            FlatShape::ExternalWord => {
-                single_style_span(self.theme.external_word.bold(), shape.span)
-            }
-            FlatShape::BareMember => single_style_span(self.theme.bare_member.bold(), shape.span),
-            FlatShape::StringMember => {
-                single_style_span(self.theme.string_member.bold(), shape.span)
-            }
-            FlatShape::String => single_style_span(self.theme.string.normal(), shape.span),
-            FlatShape::Path => single_style_span(self.theme.path.normal(), shape.span),
-            FlatShape::GlobPattern => single_style_span(self.theme.glob_pattern.bold(), shape.span),
-            FlatShape::Word => single_style_span(self.theme.word.normal(), shape.span),
-            FlatShape::Pipe => single_style_span(self.theme.pipe.bold(), shape.span),
-            FlatShape::Flag => single_style_span(self.theme.flag.bold(), shape.span),
-            FlatShape::ShorthandFlag => {
-                single_style_span(self.theme.shorthand_flag.bold(), shape.span)
-            }
-            FlatShape::Int => single_style_span(self.theme.int.bold(), shape.span),
-            FlatShape::Decimal => single_style_span(self.theme.decimal.bold(), shape.span),
-            FlatShape::Whitespace => single_style_span(self.theme.whitespace.normal(), shape.span),
-            FlatShape::Separator => single_style_span(self.theme.separator.normal(), shape.span),
-            FlatShape::Comment => single_style_span(self.theme.comment.bold(), shape.span),
-            FlatShape::Garbage => single_style_span(
-                Style::new().fg(*self.theme.garbage).on(Color::Red),
-                shape.span,
-            ),
-            FlatShape::Size { number, unit } => vec![
-                Spanned::<Style> {
-                    span: *number,
-                    item: self.theme.size_number.bold(),
-                },
-                Spanned::<Style> {
-                    span: *unit,
-                    item: self.theme.size_unit.bold(),
-                },
-            ],
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ThemeError {
-    serde_err: serde_json::error::Error,
-}
-
-impl fmt::Display for ThemeError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "failure to load theme")
-    }
-}
-
-impl Error for ThemeError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        Some(&self.serde_err)
-    }
-}
-
-impl From<serde_json::error::Error> for ThemeError {
-    fn from(serde_err: serde_json::error::Error) -> Self {
-        ThemeError { serde_err }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Debug)]
-struct Theme {
-    bare_member: ThemeColor,
-    close_delimiter: ThemeColor,
-    comment: ThemeColor,
-    decimal: ThemeColor,
-    dot: ThemeColor,
-    dot_dot: ThemeColor,
-    dot_dot_left_angle_bracket: ThemeColor,
-    external_command: ThemeColor,
-    external_word: ThemeColor,
-    flag: ThemeColor,
-    garbage: ThemeColor,
-    glob_pattern: ThemeColor,
-    identifier: ThemeColor,
-    int: ThemeColor,
-    internal_command: ThemeColor,
-    it_variable: ThemeColor,
-    keyword: ThemeColor,
-    open_delimiter: ThemeColor,
-    operator: ThemeColor,
-    path: ThemeColor,
-    pipe: ThemeColor,
-    separator: ThemeColor,
-    shorthand_flag: ThemeColor,
-    size_number: ThemeColor,
-    size_unit: ThemeColor,
-    string: ThemeColor,
-    string_member: ThemeColor,
-    r#type: ThemeColor,
-    variable: ThemeColor,
-    whitespace: ThemeColor,
-    word: ThemeColor,
-}
-
-impl Default for Theme {
-    fn default() -> Self {
-        Theme {
-            bare_member: ThemeColor(Color::Yellow),
-            close_delimiter: ThemeColor(Color::White),
-            comment: ThemeColor(Color::Green),
-            decimal: ThemeColor(Color::Purple),
-            dot: ThemeColor(Color::White),
-            dot_dot: ThemeColor(Color::Yellow),
-            dot_dot_left_angle_bracket: ThemeColor(Color::Yellow),
-            external_command: ThemeColor(Color::Cyan),
-            external_word: ThemeColor(Color::Green),
-            flag: ThemeColor(Color::Blue),
-            garbage: ThemeColor(Color::White),
-            glob_pattern: ThemeColor(Color::Cyan),
-            identifier: ThemeColor(Color::Purple),
-            int: ThemeColor(Color::Purple),
-            internal_command: ThemeColor(Color::Cyan),
-            it_variable: ThemeColor(Color::Purple),
-            keyword: ThemeColor(Color::Purple),
-            open_delimiter: ThemeColor(Color::White),
-            operator: ThemeColor(Color::Yellow),
-            path: ThemeColor(Color::Cyan),
-            pipe: ThemeColor(Color::Purple),
-            separator: ThemeColor(Color::Red),
-            shorthand_flag: ThemeColor(Color::Blue),
-            size_number: ThemeColor(Color::Purple),
-            size_unit: ThemeColor(Color::Cyan),
-            string: ThemeColor(Color::Green),
-            string_member: ThemeColor(Color::Yellow),
-            r#type: ThemeColor(Color::Blue),
-            variable: ThemeColor(Color::Purple),
-            whitespace: ThemeColor(Color::White),
-            word: ThemeColor(Color::Green),
-            // These should really be Styles and not colors
-            // leave this here for the next change to make
-            // ThemeColor, ThemeStyle.
-            // open_delimiter: ThemeColor(Color::White.normal()),
-            // close_delimiter: ThemeColor(Color::White.normal()),
-            // it_variable: ThemeColor(Color::Purple.bold()),
-            // variable: ThemeColor(Color::Purple.normal()),
-            // r#type: ThemeColor(Color::Blue.bold()),
-            // identifier: ThemeColor(Color::Purple.normal()),
-            // operator: ThemeColor(Color::Yellow.normal()),
-            // dot: ThemeColor(Color::White),
-            // dot_dot: ThemeColor(Color::Yellow.bold()),
-            // //missing DotDotLeftAngleBracket
-            // internal_command: ThemeColor(Color::Cyan.bold()),
-            // external_command: ThemeColor(Color::Cyan.normal()),
-            // external_word: ThemeColor(Color::Green.bold()),
-            // bare_member: ThemeColor(Color::Yellow.bold()),
-            // string: ThemeColor(Color::Green.normal()),
-            // string_member: ThemeColor(Color::Yellow.bold()),
-            // path: ThemeColor(Color::Cyan.normal()),
-            // glob_pattern: ThemeColor(Color::Cyan.bold()),
-            // word: ThemeColor(Color::Green.normal()),
-            // keyword: ThemeColor(Color::Purple.bold()),
-            // pipe: ThemeColor(Color::Purple.bold()),
-            // flag: ThemeColor(Color::Blue.bold()),
-            // shorthand_flag: ThemeColor(Color::Blue.bold()),
-            // int: ThemeColor(Color::Purple.bold()),
-            // decimal: ThemeColor(Color::Purple.bold()),
-            // garbage: ThemeColor(Style::new().fg(Color::White).on(Color::Red)),
-            // whitespace: ThemeColor(Color::White.normal()),
-            // separator: ThemeColor(Color::Red),
-            // comment: ThemeColor(Color::Green.bold()),
-            // size_number: ThemeColor(Color::Purple.bold()),
-            // size_unit: ThemeColor(Color::Cyan.bold()),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-struct ThemeColor(Color);
-
-impl Deref for ThemeColor {
-    type Target = Color;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Serialize for ThemeColor {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str("TODO: IMPLEMENT SERIALIZATION")
-    }
-}
-
-impl<'de> Deserialize<'de> for ThemeColor {
-    fn deserialize<D>(deserializer: D) -> Result<ThemeColor, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        ThemeColor::from_str(&s)
-    }
-}
-
-impl ThemeColor {
-    fn from_str<E>(s: &str) -> Result<ThemeColor, E>
-    where
-        E: serde::de::Error,
-    {
-        let mut bytes = s.bytes();
-        let r = ThemeColor::xtoi(&mut bytes)?;
-        let g = ThemeColor::xtoi(&mut bytes)?;
-        let b = ThemeColor::xtoi(&mut bytes)?;
-        Ok(ThemeColor(Color::Rgb(r, g, b)))
-    }
-
-    fn xtoi<E>(b: &mut Bytes) -> Result<u8, E>
-    where
-        E: serde::de::Error,
-    {
-        let upper = b
-            .next()
-            .ok_or_else(|| E::custom("color string too short"))?;
-        let lower = b
-            .next()
-            .ok_or_else(|| E::custom("color string too short"))?;
-        let mut val = ThemeColor::numerical_value(upper)?;
-        val = (val << 4) | ThemeColor::numerical_value(lower)?;
-        Ok(val)
-    }
-
-    fn numerical_value<E>(character: u8) -> Result<u8, E>
-    where
-        E: serde::de::Error,
-    {
-        match character {
-            b'0'..=b'9' => Ok(character - b'0'),
-            b'a'..=b'z' => Ok(character - (b'a' - 10)),
-            _ => Err(E::custom(format!("invalid character {}", character))),
-        }
-    }
-}
-
-fn single_style_span(style: Style, span: Span) -> Vec<Spanned<Style>> {
-    vec![Spanned::<Style> { span, item: style }]
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{Palette, ThemedPalette};
-    use nu_ansi_term::Color;
-    use nu_protocol::hir::FlatShape;
-    use nu_source::{Span, Spanned};
-    use std::io::Cursor;
-
-    #[test]
-    fn create_themed_palette() {
-        let json = r#"
-{
-    "bare_member": "a359cc",
-    "close_delimiter": "a359cc",
-    "comment": "a359cc",
-    "decimal": "a359cc",
-    "dot": "a359cc",
-    "dot_dot": "a359cc",
-    "dot_dot_left_angle_bracket": "a359cc",
-    "external_command": "a359cc",
-    "external_word": "a359cc",
-    "flag": "a359cc",
-    "garbage": "a359cc",
-    "glob_pattern": "a359cc",
-    "identifier": "a359cc",
-    "int": "a359cc",
-    "internal_command": "a359cc",
-    "it_variable": "a359cc",
-    "keyword": "a359cc",
-    "open_delimiter": "a359cc",
-    "operator": "a359cc",
-    "path": "a359cc",
-    "pipe": "a359cc",
-    "separator": "a359cc",
-    "shorthand_flag": "a359cc",
-    "size_number": "a359cc",
-    "size_unit": "a359cc",
-    "string": "a359cc",
-    "string_member": "a359cc",
-    "type": "a359cc",
-    "variable": "a359cc",
-    "whitespace": "a359cc",
-    "word": "a359cc"
-}"#;
-        let mut json_reader = Cursor::new(json);
-        let themed_palette = ThemedPalette::new(&mut json_reader).unwrap();
-        let test_shape = Spanned {
-            item: FlatShape::Type,
-            span: Span::new(4, 9),
-        };
-        let styled = themed_palette.styles_for_shape(&test_shape);
-        assert_eq!(styled.len(), 1);
-        assert_eq!(
-            styled[0],
-            Spanned {
-                item: Color::Rgb(163, 89, 204).bold(),
-                span: Span::new(4, 9),
-            },
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/shell_args.rs b/old_nushell/crates/nu-engine/src/shell/shell_args.rs
deleted file mode 100644
index fb6f865fc..000000000
--- a/old_nushell/crates/nu-engine/src/shell/shell_args.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_source::Tagged;
-use serde::{self, Deserialize};
-use std::path::PathBuf;
-
-#[derive(Deserialize)]
-pub struct CdArgs {
-    pub path: Option<Tagged<PathBuf>>,
-}
-
-#[derive(Deserialize)]
-pub struct CopyArgs {
-    pub src: Tagged<PathBuf>,
-    pub dst: Tagged<PathBuf>,
-    pub recursive: bool,
-}
-
-#[derive(Deserialize)]
-pub struct LsArgs {
-    pub path: Option<Tagged<PathBuf>>,
-    pub all: bool,
-    pub long: bool,
-    #[serde(rename = "short-names")]
-    pub short_names: bool,
-    #[serde(rename = "du")]
-    pub du: bool,
-}
-
-#[derive(Deserialize)]
-pub struct MvArgs {
-    pub src: Tagged<PathBuf>,
-    pub dst: Tagged<PathBuf>,
-}
-
-#[derive(Deserialize)]
-pub struct MkdirArgs {
-    pub rest: Vec<Tagged<PathBuf>>,
-    #[serde(rename = "show-created-paths")]
-    pub show_created_paths: bool,
-}
-
-#[derive(Deserialize)]
-pub struct RemoveArgs {
-    pub rest: Vec<Tagged<PathBuf>>,
-    pub recursive: bool,
-    #[allow(unused)]
-    pub trash: bool,
-    #[allow(unused)]
-    pub permanent: bool,
-    pub force: bool,
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/shell_manager.rs b/old_nushell/crates/nu-engine/src/shell/shell_manager.rs
deleted file mode 100644
index d1430ef2c..000000000
--- a/old_nushell/crates/nu-engine/src/shell/shell_manager.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use crate::shell::Shell;
-use crate::{filesystem::filesystem_shell::FilesystemShellMode, maybe_text_codec::StringOrBinary};
-use crate::{CommandArgs, FilesystemShell};
-use nu_stream::{ActionStream, OutputStream};
-
-use crate::shell::shell_args::{CdArgs, CopyArgs, LsArgs, MkdirArgs, MvArgs, RemoveArgs};
-use encoding_rs::Encoding;
-use nu_errors::ShellError;
-use nu_source::{Span, Tag};
-use parking_lot::Mutex;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::sync::Arc;
-
-#[derive(Clone, Default, Debug)]
-pub struct ShellManager {
-    pub current_shell: Arc<AtomicUsize>,
-    pub shells: Arc<Mutex<Vec<Box<dyn Shell + Send>>>>,
-}
-
-impl ShellManager {
-    pub fn basic() -> ShellManager {
-        ShellManager {
-            current_shell: Arc::new(AtomicUsize::new(0)),
-            shells: Arc::new(Mutex::new(vec![Box::new(FilesystemShell::basic(
-                FilesystemShellMode::Cli,
-            ))])),
-        }
-    }
-
-    pub fn enter_script_mode(&self) -> Result<(), std::io::Error> {
-        //New fs_shell starting from current path
-        let fs_shell = FilesystemShell::with_location(self.path(), FilesystemShellMode::Script)?;
-        self.insert_at_current(Box::new(fs_shell));
-        Ok(())
-    }
-
-    pub fn insert_at_current(&self, shell: Box<dyn Shell + Send>) {
-        self.shells.lock().push(shell);
-        self.current_shell
-            .store(self.shells.lock().len() - 1, Ordering::SeqCst);
-        self.set_path(self.path());
-    }
-
-    pub fn current_shell(&self) -> usize {
-        self.current_shell.load(Ordering::SeqCst)
-    }
-
-    pub fn remove_at_current(&self) {
-        {
-            let mut shells = self.shells.lock();
-            if shells.len() > 0 {
-                if self.current_shell() == shells.len() - 1 {
-                    shells.pop();
-                    let new_len = shells.len();
-                    if new_len > 0 {
-                        self.current_shell.store(new_len - 1, Ordering::SeqCst);
-                    } else {
-                        return;
-                    }
-                } else {
-                    shells.remove(self.current_shell());
-                }
-            }
-        }
-        self.set_path(self.path())
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.shells.lock().is_empty()
-    }
-
-    pub fn is_interactive(&self) -> bool {
-        self.shells.lock()[self.current_shell()].is_interactive()
-    }
-
-    pub fn path(&self) -> String {
-        self.shells.lock()[self.current_shell()].path()
-    }
-
-    pub fn pwd(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        let env = self.shells.lock();
-
-        env[self.current_shell()].pwd(args)
-    }
-
-    pub fn set_path(&self, path: String) {
-        self.shells.lock()[self.current_shell()].set_path(path)
-    }
-
-    pub fn open(
-        &self,
-        full_path: &Path,
-        name: Span,
-        with_encoding: Option<&'static Encoding>,
-    ) -> Result<
-        Box<dyn Iterator<Item = Result<StringOrBinary, ShellError>> + Send + Sync>,
-        ShellError,
-    > {
-        self.shells.lock()[self.current_shell()].open(full_path, name, with_encoding)
-    }
-
-    pub fn save(
-        &self,
-        full_path: &Path,
-        save_data: &[u8],
-        name: Span,
-        append: bool,
-    ) -> Result<OutputStream, ShellError> {
-        self.shells.lock()[self.current_shell()].save(full_path, save_data, name, append)
-    }
-
-    pub fn next(&self) {
-        {
-            let shell_len = self.shells.lock().len();
-            if self.current_shell() == (shell_len - 1) {
-                self.current_shell.store(0, Ordering::SeqCst);
-            } else {
-                self.current_shell
-                    .store(self.current_shell() + 1, Ordering::SeqCst);
-            }
-        }
-        self.set_path(self.path())
-    }
-
-    pub fn prev(&self) {
-        {
-            let shell_len = self.shells.lock().len();
-            if self.current_shell() == 0 {
-                self.current_shell.store(shell_len - 1, Ordering::SeqCst);
-            } else {
-                self.current_shell
-                    .store(self.current_shell() - 1, Ordering::SeqCst);
-            }
-        }
-        self.set_path(self.path())
-    }
-
-    pub fn goto(&self, i: usize) {
-        {
-            let shell_len = self.shells.lock().len();
-            if i < shell_len {
-                self.current_shell.store(i, Ordering::SeqCst);
-            }
-        }
-        self.set_path(self.path())
-    }
-
-    pub fn homedir(&self) -> Option<PathBuf> {
-        let env = self.shells.lock();
-
-        env[self.current_shell()].homedir()
-    }
-
-    pub fn ls(
-        &self,
-        args: LsArgs,
-        name: Tag,
-        ctrl_c: Arc<AtomicBool>,
-    ) -> Result<ActionStream, ShellError> {
-        let env = self.shells.lock();
-
-        env[self.current_shell()].ls(args, name, ctrl_c)
-    }
-
-    pub fn cd(&self, args: CdArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let env = self.shells.lock();
-
-        env[self.current_shell()].cd(args, name)
-    }
-
-    pub fn cp(&self, args: CopyArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let shells = self.shells.lock();
-
-        let path = shells[self.current_shell()].path();
-        shells[self.current_shell()].cp(args, name, &path)
-    }
-
-    pub fn rm(&self, args: RemoveArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let shells = self.shells.lock();
-
-        let path = shells[self.current_shell()].path();
-        shells[self.current_shell()].rm(args, name, &path)
-    }
-
-    pub fn mkdir(&self, args: MkdirArgs, name: Tag) -> Result<OutputStream, ShellError> {
-        let shells = self.shells.lock();
-
-        let path = shells[self.current_shell()].path();
-        shells[self.current_shell()].mkdir(args, name, &path)
-    }
-
-    pub fn mv(&self, args: MvArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let shells = self.shells.lock();
-
-        let path = shells[self.current_shell()].path();
-        shells[self.current_shell()].mv(args, name, &path)
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/shell/value_shell.rs b/old_nushell/crates/nu-engine/src/shell/value_shell.rs
deleted file mode 100644
index eb2a212ce..000000000
--- a/old_nushell/crates/nu-engine/src/shell/value_shell.rs
+++ /dev/null
@@ -1,262 +0,0 @@
-use crate::maybe_text_codec::StringOrBinary;
-use crate::shell::shell_args::{CdArgs, CopyArgs, LsArgs, MkdirArgs, MvArgs, RemoveArgs};
-use crate::shell::Shell;
-use crate::CommandArgs;
-use encoding_rs::Encoding;
-use nu_errors::ShellError;
-use nu_protocol::ValueStructure;
-use nu_protocol::{ReturnSuccess, ShellTypeName, UntaggedValue, Value};
-use nu_source::SpannedItem;
-use nu_source::{Span, Tag, Tagged};
-use nu_stream::{ActionStream, OutputStream};
-use nu_value_ext::ValueExt;
-use std::collections::VecDeque;
-use std::ffi::OsStr;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-#[derive(Clone)]
-pub struct ValueShell {
-    pub(crate) path: String,
-    pub(crate) last_path: String,
-    pub(crate) value: Value,
-}
-
-impl std::fmt::Debug for ValueShell {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "ValueShell @ {}", self.path)
-    }
-}
-
-impl ValueShell {
-    pub fn new(value: Value) -> ValueShell {
-        ValueShell {
-            path: "/".to_string(),
-            last_path: "/".to_string(),
-            value,
-        }
-    }
-
-    pub fn find(&self, path: &Path) -> Option<&Self> {
-        let mut value_system = ValueStructure::new();
-
-        if value_system.walk_decorate(&self.value).is_ok() {
-            value_system.exists(path).then(|| self)
-        } else {
-            None
-        }
-    }
-
-    pub fn members_under(&self, path: &Path) -> VecDeque<Value> {
-        let mut shell_entries = VecDeque::new();
-        let full_path = path.to_path_buf();
-        let mut viewed = self.value.clone();
-        let sep_string = std::path::MAIN_SEPARATOR.to_string();
-        let sep = OsStr::new(&sep_string);
-        for p in &full_path {
-            match p {
-                x if x == sep => {}
-                step => {
-                    let name: &str = &step.to_string_lossy().to_string();
-                    let value = viewed.get_data_by_key(name.spanned_unknown());
-                    if let Some(v) = value {
-                        viewed = v.clone();
-                    }
-                }
-            }
-        }
-        match viewed {
-            Value {
-                value: UntaggedValue::Table(l),
-                ..
-            } => {
-                for item in l {
-                    shell_entries.push_back(item.clone());
-                }
-            }
-            x => {
-                shell_entries.push_back(x);
-            }
-        }
-
-        shell_entries
-    }
-}
-
-impl Shell for ValueShell {
-    fn name(&self) -> String {
-        let anchor_name = self.value.anchor_name();
-
-        match anchor_name {
-            Some(x) => format!("{{{}}}", x),
-            None => format!("<{}>", self.value.type_name()),
-        }
-    }
-
-    fn homedir(&self) -> Option<PathBuf> {
-        Some(PathBuf::from("/"))
-    }
-
-    fn ls(
-        &self,
-        LsArgs { path, .. }: LsArgs,
-        name_tag: Tag,
-        _ctrl_c: Arc<AtomicBool>,
-    ) -> Result<ActionStream, ShellError> {
-        let mut full_path = PathBuf::from(self.path());
-
-        if let Some(value) = &path {
-            full_path.push(&value.item);
-        }
-
-        if self.find(&full_path).is_none() {
-            if let Some(target) = &path {
-                return Err(ShellError::labeled_error(
-                    "Can not list entries inside",
-                    "No such path exists",
-                    target.tag(),
-                ));
-            }
-
-            return Err(ShellError::labeled_error(
-                "Can not list entries inside",
-                "No such path exists",
-                name_tag,
-            ));
-        }
-
-        let output = self
-            .members_under(full_path.as_path())
-            .into_iter()
-            .map(ReturnSuccess::value)
-            .collect::<VecDeque<_>>();
-        Ok(output.into())
-    }
-
-    fn cd(&self, args: CdArgs, name: Tag) -> Result<ActionStream, ShellError> {
-        let destination = args.path;
-
-        let path = match destination {
-            None => "/".to_string(),
-            Some(ref v) => {
-                let Tagged { item: target, .. } = v;
-                let mut cwd = PathBuf::from(&self.path);
-
-                if target == &PathBuf::from("..") {
-                    cwd.pop();
-                } else if target == &PathBuf::from("-") {
-                    cwd = PathBuf::from(&self.last_path);
-                } else {
-                    match target.to_str() {
-                        Some(target) => match target.chars().next() {
-                            Some(x) if x == '/' => cwd = PathBuf::from(target),
-                            _ => cwd.push(target),
-                        },
-                        None => cwd.push(target),
-                    }
-                }
-                cwd.to_string_lossy().to_string()
-            }
-        };
-
-        let mut value_system = ValueStructure::new();
-        value_system.walk_decorate(&self.value)?;
-
-        if !value_system.exists(&PathBuf::from(&path)) {
-            if let Some(destination) = destination {
-                return Err(ShellError::labeled_error(
-                    "Can not change to path inside",
-                    "No such path exists",
-                    destination.tag(),
-                ));
-            }
-
-            return Err(ShellError::labeled_error(
-                "Can not change to path inside",
-                "No such path exists",
-                &name,
-            ));
-        }
-
-        Ok(ActionStream::one(ReturnSuccess::change_cwd(path)))
-    }
-
-    fn cp(&self, _args: CopyArgs, name: Tag, _path: &str) -> Result<ActionStream, ShellError> {
-        Err(ShellError::labeled_error(
-            "cp not currently supported on values",
-            "not currently supported",
-            name,
-        ))
-    }
-
-    fn mv(&self, _args: MvArgs, name: Tag, _path: &str) -> Result<ActionStream, ShellError> {
-        Err(ShellError::labeled_error(
-            "mv not currently supported on values",
-            "not currently supported",
-            name,
-        ))
-    }
-
-    fn mkdir(&self, _args: MkdirArgs, name: Tag, _path: &str) -> Result<OutputStream, ShellError> {
-        Err(ShellError::labeled_error(
-            "mkdir not currently supported on values",
-            "not currently supported",
-            name,
-        ))
-    }
-
-    fn rm(&self, _args: RemoveArgs, name: Tag, _path: &str) -> Result<ActionStream, ShellError> {
-        Err(ShellError::labeled_error(
-            "rm not currently supported on values",
-            "not currently supported",
-            name,
-        ))
-    }
-
-    fn path(&self) -> String {
-        self.path.clone()
-    }
-
-    fn pwd(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        Ok(ActionStream::one(
-            UntaggedValue::string(self.path()).into_value(&args.call_info.name_tag),
-        ))
-    }
-
-    fn set_path(&mut self, path: String) {
-        self.last_path = self.path.clone();
-        self.path = path;
-    }
-
-    fn open(
-        &self,
-        _path: &Path,
-        _name: Span,
-        _with_encoding: Option<&'static Encoding>,
-    ) -> Result<
-        Box<dyn Iterator<Item = Result<StringOrBinary, ShellError>> + Send + Sync>,
-        ShellError,
-    > {
-        Err(ShellError::unimplemented(
-            "open on help shell is not supported",
-        ))
-    }
-
-    fn save(
-        &mut self,
-        _path: &Path,
-        _contents: &[u8],
-        _name: Span,
-        _append: bool,
-    ) -> Result<OutputStream, ShellError> {
-        Err(ShellError::unimplemented(
-            "save on help shell is not supported",
-        ))
-    }
-
-    fn is_interactive(&self) -> bool {
-        //Value shell is always interactive
-        true
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/types.rs b/old_nushell/crates/nu-engine/src/types.rs
deleted file mode 100644
index fdc30d874..000000000
--- a/old_nushell/crates/nu-engine/src/types.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub(crate) mod deduction;
diff --git a/old_nushell/crates/nu-engine/src/types/deduction.rs b/old_nushell/crates/nu-engine/src/types/deduction.rs
deleted file mode 100644
index 79681191d..000000000
--- a/old_nushell/crates/nu-engine/src/types/deduction.rs
+++ /dev/null
@@ -1,1105 +0,0 @@
-#![allow(dead_code)]
-use crate::Scope;
-use itertools::{merge_join_by, EitherOrBoth, Itertools};
-use lazy_static::lazy_static;
-use log::trace;
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::{
-    hir::{
-        Binary, Block, ClassifiedCommand, Expression, Literal, NamedArguments, NamedValue,
-        Operator, Pipeline, SpannedExpression,
-    },
-    NamedType, PositionalType, Signature, SyntaxShape,
-};
-use nu_source::Span;
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, hash::Hash};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct VarDeclaration {
-    pub name: String,
-    // type_decl: Option<UntaggedValue>,
-    // scope: ?
-    pub span: Span,
-}
-
-//TODO This functionality should probably be somehow added to the Expression enum.
-//I am not sure for the best rust iconic way to do that
-fn is_special_var(var_name: &str) -> bool {
-    var_name == "$it"
-}
-
-#[derive(Debug, Clone)]
-pub enum Deduction {
-    VarShapeDeduction(Vec<VarShapeDeduction>),
-    //A deduction for VarArgs will have a different layout than for a normal var
-    //Therefore Deduction is implemented as a enum
-    // VarArgShapeDeduction(VarArgShapeDeduction),
-}
-
-// That would be one possible layout for a var arg shape deduction
-// #[derive(Debug, Clone, Serialize, Deserialize)]
-// pub struct VarArgShapeDeduction {
-//     /// Spans pointing to the source of the deduction.
-//     /// The spans locate positions within the tag of var_decl
-//     pub deduced_from: Vec<Span>,
-//     pub pos_shapes: Vec<(PositionalType, String)>,
-//     pub rest_shape: Option<(SyntaxShape, String)>,
-// }
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct VarShapeDeduction {
-    pub deduction: SyntaxShape,
-    /// Spans pointing to the source of the deduction.
-    /// The spans locate positions within the tag of var_decl
-    pub deducted_from: Vec<Span>,
-}
-
-impl VarShapeDeduction {
-    pub fn from_usage(usage: &Span, deduced_shape: &SyntaxShape) -> VarShapeDeduction {
-        VarShapeDeduction {
-            deduction: *deduced_shape,
-            deducted_from: vec![*usage],
-        }
-    }
-
-    pub fn from_usage_with_alternatives(
-        usage: &Span,
-        alternatives: &[SyntaxShape],
-    ) -> Vec<VarShapeDeduction> {
-        alternatives
-            .iter()
-            .map(|shape| VarShapeDeduction::from_usage(usage, shape))
-            .collect()
-    }
-}
-
-//Lookup table for possible shape inferences of variables inside binary expressions
-// (Operator, VariableSide, ShapeOfArg) -> List of possible shapes for the var
-lazy_static! {
-    static ref MULT_DIV_LOOKUP_TABLE: HashMap<(Operator, BinarySide, SyntaxShape), Vec<SyntaxShape>> = {
-        vec![
-            ((Operator::Divide, BinarySide::Left, SyntaxShape::Number),       // expr => possible var shapes
-             vec![SyntaxShape::Filesize, SyntaxShape::Duration, SyntaxShape::Number, SyntaxShape::Int]), //$var / number => Unit, Int, Number
-            ((Operator::Divide, BinarySide::Left, SyntaxShape::Int),
-             vec![SyntaxShape::Filesize, SyntaxShape::Duration, SyntaxShape::Number, SyntaxShape::Int]), //$var / int => Unit, Int, Number
-            ((Operator::Divide, BinarySide::Left, SyntaxShape::Filesize),
-             vec![SyntaxShape::Filesize, SyntaxShape::Duration, SyntaxShape::Filesize]), //$var / unit => Unit
-            ((Operator::Divide, BinarySide::Right, SyntaxShape::Number),
-             vec![SyntaxShape::Number, SyntaxShape::Int]), //number / $var => Int, Number
-            ((Operator::Divide, BinarySide::Right, SyntaxShape::Int),
-             vec![SyntaxShape::Number, SyntaxShape::Int]), //int / $var => Int, Number
-            ((Operator::Divide, BinarySide::Right, SyntaxShape::Filesize),
-             vec![SyntaxShape::Filesize, SyntaxShape::Number, SyntaxShape::Int]), //unit / $var => unit, int, number
-
-            ((Operator::Multiply, BinarySide::Left, SyntaxShape::Number),
-             vec![SyntaxShape::Filesize, SyntaxShape::Number, SyntaxShape::Int]), //$var * number => Unit, Int, Number
-            ((Operator::Multiply, BinarySide::Left, SyntaxShape::Int),
-             vec![SyntaxShape::Filesize, SyntaxShape::Number, SyntaxShape::Int]), //$var * int => Unit, Int, Number
-            ((Operator::Multiply, BinarySide::Left, SyntaxShape::Filesize),
-             vec![SyntaxShape::Int, SyntaxShape::Number]), //$var * unit => int, number //TODO this changes as soon as more complex units arrive
-            ((Operator::Multiply, BinarySide::Right, SyntaxShape::Number),
-             vec![SyntaxShape::Filesize, SyntaxShape::Number, SyntaxShape::Int]), //number * $var => Unit, Int, Number
-            ((Operator::Multiply, BinarySide::Right, SyntaxShape::Int),
-             vec![SyntaxShape::Filesize, SyntaxShape::Number, SyntaxShape::Int]), //int * $var => Unit, Int, Number
-            ((Operator::Multiply, BinarySide::Right, SyntaxShape::Filesize),
-             vec![SyntaxShape::Int, SyntaxShape::Number]), //unit * $var => int, number //TODO this changes as soon as more complex units arrive
-            ].into_iter().collect()
-    };
-}
-
-pub struct VarSyntaxShapeDeductor {
-    //Initial set of caller provided var declarations
-    var_declarations: Vec<VarDeclaration>,
-    //Inferences for variables
-    inferences: HashMap<VarUsage, Deduction>,
-    //Var depending on another var via a operator
-    //First is a variable
-    //Second is a operator
-    //Third is a variable
-    dependencies: Vec<(VarUsage, (Operator, Span), VarUsage)>,
-    //A var depending on the result type of a spanned_expr
-    //First argument is var,
-    //Second is binary containing var op and result_bin_expr
-    //Third is binary expr, which result shape var depends on
-    //This list is populated for binaries like: $var + $baz * $bar
-    dependencies_on_result_type: Vec<(VarUsage, Operator, SpannedExpression)>,
-}
-
-#[derive(Clone, Debug, Eq)]
-pub struct VarUsage {
-    pub name: String,
-    /// Span describing where this var is used
-    pub span: Span,
-    //See below
-    //pub scope: ?
-}
-impl VarUsage {
-    pub fn new(name: &str, span: &Span) -> VarUsage {
-        VarUsage {
-            name: name.to_string(),
-            span: *span,
-        }
-    }
-}
-
-impl PartialEq<VarUsage> for VarUsage {
-    // When searching through the expressions, only the name of the
-    // Variable is available. (TODO And their scope). Their full definition is not available.
-    // Therefore the equals relationship is relaxed
-    fn eq(&self, other: &VarUsage) -> bool {
-        // TODO when scripting is available scope has to be respected
-        self.name == other.name
-        // && self.scope == other.scope
-    }
-}
-
-impl Hash for VarUsage {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.name.hash(state)
-    }
-}
-
-impl From<VarDeclaration> for VarUsage {
-    fn from(decl: VarDeclaration) -> Self {
-        //Span unknown as var can be used in multiple places including none
-        VarUsage::new(&decl.name, &Span::unknown())
-    }
-}
-impl From<&VarDeclaration> for VarUsage {
-    fn from(decl: &VarDeclaration) -> Self {
-        //Span unknown as var can be used in multiple places including none
-        VarUsage::new(&decl.name, &Span::unknown())
-    }
-}
-
-//REVIEW these 4 functions if correct types are returned
-fn get_shapes_allowed_in_table_header() -> Vec<SyntaxShape> {
-    vec![SyntaxShape::String]
-}
-
-fn get_shapes_allowed_in_path() -> Vec<SyntaxShape> {
-    vec![SyntaxShape::Int, SyntaxShape::String]
-}
-
-fn get_shapes_decay_able_to_bool() -> Vec<SyntaxShape> {
-    vec![SyntaxShape::Int]
-}
-
-fn get_shapes_allowed_in_range() -> Vec<SyntaxShape> {
-    vec![SyntaxShape::Int]
-}
-
-fn op_of(bin: &SpannedExpression) -> Operator {
-    match &bin.expr {
-        Expression::Binary(bin) => match bin.op.expr {
-            Expression::Literal(Literal::Operator(oper)) => oper,
-            _ => unreachable!(),
-        },
-        _ => unreachable!(),
-    }
-}
-
-//TODO in the future there should be a unit interface
-//which offers this functionality; SyntaxShape::Unit would then be
-//SyntaxShape::Unit(UnitType)
-/// Get the resulting type if op is applied to l_shape and r_shape
-/// Throws error if types are not coerceable
-///
-fn get_result_shape_of(
-    l_shape: SyntaxShape,
-    op_expr: &SpannedExpression,
-    r_shape: SyntaxShape,
-) -> SyntaxShape {
-    let op = match op_expr.expr {
-        Expression::Literal(Literal::Operator(op)) => op,
-        _ => unreachable!("Passing anything but the op expr is invalid"),
-    };
-    //TODO one should check that the types are coerceable.
-    //There is some code for that in the evaluator already.
-    //One might reuse it.
-    //For now we ignore this issue
-    match op {
-        Operator::Equal
-        | Operator::NotEqual
-        | Operator::LessThan
-        | Operator::GreaterThan
-        | Operator::In
-        | Operator::NotIn
-        | Operator::And
-        | Operator::Or
-        | Operator::LessThanOrEqual
-        | Operator::GreaterThanOrEqual
-        | Operator::Contains
-        | Operator::NotContains => {
-            //TODO introduce syntaxshape boolean
-            SyntaxShape::Int
-        }
-        Operator::Plus | Operator::Minus => {
-            //l_type +/- r_type gives l_type again (if no weird coercion)
-            l_shape
-        }
-        Operator::Multiply => {
-            if l_shape == SyntaxShape::Duration || r_shape == SyntaxShape::Duration {
-                SyntaxShape::Duration
-            } else {
-                SyntaxShape::Number
-            }
-        }
-        Operator::Divide => {
-            if l_shape == r_shape {
-                SyntaxShape::Number
-            } else if l_shape == SyntaxShape::Duration {
-                l_shape
-            } else {
-                SyntaxShape::Number
-            }
-        }
-        Operator::Modulo => SyntaxShape::Number,
-        Operator::Pow => SyntaxShape::Number,
-    }
-}
-
-fn get_shape_of_expr(expr: &SpannedExpression) -> Option<SyntaxShape> {
-    match &expr.expr {
-        Expression::Variable(_name, _) => {
-            //if name == "$it" {
-            //    //TODO infer type of $it
-            //    //therefore pipeline idx, pipeline and registry has to be passed here
-            //}
-            None
-        }
-        Expression::Literal(literal) => {
-            match literal {
-                nu_protocol::hir::Literal::Number(number) => match number {
-                    nu_protocol::hir::Number::BigInt(_) => Some(SyntaxShape::Int),
-                    nu_protocol::hir::Number::Int(_) => Some(SyntaxShape::Int),
-                    nu_protocol::hir::Number::Decimal(_) => Some(SyntaxShape::Number),
-                },
-                nu_protocol::hir::Literal::Size(_, _) => Some(SyntaxShape::Duration),
-                nu_protocol::hir::Literal::String(_) => Some(SyntaxShape::String),
-                //Rest should have failed at parsing stage?
-                nu_protocol::hir::Literal::GlobPattern(_) => Some(SyntaxShape::String),
-                nu_protocol::hir::Literal::Operator(_) => Some(SyntaxShape::Operator),
-                nu_protocol::hir::Literal::ColumnPath(_) => Some(SyntaxShape::ColumnPath),
-                nu_protocol::hir::Literal::Bare(_) => Some(SyntaxShape::String),
-            }
-        }
-        //Synthetic are expressions that are generated by the parser and not inputted by the user
-        //ExternalWord is anything sent to external commands (?)
-        Expression::ExternalWord => Some(SyntaxShape::String),
-        Expression::Synthetic(_) => Some(SyntaxShape::String),
-
-        Expression::Binary(_) => Some(SyntaxShape::RowCondition),
-        Expression::Range(_) => Some(SyntaxShape::Range),
-        Expression::List(_) => Some(SyntaxShape::Table),
-        Expression::Boolean(_) => Some(SyntaxShape::String),
-
-        Expression::FullColumnPath(_) => Some(SyntaxShape::ColumnPath),
-        Expression::FilePath(_) => Some(SyntaxShape::FilePath),
-        Expression::Block(_) => Some(SyntaxShape::Block),
-        Expression::ExternalCommand(_) => Some(SyntaxShape::String),
-        Expression::Table(_, _) => Some(SyntaxShape::Table),
-        Expression::Command => Some(SyntaxShape::String),
-        Expression::Subexpression(_) => Some(SyntaxShape::Block),
-        Expression::Garbage => unreachable!("Should have failed at parsing stage"),
-    }
-}
-
-fn spanned_to_binary(bin_spanned: &SpannedExpression) -> &Binary {
-    match &bin_spanned.expr {
-        Expression::Binary(bin) => bin,
-        _ => unreachable!(),
-    }
-}
-///Returns ShellError if types in math expression are not computable together according to
-///the operator of bin
-///Returns None if binary contains a variable and is therefore not computable
-///Returns result shape of this math expr otherwise
-fn get_result_shape_of_math_expr(
-    bin: &Binary,
-    (pipeline_idx, pipeline): (usize, &Pipeline),
-    scope: &Scope,
-) -> Result<Option<SyntaxShape>, ShellError> {
-    let mut shapes: Vec<Option<SyntaxShape>> = vec![];
-    for expr in [&bin.left, &bin.right] {
-        let shape = match &expr.expr {
-            Expression::Binary(deep_binary) => {
-                get_result_shape_of_math_expr(deep_binary, (pipeline_idx, pipeline), scope)?
-            }
-            _ => get_shape_of_expr(expr),
-        };
-        shapes.push(shape);
-    }
-    //match lhs, rhs
-    match (shapes[0], shapes[1]) {
-        (None, None) | (None, _) | (_, None) => Ok(None),
-        (Some(left), Some(right)) => Ok(Some(get_result_shape_of(left, &bin.op, right))),
-    }
-}
-
-#[derive(Hash, PartialEq, Eq)]
-enum BinarySide {
-    Left,
-    Right,
-}
-
-impl VarSyntaxShapeDeductor {
-    /// Deduce vars_to_find in block.
-    /// Returns: Mapping from var_to_find -> Vec<shape_deduction>
-    /// in which each shape_deduction is one possible deduction for the variable.
-    /// If a variable is used in at least 2 places with different
-    /// required shapes, that do not coerce into each other,
-    /// an error is returned.
-    /// If Option<Deduction> is None, no deduction can be made (for example if
-    /// the variable is not present in the block).
-    pub fn infer_vars(
-        vars_to_find: &[VarDeclaration],
-        block: &Block,
-        scope: &Scope,
-    ) -> Result<Vec<(VarDeclaration, Option<Deduction>)>, ShellError> {
-        trace!("Deducing shapes for vars: {:?}", vars_to_find);
-
-        let mut deducer = VarSyntaxShapeDeductor {
-            var_declarations: vars_to_find.to_owned(),
-            inferences: HashMap::new(),
-            // block,
-            dependencies: Vec::new(),
-            dependencies_on_result_type: Vec::new(),
-        };
-        deducer.infer_shape(block, scope)?;
-
-        deducer.solve_dependencies();
-        trace!("Found shapes for vars: {:?}", deducer.inferences);
-
-        Ok(deducer
-            .var_declarations
-            .iter()
-            .map(|decl| {
-                let usage: VarUsage = decl.into();
-                let deduction = deducer.inferences.get(&usage).cloned();
-                (decl.clone(), deduction)
-            })
-            .collect())
-    }
-
-    fn infer_shape(&mut self, block: &Block, scope: &Scope) -> Result<(), ShellError> {
-        trace!("Inferring vars in shape");
-        for group in &block.block {
-            for pipeline in &group.pipelines {
-                self.infer_pipeline(pipeline, scope)?;
-            }
-        }
-        Ok(())
-    }
-
-    pub fn infer_pipeline(&mut self, pipeline: &Pipeline, scope: &Scope) -> Result<(), ShellError> {
-        trace!("Inferring vars in pipeline");
-        for (cmd_pipeline_idx, classified) in pipeline.list.iter().enumerate() {
-            match &classified {
-                ClassifiedCommand::Internal(internal) => {
-                    if let Some(signature) = scope.get_signature(&internal.name) {
-                        //When the signature is given vars directly used as named or positional
-                        //arguments can be deduced
-                        //e.G. cp $var1 $var2
-                        if let Some(positional) = &internal.args.positional {
-                            //Infer shapes in positional
-                            self.infer_shapes_based_on_signature_positional(
-                                positional, &signature,
-                            )?;
-                        }
-                        if let Some(named) = &internal.args.named {
-                            //Infer shapes in named
-                            self.infer_shapes_based_on_signature_named(named, &signature)?;
-                        }
-                    }
-                    //vars in expressions can be deduced by their usage
-                    //e.G. 1..$var ($var is of type Int)
-                    if let Some(positional) = &internal.args.positional {
-                        //Infer shapes in positional
-                        for (_pos_idx, pos_expr) in positional.iter().enumerate() {
-                            self.infer_shapes_in_expr(
-                                (cmd_pipeline_idx, pipeline),
-                                pos_expr,
-                                scope,
-                            )?;
-                        }
-                    }
-                    if let Some(named) = &internal.args.named {
-                        trace!("Inferring vars in named exprs");
-                        for (_name, val) in named.iter() {
-                            if let NamedValue::Value(_, named_expr) = val {
-                                self.infer_shapes_in_expr(
-                                    (cmd_pipeline_idx, pipeline),
-                                    named_expr,
-                                    scope,
-                                )?;
-                            }
-                        }
-                    }
-                }
-                ClassifiedCommand::Expr(spanned_expr) => {
-                    trace!(
-                        "Inferring shapes in ClassifiedCommand::Expr: {:?}",
-                        spanned_expr
-                    );
-                    self.infer_shapes_in_expr((cmd_pipeline_idx, pipeline), spanned_expr, scope)?;
-                }
-                ClassifiedCommand::Dynamic(_) | ClassifiedCommand::Error(_) => unimplemented!(),
-            }
-        }
-        Ok(())
-    }
-
-    fn infer_shapes_based_on_signature_positional(
-        &mut self,
-        positionals: &[SpannedExpression],
-        signature: &Signature,
-    ) -> Result<(), ShellError> {
-        trace!("Inferring vars in positionals");
-        //TODO currently correct inference for optional positionals is not implemented.
-        // See https://github.com/nushell/nushell/pull/2486 for a discussion about this
-        // For now we assume every variable in an optional positional is used as this optional
-        // argument
-        trace!("Positionals len: {:?}", positionals.len());
-        for (pos_idx, positional) in positionals.iter().enumerate().rev() {
-            trace!("Handling pos_idx: {:?} of type: {:?}", pos_idx, positional);
-            if let Expression::Variable(var_name, _) = &positional.expr {
-                let deduced_shape = {
-                    if pos_idx >= signature.positional.len() {
-                        signature
-                            .rest_positional
-                            .as_ref()
-                            .map(|(_, shape, _)| shape)
-                    } else {
-                        match &signature.positional[pos_idx].0 {
-                            PositionalType::Mandatory(_, shape)
-                            | PositionalType::Optional(_, shape) => Some(shape),
-                        }
-                    }
-                };
-                trace!(
-                    "Found var: {:?} in positional_idx: {:?} of shape: {:?}",
-                    var_name,
-                    pos_idx,
-                    deduced_shape
-                );
-                if let Some(shape) = deduced_shape {
-                    self.checked_insert(
-                        &VarUsage::new(var_name, &positional.span),
-                        vec![VarShapeDeduction::from_usage(&positional.span, shape)],
-                    )?;
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn infer_shapes_based_on_signature_named(
-        &mut self,
-        named: &NamedArguments,
-        signature: &Signature,
-    ) -> Result<(), ShellError> {
-        trace!("Inferring vars in named");
-        for (name, val) in named.iter() {
-            if let NamedValue::Value(span, spanned_expr) = &val {
-                if let Expression::Variable(var_name, _) = &spanned_expr.expr {
-                    if let Some((named_type, _)) = signature.named.get(name) {
-                        if let NamedType::Mandatory(_, shape) | NamedType::Optional(_, shape) =
-                            named_type
-                        {
-                            trace!(
-                                "Found var: {:?} in named: {:?} of shape: {:?}",
-                                var_name,
-                                name,
-                                shape
-                            );
-                            self.checked_insert(
-                                &VarUsage::new(var_name, span),
-                                vec![VarShapeDeduction::from_usage(span, shape)],
-                            )?;
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn infer_shapes_in_expr(
-        &mut self,
-        (pipeline_idx, pipeline): (usize, &Pipeline),
-        spanned_expr: &SpannedExpression,
-        scope: &Scope,
-    ) -> Result<(), ShellError> {
-        match &spanned_expr.expr {
-            Expression::Binary(_) => {
-                trace!("Inferring vars in bin expr");
-                self.infer_shapes_in_binary_expr((pipeline_idx, pipeline), spanned_expr, scope)?;
-            }
-            Expression::Block(b) => {
-                trace!("Inferring vars in block");
-                self.infer_shape(b, scope)?;
-            }
-            Expression::FullColumnPath(path) => {
-                trace!("Inferring vars in path");
-                match &path.head.expr {
-                    //PathMember can't be var yet (?)
-                    //TODO Iterate over path parts and find var when implemented
-                    Expression::Subexpression(b) => self.infer_shape(b, scope)?,
-                    Expression::Variable(var_name, span) => {
-                        self.checked_insert(
-                            &VarUsage::new(var_name, span),
-                            VarShapeDeduction::from_usage_with_alternatives(
-                                span,
-                                &get_shapes_allowed_in_path(),
-                            ),
-                        )?;
-                    }
-                    _ => (),
-                }
-            }
-            Expression::Range(range) => {
-                trace!("Inferring vars in range");
-                if let Some(range_left) = &range.left {
-                    if let Expression::Variable(var_name, _) = &range_left.expr {
-                        self.checked_insert(
-                            &VarUsage::new(var_name, &spanned_expr.span),
-                            VarShapeDeduction::from_usage_with_alternatives(
-                                &spanned_expr.span,
-                                &get_shapes_allowed_in_range(),
-                            ),
-                        )?;
-                    }
-                }
-                if let Some(range_right) = &range.right {
-                    if let Expression::Variable(var_name, span) = &range_right.expr {
-                        self.checked_insert(
-                            &VarUsage::new(var_name, &spanned_expr.span),
-                            VarShapeDeduction::from_usage_with_alternatives(
-                                span,
-                                &get_shapes_allowed_in_range(),
-                            ),
-                        )?;
-                    }
-                }
-            }
-            Expression::List(inner_exprs) => {
-                trace!("Inferring vars in list");
-                for expr in inner_exprs {
-                    self.infer_shapes_in_expr((pipeline_idx, pipeline), expr, scope)?;
-                }
-            }
-            Expression::Subexpression(invoc) => {
-                trace!("Inferring vars in subexpression: {:?}", invoc);
-                self.infer_shape(invoc, scope)?;
-            }
-            Expression::Table(header, _rows) => {
-                self.infer_shapes_in_table_header(header)?;
-                // Shapes within columns can be heterogeneous as long as
-                // https://github.com/nushell/rfcs/pull/3
-                // didn't land
-                // self.infer_shapes_in_rows(_rows)?;
-            }
-            Expression::Variable(_, _) => {}
-            Expression::Literal(_) => {}
-            Expression::ExternalWord => {}
-            Expression::Synthetic(_) => {}
-            Expression::FilePath(_) => {}
-            Expression::ExternalCommand(_) => {}
-            Expression::Command => {}
-            Expression::Boolean(_) => {}
-            Expression::Garbage => {}
-        };
-
-        Ok(())
-    }
-
-    fn infer_shapes_in_table_header(
-        &mut self,
-        header: &[SpannedExpression],
-    ) -> Result<(), ShellError> {
-        for expr in header {
-            if let Expression::Variable(name, _) = &expr.expr {
-                let var = VarUsage::new(name, &expr.span);
-                self.checked_insert(
-                    &var,
-                    VarShapeDeduction::from_usage_with_alternatives(
-                        &var.span,
-                        &get_shapes_allowed_in_table_header(),
-                    ),
-                )?;
-            }
-        }
-        Ok(())
-    }
-
-    fn get_shape_of_expr_or_insert_dependency(
-        &mut self,
-        var: &VarUsage,
-        (op, span): (Operator, Span),
-        expr: &SpannedExpression,
-    ) -> Option<SyntaxShape> {
-        if let Expression::Variable(name, _) = &expr.expr {
-            self.dependencies
-                .push((var.clone(), (op, span), VarUsage::new(name, &expr.span)));
-            return None;
-        }
-        get_shape_of_expr(expr)
-    }
-
-    fn get_result_shape_of_math_expr_or_insert_dependency(
-        &mut self,
-        //var depending on result shape of expr (arg)
-        (var, expr): (&VarUsage, &SpannedExpression),
-        //source_bin is binary having var on one and expr on other side
-        source_bin: &SpannedExpression,
-        (pipeline_idx, pipeline): (usize, &Pipeline),
-        scope: &Scope,
-    ) -> Result<Option<SyntaxShape>, ShellError> {
-        get_result_shape_of_math_expr(spanned_to_binary(expr), (pipeline_idx, pipeline), scope).map(
-            |shape| {
-                if shape == None {
-                    self.dependencies_on_result_type.push((
-                        var.clone(),
-                        op_of(source_bin),
-                        expr.clone(),
-                    ));
-                }
-                shape
-            },
-        )
-    }
-
-    fn get_shape_of_binary_arg_or_insert_dependency(
-        &mut self,
-        //var depending on shape of expr (arg)
-        (var, expr): (&VarUsage, &SpannedExpression),
-        //source_bin is binary having var on one and expr on other side
-        source_bin: &SpannedExpression,
-        (pipeline_idx, pipeline): (usize, &Pipeline),
-        scope: &Scope,
-    ) -> Result<Option<SyntaxShape>, ShellError> {
-        trace!("Getting shape of binary arg {:?} for var {:?}", expr, var);
-        if let Some(shape) = self.get_shape_of_expr_or_insert_dependency(
-            var,
-            (op_of(source_bin), source_bin.span),
-            expr,
-        ) {
-            trace!("> Found shape: {:?}", shape);
-            match shape {
-                //If the shape of expr is math, we return the result shape of this math expr if
-                //possible
-                SyntaxShape::RowCondition => self
-                    .get_result_shape_of_math_expr_or_insert_dependency(
-                        (var, expr),
-                        source_bin,
-                        (pipeline_idx, pipeline),
-                        scope,
-                    ),
-                _ => Ok(Some(shape)),
-            }
-        } else {
-            trace!("> Could not deduce shape in expr");
-            Ok(None)
-        }
-    }
-
-    fn get_shapes_in_list_or_insert_dependency(
-        &mut self,
-        var: &VarUsage,
-        bin_spanned: &SpannedExpression,
-        list: &[SpannedExpression],
-        (_pipeline_idx, _pipeline): (usize, &Pipeline),
-    ) -> Option<Vec<SyntaxShape>> {
-        let shapes_in_list = list
-            .iter()
-            .filter_map(|expr| {
-                self.get_shape_of_expr_or_insert_dependency(
-                    var,
-                    (Operator::Equal, bin_spanned.span),
-                    expr,
-                )
-            })
-            .collect_vec();
-        if shapes_in_list.is_empty() {
-            None
-        } else {
-            Some(shapes_in_list)
-        }
-    }
-
-    fn infer_shapes_between_var_and_expr(
-        &mut self,
-        (var, expr): (&VarUsage, &SpannedExpression),
-        var_side: BinarySide,
-        //Binary having expr on one side and var on other
-        bin_spanned: &SpannedExpression,
-        (pipeline_idx, pipeline): (usize, &Pipeline),
-        scope: &Scope,
-    ) -> Result<(), ShellError> {
-        trace!("Inferring shapes between var {:?} and expr {:?}", var, expr);
-        let bin = spanned_to_binary(bin_spanned);
-        if let Expression::Literal(Literal::Operator(op)) = bin.op.expr {
-            match &op {
-                //For || and && we insert shapes decay able to bool
-                Operator::And | Operator::Or => {
-                    let shapes = get_shapes_decay_able_to_bool();
-                    // shapes.push(SyntaxShape::Math);
-                    self.checked_insert(
-                        var,
-                        VarShapeDeduction::from_usage_with_alternatives(&var.span, &shapes),
-                    )?;
-                }
-                Operator::Contains | Operator::NotContains => {
-                    self.checked_insert(
-                        var,
-                        vec![VarShapeDeduction::from_usage(
-                            &var.span,
-                            &SyntaxShape::String,
-                        )],
-                    )?;
-                }
-                Operator::In | Operator::NotIn => match var_side {
-                    BinarySide::Left => match &expr.expr {
-                        Expression::List(list) => {
-                            if !list.is_empty() {
-                                let shapes_in_list = self.get_shapes_in_list_or_insert_dependency(
-                                    var,
-                                    bin_spanned,
-                                    list,
-                                    (pipeline_idx, pipeline),
-                                );
-                                match shapes_in_list {
-                                    None => {}
-                                    Some(shapes_in_list) => {
-                                        self.checked_insert(
-                                            var,
-                                            VarShapeDeduction::from_usage_with_alternatives(
-                                                &var.span,
-                                                &shapes_in_list,
-                                            ),
-                                        )?;
-                                    }
-                                }
-                            }
-                        }
-                        Expression::Table(_, _)
-                        | Expression::Literal(_)
-                        | Expression::ExternalWord
-                        | Expression::Synthetic(_)
-                        | Expression::Variable(_, _)
-                        | Expression::Binary(_)
-                        | Expression::Range(_)
-                        | Expression::Block(_)
-                        | Expression::FullColumnPath(_)
-                        | Expression::FilePath(_)
-                        | Expression::ExternalCommand(_)
-                        | Expression::Command
-                        | Expression::Subexpression(_)
-                        | Expression::Boolean(_)
-                        | Expression::Garbage => {
-                            unreachable!("Parser should have rejected code. In only applicable with rhs of type List")
-                        }
-                    },
-                    BinarySide::Right => {
-                        self.checked_insert(
-                            var,
-                            VarShapeDeduction::from_usage_with_alternatives(
-                                &var.span,
-                                &[SyntaxShape::Table],
-                            ),
-                        )?;
-                    }
-                },
-                Operator::Modulo => {
-                    self.checked_insert(
-                        var,
-                        VarShapeDeduction::from_usage_with_alternatives(
-                            &var.span,
-                            &[SyntaxShape::Int, SyntaxShape::Number],
-                        ),
-                    )?;
-                }
-                Operator::Equal
-                | Operator::NotEqual
-                | Operator::LessThan
-                | Operator::GreaterThan
-                | Operator::LessThanOrEqual
-                | Operator::GreaterThanOrEqual
-                | Operator::Plus
-                | Operator::Minus => {
-                    if let Some(shape) = self.get_shape_of_binary_arg_or_insert_dependency(
-                        (var, expr),
-                        bin_spanned,
-                        (pipeline_idx, pipeline),
-                        scope,
-                    )? {
-                        match shape {
-                            SyntaxShape::Int | SyntaxShape::Number => {
-                                self.checked_insert(
-                                    var,
-                                    VarShapeDeduction::from_usage_with_alternatives(
-                                        &var.span,
-                                        &[SyntaxShape::Number, SyntaxShape::Int],
-                                    ),
-                                )?;
-                            }
-                            SyntaxShape::Duration => {
-                                self.checked_insert(
-                                    var,
-                                    VarShapeDeduction::from_usage_with_alternatives(
-                                        &var.span,
-                                        &[SyntaxShape::Duration],
-                                    ),
-                                )?;
-                            }
-                            SyntaxShape::Filesize => {
-                                self.checked_insert(
-                                    var,
-                                    VarShapeDeduction::from_usage_with_alternatives(
-                                        &var.span,
-                                        &[SyntaxShape::Filesize],
-                                    ),
-                                )?;
-                            }
-                            s => unreachable!(format!(
-                                "Shape of {:?} should have failed at parsing stage",
-                                s
-                            )),
-                        }
-                    }
-                }
-                Operator::Multiply | Operator::Divide | Operator::Pow => {
-                    if let Some(shape) = self.get_shape_of_binary_arg_or_insert_dependency(
-                        (var, expr),
-                        bin_spanned,
-                        (pipeline_idx, pipeline),
-                        scope,
-                    )? {
-                        self.checked_insert(
-                            var,
-                            VarShapeDeduction::from_usage_with_alternatives(
-                                &var.span,
-                                MULT_DIV_LOOKUP_TABLE
-                                    .get(&(op, var_side, shape))
-                                    .expect("shape is unit, number or int. Would have failed in parsing stage otherwise")
-                            ),
-                        )?;
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    fn infer_shapes_in_binary_expr(
-        &mut self,
-        (pipeline_idx, pipeline): (usize, &Pipeline),
-        bin_spanned: &SpannedExpression,
-        scope: &Scope,
-    ) -> Result<(), ShellError> {
-        let bin = spanned_to_binary(bin_spanned);
-        if let Expression::Variable(left_var_name, l_span) = &bin.left.expr {
-            self.infer_shapes_between_var_and_expr(
-                (&VarUsage::new(left_var_name, l_span), &bin.right),
-                BinarySide::Left,
-                bin_spanned,
-                (pipeline_idx, pipeline),
-                scope,
-            )?;
-        }
-
-        if let Expression::Variable(right_var_name, r_span) = &bin.right.expr {
-            self.infer_shapes_between_var_and_expr(
-                (&VarUsage::new(right_var_name, r_span), &bin.left),
-                BinarySide::Right,
-                bin_spanned,
-                (pipeline_idx, pipeline),
-                scope,
-            )?;
-        }
-        //Descend deeper into bin tree
-        self.infer_shapes_in_expr((pipeline_idx, pipeline), &bin.right, scope)?;
-        //Descend deeper into bin tree
-        self.infer_shapes_in_expr((pipeline_idx, pipeline), &bin.left, scope)?;
-
-        Ok(())
-    }
-
-    fn solve_dependencies(&mut self) {
-        // Solves dependencies between variables
-        // e.G. $var1 < $var2
-        // If $var2 is of type Unit, $var1 has to be the same
-        // TODO impl this
-        //
-        // I would check for global/environment variables.
-        // Lookup their types.
-        // Then check each node not pointing to others
-        // These are free variables - no inference can be made for them
-        //
-        // Variables having cycles between them (eg. a -> b and b -> a) have to be of the same type
-        //
-        // Then try to inference the variables depending on the result types again.
-    }
-
-    /// Inserts the new deductions. Each VarShapeDeduction represents one alternative for
-    /// the variable described by var_usage
-
-    /// Each of the new_deductions is assumed to be for the same variable
-    /// Each of the new_deductions is assumed to be unique of shape
-    fn checked_insert(
-        &mut self,
-        var_usage: &VarUsage,
-        new_deductions: Vec<VarShapeDeduction>,
-    ) -> Result<(), ShellError> {
-        trace!(
-            "Trying to insert for: {:?} possible shapes:{:?}",
-            var_usage.name,
-            new_deductions
-                .iter()
-                .map(|d| d.deduction)
-                .collect::<Vec<_>>()
-        );
-
-        //No insertion for special vars like $it. Those do not represent real variables
-        if is_special_var(&var_usage.name) {
-            trace!("Didn't insert special variable {:?}", var_usage);
-            return Ok(());
-        }
-
-        //Every insertion is sorted by shape!
-        //Everything within self.inferences is sorted by shape!
-        let mut new_deductions = new_deductions;
-        new_deductions.sort_unstable_by(|a, b| (a.deduction as i32).cmp(&(b.deduction as i32)));
-
-        let (insert_k, insert_v) = match self.inferences.get_key_value(var_usage) {
-            Some((k, existing_deductions)) => {
-                let Deduction::VarShapeDeduction(existing_deductions) = existing_deductions;
-
-                // If there is one any in one deduction, this deduction is capable of representing the other
-                // deduction and vice versa
-                let (any_in_new, new_vec) = (
-                    new_deductions
-                        .iter()
-                        .any(|deduc| deduc.deduction == SyntaxShape::Any),
-                    &new_deductions,
-                );
-                let (any_in_existing, existing_vec) = (
-                    existing_deductions
-                        .iter()
-                        .any(|deduc| deduc.deduction == SyntaxShape::Any),
-                    existing_deductions,
-                );
-
-                let combined_deductions =
-                    match ((any_in_new, new_vec), (any_in_existing, existing_vec)) {
-                        ((true, a), (true, b)) => {
-                            //In each alternative there is any
-                            //complete merge each set |
-                            //TODO move closure into function. But the compiler sheds tears to much for me :F
-                            merge_join_by(a, b, |a, b| {
-                                (a.deduction as i32).cmp(&(b.deduction as i32))
-                            })
-                            .map(|either_or| match either_or {
-                                EitherOrBoth::Left(deduc) | EitherOrBoth::Right(deduc) => {
-                                    deduc.clone()
-                                }
-                                EitherOrBoth::Both(a_elem, b_elem) => {
-                                    let mut combination = a_elem.clone();
-                                    combination.deducted_from.extend(&b_elem.deducted_from);
-                                    combination
-                                }
-                            })
-                            .collect()
-                        }
-                        ((false, a), (true, b)) | ((true, b), (false, a)) => {
-                            //B has an any. So A can be applied as a whole
-                            // So result is intersection(b,a) + a
-                            merge_join_by(a, b, |a, b| {
-                                (a.deduction as i32).cmp(&(b.deduction as i32))
-                            })
-                            .filter_map(|either_or| match either_or {
-                                //Left is a, right is b
-                                //(a UNION none) OR a is a
-                                EitherOrBoth::Left(deduc) => Some(deduc.clone()),
-                                //(none UNION b) OR a is a (a is None)
-                                EitherOrBoth::Right(_) => None,
-                                //(a UNION b) OR a is (a UNION b)
-                                EitherOrBoth::Both(a_elem, b_elem) => {
-                                    let mut combination = a_elem.clone();
-                                    combination.deducted_from.extend(&b_elem.deducted_from);
-                                    Some(combination)
-                                }
-                            })
-                            .collect()
-                        }
-                        //No any's intersection of both is result
-                        ((false, a), (false, b)) => {
-                            let intersection: Vec<VarShapeDeduction> =
-                                merge_join_by(a, b, |a, b| {
-                                    (a.deduction as i32).cmp(&(b.deduction as i32))
-                                })
-                                .map(|either_or| match either_or {
-                                    //Left is a, right is b
-                                    EitherOrBoth::Left(_) => None,
-                                    EitherOrBoth::Right(_) => None,
-                                    EitherOrBoth::Both(a_elem, b_elem) => {
-                                        let mut combination = a_elem.clone();
-                                        combination
-                                            .deducted_from
-                                            .extend(b_elem.deducted_from.clone());
-                                        Some(combination)
-                                    }
-                                })
-                                .flatten()
-                                .collect();
-                            if intersection.is_empty() {
-                                //TODO pass all labels somehow
-                                // let labels = a
-                                //     .iter()
-                                //     .chain(b.iter())
-                                //     .map(|decl| {
-                                //         decl.deducted_from.iter().map(|span| (decl.deduction, span))
-                                //     })
-                                //     .flatten()
-                                //     .map(|(shape, span)| {
-                                //         Label::primary("AliasBlock", span)
-                                //             .with_message(format!("{}", shape))
-                                //     })
-                                //     .collect();
-                                return Err(ShellError::labeled_error_with_secondary(
-                                    format!("Contrary types for variable {}", k.name),
-                                    format!(
-                                        "Deduction: {:?}",
-                                        a.iter()
-                                            .map(|deduction| deduction.deduction)
-                                            .collect::<Vec<_>>()
-                                    ),
-                                    a[0].deducted_from[0],
-                                    format!(
-                                        "Deduction: {:?}",
-                                        b.iter()
-                                            .map(|deduction| deduction.deduction)
-                                            .collect::<Vec<_>>()
-                                    ),
-                                    b[0].deducted_from[0],
-                                ));
-                            } else {
-                                intersection
-                            }
-                        }
-                    };
-                (k.clone(), Deduction::VarShapeDeduction(combined_deductions))
-            }
-            None => (
-                var_usage.clone(),
-                Deduction::VarShapeDeduction(new_deductions),
-            ),
-        };
-
-        self.inferences.insert(insert_k, insert_v);
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-engine/src/whole_stream_command.rs b/old_nushell/crates/nu-engine/src/whole_stream_command.rs
deleted file mode 100644
index 27e7defd2..000000000
--- a/old_nushell/crates/nu-engine/src/whole_stream_command.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-use crate::command_args::CommandArgs;
-use crate::documentation::get_full_help;
-use crate::evaluate::block::run_block;
-use crate::example::Example;
-use nu_errors::ShellError;
-use nu_parser::ParserScope;
-use nu_protocol::hir::Block;
-use nu_protocol::{ReturnSuccess, Signature, UntaggedValue};
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebugWithSource, Span, Tag};
-use nu_stream::{ActionStream, InputStream, IntoOutputStream, OutputStream};
-use std::sync::Arc;
-
-pub trait WholeStreamCommand: Send + Sync {
-    fn name(&self) -> &str;
-
-    fn signature(&self) -> Signature {
-        Signature::new(self.name()).desc(self.usage()).filter()
-    }
-
-    fn usage(&self) -> &str;
-
-    fn extra_usage(&self) -> &str {
-        ""
-    }
-
-    fn run_with_actions(&self, _args: CommandArgs) -> Result<ActionStream, ShellError> {
-        return Err(ShellError::unimplemented(&format!(
-            "{} does not implement run or run_with_actions",
-            self.name()
-        )));
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<InputStream, ShellError> {
-        let context = args.context.clone();
-        let stream = self.run_with_actions(args)?;
-
-        Ok(Box::new(crate::evaluate::internal::InternalIterator {
-            context,
-            input: stream,
-            leftovers: InputStream::empty(),
-        })
-        .into_output_stream())
-    }
-
-    fn is_binary(&self) -> bool {
-        false
-    }
-
-    // Commands that are not meant to be run by users
-    fn is_private(&self) -> bool {
-        false
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        Vec::new()
-    }
-
-    // This is a built-in command
-    fn is_builtin(&self) -> bool {
-        true
-    }
-
-    // Is a sub command
-    fn is_sub(&self) -> bool {
-        self.name().contains(' ')
-    }
-
-    // Is a plugin command
-    fn is_plugin(&self) -> bool {
-        false
-    }
-
-    // Is a custom command i.e. def blah [] { }
-    fn is_custom(&self) -> bool {
-        false
-    }
-}
-
-// Custom commands are blocks, so we can use the information in the block to also
-// implement a WholeStreamCommand
-#[allow(clippy::suspicious_else_formatting)]
-impl WholeStreamCommand for Arc<Block> {
-    fn name(&self) -> &str {
-        &self.params.name
-    }
-
-    fn signature(&self) -> Signature {
-        self.params.clone()
-    }
-
-    fn usage(&self) -> &str {
-        &self.params.usage
-    }
-
-    fn extra_usage(&self) -> &str {
-        &self.params.extra_usage
-    }
-
-    fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
-        let call_info = args.call_info.clone();
-
-        let block = self.clone();
-
-        let external_redirection = args.call_info.args.external_redirection;
-
-        let ctx = &args.context;
-        let evaluated = call_info.evaluate(ctx)?;
-
-        let input = args.input;
-        ctx.scope.enter_scope();
-        if let Some(args) = evaluated.args.positional {
-            let mut args_iter = args.into_iter().peekable();
-            let mut params_iter = self.params.positional.iter();
-            loop {
-                match (args_iter.peek(), params_iter.next()) {
-                    (Some(_), Some(param)) => {
-                        let name = param.0.name();
-                        // we just checked the peek above, so this should be infallible
-                        if let Some(arg) = args_iter.next() {
-                            if name.starts_with('$') {
-                                ctx.scope.add_var(name.to_string(), arg);
-                            } else {
-                                ctx.scope.add_var(format!("${}", name), arg);
-                            }
-                        }
-                    }
-                    (Some(arg), None) => {
-                        if block.params.rest_positional.is_none() {
-                            ctx.scope.exit_scope();
-                            return Err(ShellError::labeled_error(
-                                "Unexpected argument to command",
-                                "unexpected argument",
-                                arg.tag.span,
-                            ));
-                        } else {
-                            break;
-                        }
-                    }
-                    _ => break,
-                }
-            }
-            if let Some(rest_pos) = &block.params.rest_positional {
-                let elements: Vec<_> = args_iter.collect();
-                let start = if let Some(first) = elements.first() {
-                    first.tag.span.start()
-                } else {
-                    0
-                };
-                let end = if let Some(last) = elements.last() {
-                    last.tag.span.end()
-                } else {
-                    0
-                };
-
-                ctx.scope.add_var(
-                    format!("${}", rest_pos.0),
-                    UntaggedValue::Table(elements).into_value(Span::new(start, end)),
-                );
-            }
-        } else if let Some(rest_pos) = &block.params.rest_positional {
-            //If there is a rest arg, but no args were provided,
-            //we have to set $rest to an empty table
-            ctx.scope.add_var(
-                format!("${}", rest_pos.0),
-                UntaggedValue::Table(Vec::new()).into_value(Span::new(0, 0)),
-            );
-        }
-        if let Some(args) = evaluated.args.named {
-            for named in &block.params.named {
-                let name = named.0;
-                if let Some(value) = args.get(name) {
-                    if name.starts_with('$') {
-                        ctx.scope.add_var(name, value.clone());
-                    } else {
-                        ctx.scope.add_var(format!("${}", name), value.clone());
-                    }
-                } else if name.starts_with('$') {
-                    ctx.scope
-                        .add_var(name, UntaggedValue::nothing().into_untagged_value());
-                } else {
-                    ctx.scope.add_var(
-                        format!("${}", name),
-                        UntaggedValue::nothing().into_untagged_value(),
-                    );
-                }
-            }
-        } else {
-            for named in &block.params.named {
-                let name = named.0;
-                if name.starts_with('$') {
-                    ctx.scope
-                        .add_var(name, UntaggedValue::nothing().into_untagged_value());
-                } else {
-                    ctx.scope.add_var(
-                        format!("${}", name),
-                        UntaggedValue::nothing().into_untagged_value(),
-                    );
-                }
-            }
-        }
-        let result = run_block(&block, ctx, input, external_redirection);
-        ctx.scope.exit_scope();
-        result
-    }
-
-    fn is_binary(&self) -> bool {
-        false
-    }
-
-    fn is_private(&self) -> bool {
-        false
-    }
-
-    fn examples(&self) -> Vec<Example> {
-        vec![]
-    }
-
-    fn is_custom(&self) -> bool {
-        true
-    }
-
-    fn is_builtin(&self) -> bool {
-        false
-    }
-}
-
-#[derive(Clone)]
-pub struct Command(Arc<dyn WholeStreamCommand>);
-
-impl PrettyDebugWithSource for Command {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::typed(
-            "whole stream command",
-            DbgDocBldr::description(self.name())
-                + DbgDocBldr::space()
-                + DbgDocBldr::equals()
-                + DbgDocBldr::space()
-                + self.signature().pretty_debug(source),
-        )
-    }
-}
-
-impl std::fmt::Debug for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Command({})", self.name())
-    }
-}
-
-impl Command {
-    pub fn name(&self) -> &str {
-        self.0.name()
-    }
-
-    pub fn signature(&self) -> Signature {
-        self.0.signature()
-    }
-
-    pub fn usage(&self) -> &str {
-        self.0.usage()
-    }
-
-    pub fn extra_usage(&self) -> &str {
-        self.0.extra_usage()
-    }
-
-    pub fn examples(&self) -> Vec<Example> {
-        self.0.examples()
-    }
-
-    pub fn run_with_actions(&self, args: CommandArgs) -> Result<ActionStream, ShellError> {
-        if args.call_info.switch_present("help") {
-            let cl = self.0.clone();
-            Ok(ActionStream::one(Ok(ReturnSuccess::Value(
-                UntaggedValue::string(get_full_help(&*cl, &args.context.scope))
-                    .into_value(Tag::unknown()),
-            ))))
-        } else {
-            self.0.run_with_actions(args)
-        }
-    }
-
-    pub fn run(&self, args: CommandArgs) -> Result<InputStream, ShellError> {
-        if args.call_info.switch_present("help") {
-            let cl = self.0.clone();
-            Ok(InputStream::one(
-                UntaggedValue::string(get_full_help(&*cl, &args.context.scope))
-                    .into_value(Tag::unknown()),
-            ))
-        } else {
-            self.0.run(args)
-        }
-    }
-
-    pub fn is_binary(&self) -> bool {
-        self.0.is_binary()
-    }
-
-    pub fn is_private(&self) -> bool {
-        self.0.is_private()
-    }
-
-    pub fn stream_command(&self) -> &dyn WholeStreamCommand {
-        &*self.0
-    }
-
-    pub fn is_builtin(&self) -> bool {
-        self.0.is_builtin()
-    }
-
-    pub fn is_sub(&self) -> bool {
-        self.0.is_sub()
-    }
-
-    pub fn is_plugin(&self) -> bool {
-        self.0.is_plugin()
-    }
-
-    pub fn is_custom(&self) -> bool {
-        self.0.is_custom()
-    }
-}
-
-pub fn whole_stream_command(command: impl WholeStreamCommand + 'static) -> Command {
-    Command(Arc::new(command))
-}
diff --git a/old_nushell/crates/nu-engine/tests/evaluate/mod.rs b/old_nushell/crates/nu-engine/tests/evaluate/mod.rs
deleted file mode 100644
index 26045df06..000000000
--- a/old_nushell/crates/nu-engine/tests/evaluate/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod operator;
-mod subexpression;
-mod variables;
diff --git a/old_nushell/crates/nu-engine/tests/evaluate/operator.rs b/old_nushell/crates/nu-engine/tests/evaluate/operator.rs
deleted file mode 100644
index 414e9faee..000000000
--- a/old_nushell/crates/nu-engine/tests/evaluate/operator.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-#[test]
-fn filter_ls_by_in_array() {
-    Playground::setup("filter_ls_by_1", |dirs, sandbox| {
-        sandbox.with_files(vec![
-            EmptyFile("jean-luc.cap"),
-            EmptyFile("riker.cmdr"),
-            EmptyFile("data.ltcmdr"),
-            EmptyFile("troi.ltcmdr"),
-            EmptyFile("worf.lt"),
-            EmptyFile("geordi.lt"),
-        ]);
-
-        let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls | where name in ['data.ltcmdr', 'riker.cmdr'] | get name | to json
-            "#
-        ));
-
-        assert_eq!(actual.out, "[\"data.ltcmdr\",\"riker.cmdr\"]");
-    })
-}
-
-#[test]
-fn filter_json_with_in_array() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo '[{"name": "foo", "size": 3}, {"name": "foo", "size": 2}, {"name": "bar", "size": 4}]' | from json | where size in [2] | get name
-        "#
-    ));
-
-    assert_eq!(actual.out, "foo");
-}
diff --git a/old_nushell/crates/nu-engine/tests/evaluate/subexpression.rs b/old_nushell/crates/nu-engine/tests/evaluate/subexpression.rs
deleted file mode 100644
index d1713568f..000000000
--- a/old_nushell/crates/nu-engine/tests/evaluate/subexpression.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use nu_test_support::nu;
-
-#[test]
-fn test_parse_subexpression_with_range() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let foo = 3
-        echo (echo 1..$foo | each { $it }) | to json
-        "#
-    );
-    assert_eq!(actual.out, "[1,2,3]")
-}
-
-#[test]
-fn create_nothing_in_table() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [[column]; [$nothing]] | to json
-        "#
-    );
-    assert_eq!(actual.out, "{\"column\":null}");
-}
-
-#[test]
-fn compare_to_nothing() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let f = $nothing
-        if $f == $nothing {echo $true} {echo $false}
-        "#
-    );
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn compare_nothing_and_boolean() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        if $true == $nothing {echo $true} {echo $false}
-        "#
-    );
-    assert_eq!(actual.out, "false");
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        if $false == $nothing {echo $true} {echo $false}
-        "#
-    );
-    assert_eq!(actual.out, "false");
-}
diff --git a/old_nushell/crates/nu-engine/tests/evaluate/variables.rs b/old_nushell/crates/nu-engine/tests/evaluate/variables.rs
deleted file mode 100644
index cbc1f4ec2..000000000
--- a/old_nushell/crates/nu-engine/tests/evaluate/variables.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::fs::{AbsolutePath, DisplayPath};
-use nu_test_support::playground::{says, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn config_path_variable_present() {
-    Playground::setup("nu_variable_test_1", |_, nu| {
-        assert_that!(
-            nu.pipeline("echo $nu.config-path"),
-            says().stdout(nu.get_config())
-        );
-    })
-}
-
-#[test]
-fn custom_config_path_variable_present() {
-    Playground::setup("nu_variable_test_2", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            "skip_welcome_message = true",
-        )]);
-
-        assert_that!(
-            nu.pipeline("echo $nu.config-path"),
-            says().stdout(&file.display_path())
-        );
-    })
-}
-
-#[test]
-fn scope_variable_with_alias_present() {
-    Playground::setup("scope_variable_alias_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            "skip_welcome_message = true",
-        )]);
-
-        assert_that!(
-            nu.pipeline("alias t = time; echo $scope.aliases | get t"),
-            says().stdout("time")
-        );
-    })
-}
-
-#[test]
-fn scope_variable_with_correct_number_of_aliases_present() {
-    Playground::setup("scope_variable_alias_test_2", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            "skip_welcome_message = true",
-        )]);
-
-        assert_that!(
-            nu.pipeline("alias v = version; alias t = time; echo $scope.aliases | length -c"),
-            says().stdout("2")
-        );
-    })
-}
-
-#[test]
-fn scope_variable_with_command_present() {
-    Playground::setup("scope_commands_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            "skip_welcome_message = true",
-        )]);
-
-        assert_that!(
-            nu.pipeline("def meaning-of-life [--number: int] { echo $number }; echo $scope.commands | get meaning-of-life"),
-            says().stdout("--number")
-        );
-    })
-}
diff --git a/old_nushell/crates/nu-engine/tests/main.rs b/old_nushell/crates/nu-engine/tests/main.rs
deleted file mode 100644
index 18abfa63a..000000000
--- a/old_nushell/crates/nu-engine/tests/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-extern crate nu_test_support;
-
-mod evaluate;
diff --git a/old_nushell/crates/nu-errors/Cargo.toml b/old_nushell/crates/nu-errors/Cargo.toml
deleted file mode 100644
index d650c9e51..000000000
--- a/old_nushell/crates/nu-errors/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Core error subsystem for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-errors"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-source = { path="../nu-source", version = "0.43.0" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-codespan-reporting = { version="0.11.0", features=["serialization"] }
-derive-new = "0.5.8"
-getset = "0.1.1"
-num-bigint = { version="0.4.3", features=["serde"] }
-num-traits = "0.2.14"
-serde = { version="1.0.123", features=["derive"] }
-
-# implement conversions
-glob = "0.3.0"
-serde_json = "1.0.61"
-serde_yaml = "0.8.16"
-toml = "0.5.8"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu-errors/src/lib.rs b/old_nushell/crates/nu-errors/src/lib.rs
deleted file mode 100644
index 8c16b82e5..000000000
--- a/old_nushell/crates/nu-errors/src/lib.rs
+++ /dev/null
@@ -1,1012 +0,0 @@
-use bigdecimal::BigDecimal;
-use codespan_reporting::diagnostic::{Diagnostic, Label};
-use derive_new::new;
-use getset::Getters;
-use nu_ansi_term::Color;
-use nu_source::{
-    DbgDocBldr, DebugDocBuilder, HasFallibleSpan, PrettyDebug, Span, Spanned, SpannedItem,
-};
-use num_bigint::BigInt;
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use std::fmt;
-use std::ops::Range;
-
-/// A structured reason for a ParseError. Note that parsing in nu is more like macro expansion in
-/// other languages, so the kinds of errors that can occur during parsing are more contextual than
-/// you might expect.
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum ParseErrorReason {
-    /// The parser encountered an EOF rather than what it was expecting
-    Eof { expected: String, span: Span },
-    /// The parser expected to see the end of a token stream (possibly the token
-    /// stream from inside a delimited token node), but found something else.
-    ExtraTokens { actual: Spanned<String> },
-    /// The parser encountered something other than what it was expecting
-    Mismatch {
-        expected: String,
-        actual: Spanned<String>,
-    },
-
-    /// Unclosed delimiter
-    Unclosed { delimiter: String, span: Span },
-
-    /// An unexpected internal error has occurred
-    GeneralError {
-        message: String,
-        label: Spanned<String>,
-    },
-
-    /// The parser tried to parse an argument for a command, but it failed for
-    /// some reason
-    ArgumentError {
-        command: Spanned<String>,
-        error: ArgumentError,
-    },
-}
-
-/// A newtype for `ParseErrorReason`
-#[derive(Debug, Clone, Getters, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct ParseError {
-    #[get = "pub"]
-    reason: ParseErrorReason,
-}
-
-impl ParseError {
-    /// Construct a [ParseErrorReason::Eof](ParseErrorReason::Eof)
-    pub fn unexpected_eof(expected: impl Into<String>, span: Span) -> ParseError {
-        ParseError {
-            reason: ParseErrorReason::Eof {
-                expected: expected.into(),
-                span,
-            },
-        }
-    }
-
-    /// Construct a [ParseErrorReason::ExtraTokens](ParseErrorReason::ExtraTokens)
-    pub fn extra_tokens(actual: Spanned<impl Into<String>>) -> ParseError {
-        let Spanned { span, item } = actual;
-
-        ParseError {
-            reason: ParseErrorReason::ExtraTokens {
-                actual: item.into().spanned(span),
-            },
-        }
-    }
-
-    /// Construct a [ParseErrorReason::Mismatch](ParseErrorReason::Mismatch)
-    pub fn mismatch(expected: impl Into<String>, actual: Spanned<impl Into<String>>) -> ParseError {
-        let Spanned { span, item } = actual;
-
-        ParseError {
-            reason: ParseErrorReason::Mismatch {
-                expected: expected.into(),
-                actual: item.into().spanned(span),
-            },
-        }
-    }
-
-    /// Construct a [ParseErrorReason::GeneralError](ParseErrorReason::GeneralError)
-    pub fn general_error(
-        message: impl Into<String>,
-        label: Spanned<impl Into<String>>,
-    ) -> ParseError {
-        ParseError {
-            reason: ParseErrorReason::GeneralError {
-                message: message.into(),
-                label: label.item.into().spanned(label.span),
-            },
-        }
-    }
-
-    /// Construct a [ParseErrorReason::ArgumentError](ParseErrorReason::ArgumentError)
-    pub fn argument_error(command: Spanned<impl Into<String>>, kind: ArgumentError) -> ParseError {
-        ParseError {
-            reason: ParseErrorReason::ArgumentError {
-                command: command.item.into().spanned(command.span),
-                error: kind,
-            },
-        }
-    }
-
-    /// Unclosed delimiter
-    pub fn unclosed(delimiter: String, span: Span) -> ParseError {
-        ParseError {
-            reason: ParseErrorReason::Unclosed { delimiter, span },
-        }
-    }
-}
-
-/// Convert a [ParseError](ParseError) into a [ShellError](ShellError)
-impl From<ParseError> for ShellError {
-    fn from(error: ParseError) -> ShellError {
-        match error.reason {
-            ParseErrorReason::Eof { expected, span } => ShellError::unexpected_eof(expected, span),
-            ParseErrorReason::ExtraTokens { actual } => ShellError::type_error("nothing", actual),
-            ParseErrorReason::Mismatch { actual, expected } => {
-                ShellError::type_error(expected, actual)
-            }
-            ParseErrorReason::GeneralError { message, label } => {
-                ShellError::labeled_error(&message, &label.item, &label.span)
-            }
-            ParseErrorReason::ArgumentError { command, error } => {
-                ShellError::argument_error(command, error)
-            }
-            ParseErrorReason::Unclosed { delimiter, span } => ShellError::labeled_error(
-                "Unclosed delimiter",
-                format!("expected '{}'", delimiter),
-                span,
-            ),
-        }
-    }
-}
-
-/// ArgumentError describes various ways that the parser could fail because of unexpected arguments.
-/// Nu commands are like a combination of functions and macros, and these errors correspond to
-/// problems that could be identified during expansion based on the syntactic signature of a
-/// command.
-#[derive(Debug, Eq, PartialEq, Clone, Ord, Hash, PartialOrd, Serialize, Deserialize)]
-pub enum ArgumentError {
-    /// The command specified a mandatory flag, but it was missing.
-    MissingMandatoryFlag(String),
-    /// The command specified a mandatory positional argument, but it was missing.
-    MissingMandatoryPositional(String),
-    /// A flag was found, and it should have been followed by a value, but no value was found
-    MissingValueForName(String),
-    /// An argument was found, but the command does not recognize it
-    UnexpectedArgument(Spanned<String>),
-    /// An flag was found, but the command does not recognize it
-    UnexpectedFlag(Spanned<String>),
-    /// A sequence of characters was found that was not syntactically valid (but would have
-    /// been valid if the command was an external command)
-    InvalidExternalWord,
-    /// A bad value in this location
-    BadValue(String),
-}
-
-impl PrettyDebug for ArgumentError {
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            ArgumentError::MissingMandatoryFlag(flag) => {
-                DbgDocBldr::description("missing `")
-                    + DbgDocBldr::description(flag)
-                    + DbgDocBldr::description("` as mandatory flag")
-            }
-            ArgumentError::UnexpectedArgument(name) => {
-                DbgDocBldr::description("unexpected `")
-                    + DbgDocBldr::description(&name.item)
-                    + DbgDocBldr::description("` is not supported")
-            }
-            ArgumentError::UnexpectedFlag(name) => {
-                DbgDocBldr::description("unexpected `")
-                    + DbgDocBldr::description(&name.item)
-                    + DbgDocBldr::description("` is not supported")
-            }
-            ArgumentError::MissingMandatoryPositional(pos) => {
-                DbgDocBldr::description("missing `")
-                    + DbgDocBldr::description(pos)
-                    + DbgDocBldr::description("` as mandatory positional argument")
-            }
-            ArgumentError::MissingValueForName(name) => {
-                DbgDocBldr::description("missing value for flag `")
-                    + DbgDocBldr::description(name)
-                    + DbgDocBldr::description("`")
-            }
-            ArgumentError::InvalidExternalWord => DbgDocBldr::description("invalid word"),
-            ArgumentError::BadValue(msg) => {
-                DbgDocBldr::description("bad value `")
-                    + DbgDocBldr::description(msg)
-                    + DbgDocBldr::description("`")
-            }
-        }
-    }
-}
-
-/// A `ShellError` is a proximate error and a possible cause, which could have its own cause,
-/// creating a cause chain.
-#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Serialize, Deserialize, Hash)]
-pub struct ShellError {
-    pub error: ProximateShellError,
-    pub notes: Vec<String>,
-}
-
-/// `PrettyDebug` is for internal debugging. For user-facing debugging, [into_diagnostic](ShellError::into_diagnostic)
-/// is used, which prints an error, highlighting spans.
-impl PrettyDebug for ShellError {
-    fn pretty(&self) -> DebugDocBuilder {
-        match &self.error {
-            ProximateShellError::SyntaxError { problem } => {
-                DbgDocBldr::error("Syntax Error")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit("(", DbgDocBldr::description(&problem.item), ")")
-            }
-            ProximateShellError::UnexpectedEof { .. } => DbgDocBldr::error("Unexpected end"),
-            ProximateShellError::TypeError { expected, actual } => {
-                DbgDocBldr::error("Type Error")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("expected:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(expected)
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("actual:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::option(actual.item.as_ref().map(DbgDocBldr::description)),
-                        ")",
-                    )
-            }
-            ProximateShellError::MissingProperty { subpath, expr } => {
-                DbgDocBldr::error("Missing Property")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("expr:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&expr.item)
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("subpath:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&subpath.item),
-                        ")",
-                    )
-            }
-            ProximateShellError::InvalidIntegerIndex { subpath, .. } => {
-                DbgDocBldr::error("Invalid integer index")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("subpath:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&subpath.item),
-                        ")",
-                    )
-            }
-            ProximateShellError::MissingValue { reason, .. } => {
-                DbgDocBldr::error("Missing Value")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("reason:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(reason),
-                        ")",
-                    )
-            }
-            ProximateShellError::ArgumentError { command, error } => {
-                DbgDocBldr::error("Argument Error")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("command:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&command.item)
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("error:")
-                            + DbgDocBldr::space()
-                            + error.pretty(),
-                        ")",
-                    )
-            }
-            ProximateShellError::RangeError {
-                kind,
-                actual_kind,
-                operation,
-            } => {
-                DbgDocBldr::error("Range Error")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("expected:")
-                            + DbgDocBldr::space()
-                            + kind.pretty()
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("actual:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&actual_kind.item)
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("operation:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(operation),
-                        ")",
-                    )
-            }
-            ProximateShellError::Diagnostic(_) => DbgDocBldr::error("diagnostic"),
-            ProximateShellError::CoerceError { left, right } => {
-                DbgDocBldr::error("Coercion Error")
-                    + DbgDocBldr::space()
-                    + DbgDocBldr::delimit(
-                        "(",
-                        DbgDocBldr::description("left:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&left.item)
-                            + DbgDocBldr::description(",")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description("right:")
-                            + DbgDocBldr::space()
-                            + DbgDocBldr::description(&right.item),
-                        ")",
-                    )
-            }
-            ProximateShellError::UntaggedRuntimeError { reason } => {
-                DbgDocBldr::error("Unknown Error")
-                    + DbgDocBldr::delimit("(", DbgDocBldr::description(reason), ")")
-            }
-            ProximateShellError::Unimplemented { reason } => {
-                DbgDocBldr::error("Unimplemented")
-                    + DbgDocBldr::delimit("(", DbgDocBldr::description(reason), ")")
-            }
-        }
-    }
-}
-
-impl std::fmt::Display for ShellError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.pretty().display())
-    }
-}
-
-impl serde::de::Error for ShellError {
-    fn custom<T>(msg: T) -> Self
-    where
-        T: std::fmt::Display,
-    {
-        ShellError::untagged_runtime_error(msg.to_string())
-    }
-}
-
-impl ShellError {
-    /// An error that describes a mismatch between the given type and the expected type
-    pub fn type_error(
-        expected: impl Into<String>,
-        actual: Spanned<impl Into<String>>,
-    ) -> ShellError {
-        ProximateShellError::TypeError {
-            expected: expected.into(),
-            actual: actual.map(|i| Some(i.into())),
-        }
-        .start()
-    }
-
-    pub fn missing_property(
-        subpath: Spanned<impl Into<String>>,
-        expr: Spanned<impl Into<String>>,
-    ) -> ShellError {
-        ProximateShellError::MissingProperty {
-            subpath: subpath.map(|s| s.into()),
-            expr: expr.map(|e| e.into()),
-        }
-        .start()
-    }
-
-    pub fn missing_value(span: impl Into<Option<Span>>, reason: impl Into<String>) -> ShellError {
-        ProximateShellError::MissingValue {
-            span: span.into(),
-            reason: reason.into(),
-        }
-        .start()
-    }
-
-    pub fn invalid_integer_index(
-        subpath: Spanned<impl Into<String>>,
-        integer: impl Into<Span>,
-    ) -> ShellError {
-        ProximateShellError::InvalidIntegerIndex {
-            subpath: subpath.map(|s| s.into()),
-            integer: integer.into(),
-        }
-        .start()
-    }
-
-    pub fn untagged_runtime_error(error: impl Into<String>) -> ShellError {
-        ProximateShellError::UntaggedRuntimeError {
-            reason: error.into(),
-        }
-        .start()
-    }
-
-    pub fn unexpected_eof(expected: impl Into<String>, span: impl Into<Span>) -> ShellError {
-        ProximateShellError::UnexpectedEof {
-            expected: expected.into(),
-            span: span.into(),
-        }
-        .start()
-    }
-
-    pub fn range_error(
-        expected: impl Into<ExpectedRange>,
-        actual: &Spanned<impl fmt::Debug>,
-        operation: impl Into<String>,
-    ) -> ShellError {
-        ProximateShellError::RangeError {
-            kind: expected.into(),
-            actual_kind: format!("{:?}", actual.item).spanned(actual.span),
-            operation: operation.into(),
-        }
-        .start()
-    }
-
-    pub fn syntax_error(problem: Spanned<impl Into<String>>) -> ShellError {
-        ProximateShellError::SyntaxError {
-            problem: problem.map(|p| p.into()),
-        }
-        .start()
-    }
-
-    pub fn coerce_error(
-        left: Spanned<impl Into<String>>,
-        right: Spanned<impl Into<String>>,
-    ) -> ShellError {
-        ProximateShellError::CoerceError {
-            left: left.map(|l| l.into()),
-            right: right.map(|r| r.into()),
-        }
-        .start()
-    }
-
-    pub fn argument_error(command: Spanned<impl Into<String>>, kind: ArgumentError) -> ShellError {
-        ProximateShellError::ArgumentError {
-            command: command.map(|c| c.into()),
-            error: kind,
-        }
-        .start()
-    }
-
-    pub fn diagnostic(diagnostic: Diagnostic<usize>) -> ShellError {
-        ProximateShellError::Diagnostic(ShellDiagnostic { diagnostic }).start()
-    }
-
-    pub fn into_diagnostic(self) -> Diagnostic<usize> {
-        let d = match self.error {
-            ProximateShellError::MissingValue { span, reason } => {
-                let mut d = Diagnostic::bug().with_message(format!("Internal Error (missing value) :: {}", reason));
-
-                if let Some(span) = span {
-                    d = d.with_labels(vec![Label::primary(0, span)]);
-                }
-
-                d
-            }
-            ProximateShellError::ArgumentError {
-                command,
-                error,
-            } => match error {
-                ArgumentError::InvalidExternalWord => Diagnostic::error().with_message("Invalid bare word for Nu command (did you intend to invoke an external command?)")
-                .with_labels(vec![Label::primary(0, command.span)]),
-                ArgumentError::UnexpectedArgument(argument) => Diagnostic::error().with_message(
-                    format!(
-                        "{} unexpected {}",
-                        Color::Cyan.paint(&command.item),
-                        Color::Green.bold().paint(&argument.item)
-                    )
-                )
-                .with_labels(
-                    vec![Label::primary(0, argument.span).with_message(
-                        format!("unexpected argument (try {} -h)", &command.item))]
-                ),
-                ArgumentError::UnexpectedFlag(flag) => Diagnostic::error().with_message(
-                    format!(
-                        "{} unexpected {}",
-                        Color::Cyan.paint(&command.item),
-                        Color::Green.bold().paint(&flag.item)
-                    ),
-                )
-                .with_labels(vec![
-                    Label::primary(0, flag.span).with_message(
-                    format!("unexpected flag (try {} -h)", &command.item))
-                    ]),
-                ArgumentError::MissingMandatoryFlag(name) => Diagnostic::error().with_message(                    format!(
-                        "{} requires {}{}",
-                        Color::Cyan.paint(&command.item),
-                        Color::Green.bold().paint("--"),
-                        Color::Green.bold().paint(name)
-                    ),
-                )
-                .with_labels(vec![Label::primary(0, command.span)]),
-                ArgumentError::MissingMandatoryPositional(name) => Diagnostic::error().with_message(
-                    format!(
-                        "{} requires {} parameter",
-                        Color::Cyan.paint(&command.item),
-                        Color::Green.bold().paint(name.clone())
-                    ),
-                )
-                .with_labels(
-                    vec![Label::primary(0, command.span).with_message(format!("requires {} parameter", name))],
-                ),
-                ArgumentError::MissingValueForName(name) => Diagnostic::error().with_message(
-                    format!(
-                        "{} is missing value for flag {}{}",
-                        Color::Cyan.paint(&command.item),
-                        Color::Green.bold().paint("--"),
-                        Color::Green.bold().paint(name)
-                    ),
-                )
-                .with_labels(vec![Label::primary(0, command.span)]),
-                ArgumentError::BadValue(msg) => Diagnostic::error().with_message(msg.clone()).with_labels(vec![Label::primary(0, command.span).with_message(msg)])
-            },
-            ProximateShellError::TypeError {
-                expected,
-                actual:
-                    Spanned {
-                        item: Some(actual),
-                        span,
-                    },
-            } => Diagnostic::error().with_message("Type Error").with_labels(
-                vec![Label::primary(0, span)
-                    .with_message(format!("Expected {}, found {}", expected, actual))],
-            ),
-            ProximateShellError::TypeError {
-                expected,
-                actual:
-                    Spanned {
-                        item: None,
-                        span
-                    },
-            } => Diagnostic::error().with_message("Type Error")
-                .with_labels(vec![Label::primary(0, span).with_message(expected)]),
-
-            ProximateShellError::UnexpectedEof {
-                expected, span
-            } => Diagnostic::error().with_message("Unexpected end of input")
-                .with_labels(vec![Label::primary(0, span).with_message(format!("Expected {}", expected))]),
-
-            ProximateShellError::RangeError {
-                kind,
-                operation,
-                actual_kind:
-                    Spanned {
-                        item,
-                        span
-                    },
-            } => Diagnostic::error().with_message("Range Error").with_labels(
-                vec![Label::primary(0, span).with_message(format!(
-                    "Expected to convert {} to {} while {}, but it was out of range",
-                    item,
-                    kind.display(),
-                    operation
-                ))],
-            ),
-
-            ProximateShellError::SyntaxError {
-                problem:
-                    Spanned {
-                        span,
-                        item
-                    },
-            } => Diagnostic::error().with_message("Syntax Error")
-                .with_labels(vec![Label::primary(0, span).with_message(item)]),
-
-            ProximateShellError::MissingProperty { subpath, expr, .. } => {
-
-                let mut diag = Diagnostic::error().with_message("Missing property");
-
-                if subpath.span == Span::unknown() {
-                    diag.message = format!("Missing property (for {})", subpath.item);
-                } else {
-                    let subpath = Label::primary(0, subpath.span).with_message(subpath.item);
-                    let mut labels = vec![subpath];
-
-                    if expr.span != Span::unknown() {
-                        let expr = Label::primary(0, expr.span).with_message(expr.item);
-                        labels.push(expr);
-                    }
-                    diag = diag.with_labels(labels);
-                }
-
-                diag
-            }
-
-            ProximateShellError::InvalidIntegerIndex { subpath,integer } => {
-                let mut diag = Diagnostic::error().with_message("Invalid integer property");
-                let mut labels = vec![];
-                if subpath.span == Span::unknown() {
-                    diag.message = format!("Invalid integer property (for {})", subpath.item)
-                } else {
-                    let label = Label::primary(0, subpath.span).with_message(subpath.item);
-                    labels.push(label);
-                }
-
-                labels.push(Label::secondary(0, integer).with_message("integer"));
-                diag = diag.with_labels(labels);
-
-                diag
-            }
-
-            ProximateShellError::Diagnostic(diag) => diag.diagnostic,
-            ProximateShellError::CoerceError { left, right } => {
-                Diagnostic::error().with_message("Coercion error")
-                    .with_labels(vec![Label::primary(0, left.span).with_message(left.item),
-                    Label::secondary(0, right.span).with_message(right.item)])
-            }
-
-            ProximateShellError::UntaggedRuntimeError { reason } => Diagnostic::error().with_message(format!("Error: {}", reason)),
-            ProximateShellError::Unimplemented { reason } => Diagnostic::error().with_message(format!("Unimplemented: {}", reason)),
-
-        };
-
-        let notes = self.notes.clone();
-        d.with_notes(notes)
-    }
-
-    pub fn labeled_error(
-        msg: impl Into<String>,
-        label: impl Into<String>,
-        span: impl Into<Span>,
-    ) -> ShellError {
-        ShellError::diagnostic(
-            Diagnostic::error()
-                .with_message(msg.into())
-                .with_labels(vec![
-                    Label::primary(0, span.into()).with_message(label.into())
-                ]),
-        )
-    }
-
-    pub fn labeled_error_with_secondary(
-        msg: impl Into<String>,
-        primary_label: impl Into<String>,
-        primary_span: impl Into<Span>,
-        secondary_label: impl Into<String>,
-        secondary_span: impl Into<Span>,
-    ) -> ShellError {
-        ShellError::diagnostic(
-            Diagnostic::error()
-                .with_message(msg.into())
-                .with_labels(vec![
-                    Label::primary(0, primary_span.into()).with_message(primary_label.into()),
-                    Label::secondary(0, secondary_span.into()).with_message(secondary_label.into()),
-                ]),
-        )
-    }
-
-    pub fn unimplemented(title: impl Into<String>) -> ShellError {
-        ShellError::untagged_runtime_error(&format!("Unimplemented: {}", title.into()))
-    }
-
-    pub fn unexpected(title: impl Into<String>) -> ShellError {
-        ShellError::untagged_runtime_error(&format!("Unexpected: {}", title.into()))
-    }
-
-    pub fn is_unimplemented(&self) -> bool {
-        matches!(self.error, ProximateShellError::Unimplemented { .. })
-    }
-}
-
-/// `ExpectedRange` describes a range of values that was expected by a command. In addition
-/// to typical ranges, this enum allows an error to specify that the range of allowed values
-/// corresponds to a particular numeric type (which is a dominant use-case for the
-/// [RangeError](ProximateShellError::RangeError) error type).
-#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Serialize, Deserialize)]
-pub enum ExpectedRange {
-    I8,
-    I16,
-    I32,
-    I64,
-    I128,
-    U8,
-    U16,
-    U32,
-    U64,
-    U128,
-    F32,
-    F64,
-    Usize,
-    Size,
-    BigInt,
-    BigDecimal,
-    Range { start: usize, end: usize },
-}
-
-/// Convert a Rust range into an [ExpectedRange](ExpectedRange).
-impl From<Range<usize>> for ExpectedRange {
-    fn from(range: Range<usize>) -> Self {
-        ExpectedRange::Range {
-            start: range.start,
-            end: range.end,
-        }
-    }
-}
-
-impl PrettyDebug for ExpectedRange {
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::description(match self {
-            ExpectedRange::I8 => "an 8-bit signed integer",
-            ExpectedRange::I16 => "a 16-bit signed integer",
-            ExpectedRange::I32 => "a 32-bit signed integer",
-            ExpectedRange::I64 => "a 64-bit signed integer",
-            ExpectedRange::I128 => "a 128-bit signed integer",
-            ExpectedRange::U8 => "an 8-bit unsigned integer",
-            ExpectedRange::U16 => "a 16-bit unsigned integer",
-            ExpectedRange::U32 => "a 32-bit unsigned integer",
-            ExpectedRange::U64 => "a 64-bit unsigned integer",
-            ExpectedRange::U128 => "a 128-bit unsigned integer",
-            ExpectedRange::F32 => "a 32-bit float",
-            ExpectedRange::F64 => "a 64-bit float",
-            ExpectedRange::Usize => "an list index",
-            ExpectedRange::Size => "a list offset",
-            ExpectedRange::BigDecimal => "a decimal",
-            ExpectedRange::BigInt => "an integer",
-            ExpectedRange::Range { start, end } => {
-                return DbgDocBldr::description(format!("{} to {}", start, end))
-            }
-        })
-    }
-}
-
-#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Serialize, Deserialize, Hash)]
-pub enum ProximateShellError {
-    SyntaxError {
-        problem: Spanned<String>,
-    },
-    UnexpectedEof {
-        expected: String,
-        span: Span,
-    },
-    TypeError {
-        expected: String,
-        actual: Spanned<Option<String>>,
-    },
-    MissingProperty {
-        subpath: Spanned<String>,
-        expr: Spanned<String>,
-    },
-    InvalidIntegerIndex {
-        subpath: Spanned<String>,
-        integer: Span,
-    },
-    MissingValue {
-        span: Option<Span>,
-        reason: String,
-    },
-    ArgumentError {
-        command: Spanned<String>,
-        error: ArgumentError,
-    },
-    RangeError {
-        kind: ExpectedRange,
-        actual_kind: Spanned<String>,
-        operation: String,
-    },
-    Diagnostic(ShellDiagnostic),
-    CoerceError {
-        left: Spanned<String>,
-        right: Spanned<String>,
-    },
-    UntaggedRuntimeError {
-        reason: String,
-    },
-    Unimplemented {
-        reason: String,
-    },
-}
-
-impl ProximateShellError {
-    fn start(self) -> ShellError {
-        ShellError {
-            error: self,
-            notes: vec![],
-        }
-    }
-}
-
-impl HasFallibleSpan for ShellError {
-    fn maybe_span(&self) -> Option<Span> {
-        self.error.maybe_span()
-    }
-}
-
-impl HasFallibleSpan for ProximateShellError {
-    fn maybe_span(&self) -> Option<Span> {
-        Some(match self {
-            ProximateShellError::SyntaxError { problem } => problem.span,
-            ProximateShellError::UnexpectedEof { span, .. } => *span,
-            ProximateShellError::TypeError { actual, .. } => actual.span,
-            ProximateShellError::MissingProperty { subpath, .. } => subpath.span,
-            ProximateShellError::InvalidIntegerIndex { subpath, .. } => subpath.span,
-            ProximateShellError::MissingValue { span, .. } => return *span,
-            ProximateShellError::ArgumentError { command, .. } => command.span,
-            ProximateShellError::RangeError { actual_kind, .. } => actual_kind.span,
-            ProximateShellError::Diagnostic(_) => return None,
-            ProximateShellError::CoerceError { left, right } => left.span.until(right.span),
-            ProximateShellError::UntaggedRuntimeError { .. } => return None,
-            ProximateShellError::Unimplemented { .. } => return None,
-        })
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ShellDiagnostic {
-    pub diagnostic: Diagnostic<usize>,
-}
-
-impl std::hash::Hash for ShellDiagnostic {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.diagnostic.severity.hash(state);
-        self.diagnostic.code.hash(state);
-        self.diagnostic.message.hash(state);
-
-        for label in &self.diagnostic.labels {
-            label.range.hash(state);
-            label.message.hash(state);
-            match label.style {
-                codespan_reporting::diagnostic::LabelStyle::Primary => 0.hash(state),
-                codespan_reporting::diagnostic::LabelStyle::Secondary => 1.hash(state),
-            }
-        }
-    }
-}
-
-impl PartialEq for ShellDiagnostic {
-    fn eq(&self, _other: &ShellDiagnostic) -> bool {
-        false
-    }
-}
-
-impl Eq for ShellDiagnostic {}
-
-impl std::cmp::PartialOrd for ShellDiagnostic {
-    fn partial_cmp(&self, _other: &Self) -> Option<std::cmp::Ordering> {
-        Some(std::cmp::Ordering::Less)
-    }
-}
-
-impl std::cmp::Ord for ShellDiagnostic {
-    fn cmp(&self, _other: &Self) -> std::cmp::Ordering {
-        std::cmp::Ordering::Less
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, new, Clone, Serialize, Deserialize)]
-pub struct StringError {
-    title: String,
-    error: String,
-}
-
-impl std::error::Error for ShellError {}
-
-impl std::convert::From<Box<dyn std::error::Error>> for ShellError {
-    fn from(input: Box<dyn std::error::Error>) -> ShellError {
-        ShellError::untagged_runtime_error(input.to_string())
-    }
-}
-
-impl std::convert::From<std::io::Error> for ShellError {
-    fn from(input: std::io::Error) -> ShellError {
-        ShellError::untagged_runtime_error(input.to_string())
-    }
-}
-
-impl std::convert::From<std::string::FromUtf8Error> for ShellError {
-    fn from(input: std::string::FromUtf8Error) -> ShellError {
-        ShellError::untagged_runtime_error(input.to_string())
-    }
-}
-
-impl std::convert::From<std::str::Utf8Error> for ShellError {
-    fn from(input: std::str::Utf8Error) -> ShellError {
-        ShellError::untagged_runtime_error(input.to_string())
-    }
-}
-
-impl std::convert::From<serde_yaml::Error> for ShellError {
-    fn from(input: serde_yaml::Error) -> ShellError {
-        ShellError::untagged_runtime_error(format!("{:?}", input))
-    }
-}
-
-impl std::convert::From<toml::ser::Error> for ShellError {
-    fn from(input: toml::ser::Error) -> ShellError {
-        ShellError::untagged_runtime_error(format!("{:?}", input))
-    }
-}
-
-impl std::convert::From<serde_json::Error> for ShellError {
-    fn from(input: serde_json::Error) -> ShellError {
-        ShellError::untagged_runtime_error(format!("{:?}", input))
-    }
-}
-
-impl std::convert::From<Box<dyn std::error::Error + Send + Sync>> for ShellError {
-    fn from(input: Box<dyn std::error::Error + Send + Sync>) -> ShellError {
-        ShellError::untagged_runtime_error(format!("{:?}", input))
-    }
-}
-
-impl std::convert::From<glob::PatternError> for ShellError {
-    fn from(input: glob::PatternError) -> ShellError {
-        ShellError::untagged_runtime_error(format!("{:?}", input))
-    }
-}
-
-pub trait CoerceInto<U> {
-    fn coerce_into(self, operation: impl Into<String>) -> Result<U, ShellError>;
-}
-
-trait ToExpectedRange {
-    fn to_expected_range() -> ExpectedRange;
-}
-
-macro_rules! ranged_int {
-    ($ty:tt -> $op:tt -> $variant:tt) => {
-        impl ToExpectedRange for $ty {
-            fn to_expected_range() -> ExpectedRange {
-                ExpectedRange::$variant
-            }
-        }
-
-        impl CoerceInto<$ty> for nu_source::Tagged<BigInt> {
-            fn coerce_into(self, operation: impl Into<String>) -> Result<$ty, ShellError> {
-                self.$op().ok_or_else(|| {
-                    ShellError::range_error(
-                        $ty::to_expected_range(),
-                        &self.item.spanned(self.tag.span),
-                        operation.into(),
-                    )
-                })
-            }
-        }
-
-        impl CoerceInto<$ty> for nu_source::Tagged<&BigInt> {
-            fn coerce_into(self, operation: impl Into<String>) -> Result<$ty, ShellError> {
-                self.$op().ok_or_else(|| {
-                    ShellError::range_error(
-                        $ty::to_expected_range(),
-                        &self.item.spanned(self.tag.span),
-                        operation.into(),
-                    )
-                })
-            }
-        }
-    };
-}
-
-ranged_int!(u8  -> to_u8  -> U8);
-ranged_int!(u16 -> to_u16 -> U16);
-ranged_int!(u32 -> to_u32 -> U32);
-ranged_int!(u64 -> to_u64 -> U64);
-ranged_int!(i8  -> to_i8  -> I8);
-ranged_int!(i16 -> to_i16 -> I16);
-ranged_int!(i32 -> to_i32 -> I32);
-ranged_int!(i64 -> to_i64 -> I64);
-
-macro_rules! ranged_decimal {
-    ($ty:tt -> $op:tt -> $variant:tt) => {
-        impl ToExpectedRange for $ty {
-            fn to_expected_range() -> ExpectedRange {
-                ExpectedRange::$variant
-            }
-        }
-
-        impl CoerceInto<$ty> for nu_source::Tagged<BigDecimal> {
-            fn coerce_into(self, operation: impl Into<String>) -> Result<$ty, ShellError> {
-                self.$op().ok_or_else(|| {
-                    ShellError::range_error(
-                        $ty::to_expected_range(),
-                        &self.item.spanned(self.tag.span),
-                        operation.into(),
-                    )
-                })
-            }
-        }
-
-        impl CoerceInto<$ty> for nu_source::Tagged<&BigDecimal> {
-            fn coerce_into(self, operation: impl Into<String>) -> Result<$ty, ShellError> {
-                self.$op().ok_or_else(|| {
-                    ShellError::range_error(
-                        $ty::to_expected_range(),
-                        &self.item.spanned(self.tag.span),
-                        operation.into(),
-                    )
-                })
-            }
-        }
-    };
-}
-
-ranged_decimal!(f32 -> to_f32 -> F32);
-ranged_decimal!(f64 -> to_f64 -> F64);
diff --git a/old_nushell/crates/nu-json/Cargo.toml b/old_nushell/crates/nu-json/Cargo.toml
deleted file mode 100644
index 739e8f8b8..000000000
--- a/old_nushell/crates/nu-json/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors", "Christian Zangl <laktak@cdak.net>"]
-description = "Fork of serde-hjson"
-edition = "2018"
-license = "MIT"
-name = "nu-json"
-version = "0.43.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[features]
-preserve_order = ["linked-hash-map", "linked-hash-map/serde_impl"]
-default = ["preserve_order"]
-
-[dependencies]
-serde = "1.0"
-num-traits = "0.2.14"
-regex = "^1.0"
-lazy_static = "1"
-linked-hash-map = { version="0.5", optional=true }
-
-[dev-dependencies]
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-serde_json = "1.0.39"
diff --git a/old_nushell/crates/nu-json/LICENSE b/old_nushell/crates/nu-json/LICENSE
deleted file mode 100644
index e6fee54fa..000000000
--- a/old_nushell/crates/nu-json/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 The Rust Project Developers
-Copyright (c) 2016 Christian Zangl
-Copyright (c) 2020 The Nu Project Contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/old_nushell/crates/nu-json/src/builder.rs b/old_nushell/crates/nu-json/src/builder.rs
deleted file mode 100644
index a69eee28c..000000000
--- a/old_nushell/crates/nu-json/src/builder.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use serde::ser;
-
-use crate::value::{self, Map, Value};
-
-/// This structure provides a simple interface for constructing a JSON array.
-pub struct ArrayBuilder {
-    array: Vec<Value>,
-}
-
-impl Default for ArrayBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ArrayBuilder {
-    /// Construct an `ObjectBuilder`.
-    pub fn new() -> ArrayBuilder {
-        ArrayBuilder { array: Vec::new() }
-    }
-
-    /// Return the constructed `Value`.
-    pub fn unwrap(self) -> Value {
-        Value::Array(self.array)
-    }
-
-    /// Insert a value into the array.
-    pub fn push<T: ser::Serialize>(mut self, v: T) -> ArrayBuilder {
-        self.array
-            .push(value::to_value(&v).expect("failed to serialize"));
-        self
-    }
-
-    /// Creates and passes an `ArrayBuilder` into a closure, then inserts the resulting array into
-    /// this array.
-    pub fn push_array<F>(mut self, f: F) -> ArrayBuilder
-    where
-        F: FnOnce(ArrayBuilder) -> ArrayBuilder,
-    {
-        let builder = ArrayBuilder::new();
-        self.array.push(f(builder).unwrap());
-        self
-    }
-
-    /// Creates and passes an `ArrayBuilder` into a closure, then inserts the resulting object into
-    /// this array.
-    pub fn push_object<F>(mut self, f: F) -> ArrayBuilder
-    where
-        F: FnOnce(ObjectBuilder) -> ObjectBuilder,
-    {
-        let builder = ObjectBuilder::new();
-        self.array.push(f(builder).unwrap());
-        self
-    }
-}
-
-/// This structure provides a simple interface for constructing a JSON object.
-pub struct ObjectBuilder {
-    object: Map<String, Value>,
-}
-
-impl Default for ObjectBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl ObjectBuilder {
-    /// Construct an `ObjectBuilder`.
-    pub fn new() -> ObjectBuilder {
-        ObjectBuilder { object: Map::new() }
-    }
-
-    /// Return the constructed `Value`.
-    pub fn unwrap(self) -> Value {
-        Value::Object(self.object)
-    }
-
-    /// Insert a key-value pair into the object.
-    pub fn insert<S, V>(mut self, key: S, value: V) -> ObjectBuilder
-    where
-        S: Into<String>,
-        V: ser::Serialize,
-    {
-        self.object.insert(
-            key.into(),
-            value::to_value(&value).expect("failed to serialize"),
-        );
-        self
-    }
-
-    /// Creates and passes an `ObjectBuilder` into a closure, then inserts the resulting array into
-    /// this object.
-    pub fn insert_array<S, F>(mut self, key: S, f: F) -> ObjectBuilder
-    where
-        S: Into<String>,
-        F: FnOnce(ArrayBuilder) -> ArrayBuilder,
-    {
-        let builder = ArrayBuilder::new();
-        self.object.insert(key.into(), f(builder).unwrap());
-        self
-    }
-
-    /// Creates and passes an `ObjectBuilder` into a closure, then inserts the resulting object into
-    /// this object.
-    pub fn insert_object<S, F>(mut self, key: S, f: F) -> ObjectBuilder
-    where
-        S: Into<String>,
-        F: FnOnce(ObjectBuilder) -> ObjectBuilder,
-    {
-        let builder = ObjectBuilder::new();
-        self.object.insert(key.into(), f(builder).unwrap());
-        self
-    }
-}
diff --git a/old_nushell/crates/nu-json/src/de.rs b/old_nushell/crates/nu-json/src/de.rs
deleted file mode 100644
index 430aa68b0..000000000
--- a/old_nushell/crates/nu-json/src/de.rs
+++ /dev/null
@@ -1,833 +0,0 @@
-//! Hjson Deserialization
-//!
-//! This module provides for Hjson deserialization with the type `Deserializer`.
-
-use std::char;
-use std::io;
-use std::marker::PhantomData;
-use std::str;
-
-use serde::de;
-
-use super::error::{Error, ErrorCode, Result};
-use super::util::StringReader;
-use super::util::{Number, ParseNumber};
-
-enum State {
-    Normal,
-    Root,
-    Keyname,
-}
-
-/// A structure that deserializes Hjson into Rust values.
-pub struct Deserializer<Iter: Iterator<Item = u8>> {
-    rdr: StringReader<Iter>,
-    str_buf: Vec<u8>,
-    state: State,
-}
-
-// macro_rules! try_or_invalid {
-//     ($self_:expr, $e:expr) => {
-//         match $e {
-//             Some(v) => v,
-//             None => { return Err($self_.error(ErrorCode::InvalidNumber)); }
-//         }
-//     }
-// }
-
-impl<Iter> Deserializer<Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    /// Creates the Hjson parser from an `std::iter::Iterator`.
-    #[inline]
-    pub fn new(rdr: Iter) -> Deserializer<Iter> {
-        Deserializer {
-            rdr: StringReader::new(rdr),
-            str_buf: Vec::with_capacity(128),
-            state: State::Normal,
-        }
-    }
-
-    /// Creates the Hjson parser from an `std::iter::Iterator`.
-    #[inline]
-    pub fn new_for_root(rdr: Iter) -> Deserializer<Iter> {
-        let mut res = Deserializer::new(rdr);
-        res.state = State::Root;
-        res
-    }
-
-    /// The `Deserializer::end` method should be called after a value has been fully deserialized.
-    /// This allows the `Deserializer` to validate that the input stream is at the end or that it
-    /// only has trailing whitespace.
-    #[inline]
-    pub fn end(&mut self) -> Result<()> {
-        self.rdr.parse_whitespace()?;
-        if self.rdr.eof()? {
-            Ok(())
-        } else {
-            Err(self.rdr.error(ErrorCode::TrailingCharacters))
-        }
-    }
-
-    fn is_punctuator_char(&mut self, ch: u8) -> bool {
-        matches!(ch, b'{' | b'}' | b'[' | b']' | b',' | b':')
-    }
-
-    fn parse_keyname<'de, V>(&mut self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        // quotes for keys are optional in Hjson
-        // unless they include {}[],: or whitespace.
-        // assume whitespace was already eaten
-
-        self.str_buf.clear();
-
-        let mut space: Option<usize> = None;
-        loop {
-            let ch = self.rdr.next_char_or_null()?;
-
-            if ch == b':' {
-                if self.str_buf.is_empty() {
-                    return Err(self.rdr.error(ErrorCode::Custom(
-                        "Found ':' but no key name (for an empty key name use quotes)".to_string(),
-                    )));
-                } else if space.is_some()
-                    && space.expect("Internal error: json parsing") != self.str_buf.len()
-                {
-                    return Err(self.rdr.error(ErrorCode::Custom(
-                        "Found whitespace in your key name (use quotes to include)".to_string(),
-                    )));
-                }
-                self.rdr.uneat_char(ch);
-                let s = str::from_utf8(&self.str_buf).expect("Internal error: json parsing");
-                return visitor.visit_str(s);
-            } else if ch <= b' ' {
-                if ch == 0 {
-                    return Err(self.rdr.error(ErrorCode::EofWhileParsingObject));
-                } else if space.is_none() {
-                    space = Some(self.str_buf.len());
-                }
-            } else if self.is_punctuator_char(ch) {
-                return Err(self.rdr.error(ErrorCode::Custom("Found a punctuator where a key name was expected (check your syntax or use quotes if the key name includes {}[],: or whitespace)".to_string())));
-            } else {
-                self.str_buf.push(ch);
-            }
-        }
-    }
-
-    fn parse_value<'de, V>(&mut self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        self.rdr.parse_whitespace()?;
-
-        if self.rdr.eof()? {
-            return Err(self.rdr.error(ErrorCode::EofWhileParsingValue));
-        }
-
-        match self.state {
-            State::Keyname => {
-                self.state = State::Normal;
-                return self.parse_keyname(visitor);
-            }
-            State::Root => {
-                self.state = State::Normal;
-                return self.visit_map(true, visitor);
-            }
-            _ => {}
-        }
-
-        match self.rdr.peek_or_null()? {
-            /*
-            b'-' => {
-                self.rdr.eat_char();
-                self.parse_integer(false, visitor)
-            }
-            b'0' ... b'9' => {
-                self.parse_integer(true, visitor)
-            }
-            */
-            b'"' => {
-                self.rdr.eat_char();
-                self.parse_string()?;
-                let s = str::from_utf8(&self.str_buf).expect("Internal error: json parsing");
-                visitor.visit_str(s)
-            }
-            b'[' => {
-                self.rdr.eat_char();
-                let ret = visitor.visit_seq(SeqVisitor::new(self))?;
-                self.rdr.parse_whitespace()?;
-                match self.rdr.next_char()? {
-                    Some(b']') => Ok(ret),
-                    Some(_) => Err(self.rdr.error(ErrorCode::TrailingCharacters)),
-                    None => Err(self.rdr.error(ErrorCode::EofWhileParsingList)),
-                }
-            }
-            b'{' => {
-                self.rdr.eat_char();
-                self.visit_map(false, visitor)
-            }
-            b'\x00' => Err(self.rdr.error(ErrorCode::ExpectedSomeValue)),
-            _ => self.parse_tfnns(visitor),
-        }
-    }
-
-    fn visit_map<'de, V>(&mut self, root: bool, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        let ret = visitor.visit_map(MapVisitor::new(self, root))?;
-        self.rdr.parse_whitespace()?;
-        match self.rdr.next_char()? {
-            Some(b'}') => {
-                if !root {
-                    Ok(ret)
-                } else {
-                    Err(self.rdr.error(ErrorCode::TrailingCharacters))
-                } // todo
-            }
-            Some(_) => Err(self.rdr.error(ErrorCode::TrailingCharacters)),
-            None => {
-                if root {
-                    Ok(ret)
-                } else {
-                    Err(self.rdr.error(ErrorCode::EofWhileParsingObject))
-                }
-            }
-        }
-    }
-
-    fn parse_ident(&mut self, ident: &[u8]) -> Result<()> {
-        for c in ident {
-            if Some(*c) != self.rdr.next_char()? {
-                return Err(self.rdr.error(ErrorCode::ExpectedSomeIdent));
-            }
-        }
-
-        Ok(())
-    }
-
-    fn parse_tfnns<'de, V>(&mut self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        // Hjson strings can be quoteless
-        // returns string, true, false, or null.
-        self.str_buf.clear();
-
-        let first = self.rdr.peek()?.expect("Internal error: json parsing");
-
-        if self.is_punctuator_char(first) {
-            return Err(self.rdr.error(ErrorCode::PunctuatorInQlString));
-        }
-
-        loop {
-            let ch = self.rdr.next_char_or_null()?;
-
-            let is_eol = ch == b'\r' || ch == b'\n' || ch == b'\x00';
-            let is_comment = ch == b'#'
-                || if ch == b'/' {
-                    let next = self.rdr.peek_or_null()?;
-                    next == b'/' || next == b'*'
-                } else {
-                    false
-                };
-            if is_eol || is_comment || ch == b',' || ch == b'}' || ch == b']' {
-                let chf = self.str_buf[0];
-                match chf {
-                    b'f' => {
-                        if str::from_utf8(&self.str_buf)
-                            .expect("Internal error: json parsing")
-                            .trim()
-                            == "false"
-                        {
-                            self.rdr.uneat_char(ch);
-                            return visitor.visit_bool(false);
-                        }
-                    }
-                    b'n' => {
-                        if str::from_utf8(&self.str_buf)
-                            .expect("Internal error: json parsing")
-                            .trim()
-                            == "null"
-                        {
-                            self.rdr.uneat_char(ch);
-                            return visitor.visit_unit();
-                        }
-                    }
-                    b't' => {
-                        if str::from_utf8(&self.str_buf)
-                            .expect("Internal error: json parsing")
-                            .trim()
-                            == "true"
-                        {
-                            self.rdr.uneat_char(ch);
-                            return visitor.visit_bool(true);
-                        }
-                    }
-                    _ => {
-                        if chf == b'-' || (b'0'..=b'9').contains(&chf) {
-                            let mut pn = ParseNumber::new(self.str_buf.iter().copied());
-                            match pn.parse(false) {
-                                Ok(Number::F64(v)) => {
-                                    self.rdr.uneat_char(ch);
-                                    return visitor.visit_f64(v);
-                                }
-                                Ok(Number::U64(v)) => {
-                                    self.rdr.uneat_char(ch);
-                                    return visitor.visit_u64(v);
-                                }
-                                Ok(Number::I64(v)) => {
-                                    self.rdr.uneat_char(ch);
-                                    return visitor.visit_i64(v);
-                                }
-                                Err(_) => {} // not a number, continue
-                            }
-                        }
-                    }
-                }
-                if is_eol {
-                    // remove any whitespace at the end (ignored in quoteless strings)
-                    return visitor.visit_str(
-                        str::from_utf8(&self.str_buf)
-                            .expect("Internal error: json parsing")
-                            .trim(),
-                    );
-                }
-            }
-            self.str_buf.push(ch);
-
-            if self.str_buf == b"'''" {
-                return self.parse_ml_string(visitor);
-            }
-        }
-    }
-
-    fn decode_hex_escape(&mut self) -> Result<u16> {
-        let mut i = 0;
-        let mut n = 0u16;
-        while i < 4 && !self.rdr.eof()? {
-            n = match self.rdr.next_char_or_null()? {
-                c @ b'0'..=b'9' => n * 16_u16 + ((c as u16) - (b'0' as u16)),
-                b'a' | b'A' => n * 16_u16 + 10_u16,
-                b'b' | b'B' => n * 16_u16 + 11_u16,
-                b'c' | b'C' => n * 16_u16 + 12_u16,
-                b'd' | b'D' => n * 16_u16 + 13_u16,
-                b'e' | b'E' => n * 16_u16 + 14_u16,
-                b'f' | b'F' => n * 16_u16 + 15_u16,
-                _ => {
-                    return Err(self.rdr.error(ErrorCode::InvalidEscape));
-                }
-            };
-
-            i += 1;
-        }
-
-        // Error out if we didn't parse 4 digits.
-        if i != 4 {
-            return Err(self.rdr.error(ErrorCode::InvalidEscape));
-        }
-
-        Ok(n)
-    }
-
-    fn ml_skip_white(&mut self) -> Result<bool> {
-        match self.rdr.peek_or_null()? {
-            b' ' | b'\t' | b'\r' => {
-                self.rdr.eat_char();
-                Ok(true)
-            }
-            _ => Ok(false),
-        }
-    }
-
-    fn ml_skip_indent(&mut self, indent: usize) -> Result<()> {
-        let mut skip = indent;
-        while self.ml_skip_white()? && skip > 0 {
-            skip -= 1;
-        }
-        Ok(())
-    }
-
-    fn parse_ml_string<'de, V>(&mut self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        self.str_buf.clear();
-
-        // Parse a multiline string value.
-        let mut triple = 0;
-
-        // we are at ''' +1 - get indent
-        let (_, col) = self.rdr.pos();
-        let indent = col - 4;
-
-        // skip white/to (newline)
-        while self.ml_skip_white()? {}
-        if self.rdr.peek_or_null()? == b'\n' {
-            self.rdr.eat_char();
-            self.ml_skip_indent(indent)?;
-        }
-
-        // When parsing multiline string values, we must look for ' characters.
-        loop {
-            if self.rdr.eof()? {
-                return Err(self.rdr.error(ErrorCode::EofWhileParsingString));
-            } // todo error("Bad multiline string");
-            let ch = self.rdr.next_char_or_null()?;
-
-            if ch == b'\'' {
-                triple += 1;
-                if triple == 3 {
-                    if self.str_buf.last() == Some(&b'\n') {
-                        self.str_buf.pop();
-                    }
-                    let res = str::from_utf8(&self.str_buf).expect("Internal error: json parsing");
-                    //todo if (self.str_buf.slice(-1) === '\n') self.str_buf=self.str_buf.slice(0, -1); // remove last EOL
-                    return visitor.visit_str(res);
-                } else {
-                    continue;
-                }
-            }
-
-            while triple > 0 {
-                self.str_buf.push(b'\'');
-                triple -= 1;
-            }
-
-            if ch != b'\r' {
-                self.str_buf.push(ch);
-            }
-            if ch == b'\n' {
-                self.ml_skip_indent(indent)?;
-            }
-        }
-    }
-
-    fn parse_string(&mut self) -> Result<()> {
-        self.str_buf.clear();
-
-        loop {
-            let ch = match self.rdr.next_char()? {
-                Some(ch) => ch,
-                None => {
-                    return Err(self.rdr.error(ErrorCode::EofWhileParsingString));
-                }
-            };
-
-            match ch {
-                b'"' => {
-                    return Ok(());
-                }
-                b'\\' => {
-                    let ch = match self.rdr.next_char()? {
-                        Some(ch) => ch,
-                        None => {
-                            return Err(self.rdr.error(ErrorCode::EofWhileParsingString));
-                        }
-                    };
-
-                    match ch {
-                        b'"' => self.str_buf.push(b'"'),
-                        b'\\' => self.str_buf.push(b'\\'),
-                        b'/' => self.str_buf.push(b'/'),
-                        b'b' => self.str_buf.push(b'\x08'),
-                        b'f' => self.str_buf.push(b'\x0c'),
-                        b'n' => self.str_buf.push(b'\n'),
-                        b'r' => self.str_buf.push(b'\r'),
-                        b't' => self.str_buf.push(b'\t'),
-                        b'u' => {
-                            let c = match self.decode_hex_escape()? {
-                                0xDC00..=0xDFFF => {
-                                    return Err(self
-                                        .rdr
-                                        .error(ErrorCode::LoneLeadingSurrogateInHexEscape));
-                                }
-
-                                // Non-BMP characters are encoded as a sequence of
-                                // two hex escapes, representing UTF-16 surrogates.
-                                n1 @ 0xD800..=0xDBFF => {
-                                    match (self.rdr.next_char()?, self.rdr.next_char()?) {
-                                        (Some(b'\\'), Some(b'u')) => (),
-                                        _ => {
-                                            return Err(self
-                                                .rdr
-                                                .error(ErrorCode::UnexpectedEndOfHexEscape));
-                                        }
-                                    }
-
-                                    let n2 = self.decode_hex_escape()?;
-
-                                    if !(0xDC00..=0xDFFF).contains(&n2) {
-                                        return Err(self
-                                            .rdr
-                                            .error(ErrorCode::LoneLeadingSurrogateInHexEscape));
-                                    }
-
-                                    let n = (((n1 - 0xD800) as u32) << 10 | (n2 - 0xDC00) as u32)
-                                        + 0x1_0000;
-
-                                    match char::from_u32(n as u32) {
-                                        Some(c) => c,
-                                        None => {
-                                            return Err(self
-                                                .rdr
-                                                .error(ErrorCode::InvalidUnicodeCodePoint));
-                                        }
-                                    }
-                                }
-
-                                n => match char::from_u32(n as u32) {
-                                    Some(c) => c,
-                                    None => {
-                                        return Err(self
-                                            .rdr
-                                            .error(ErrorCode::InvalidUnicodeCodePoint));
-                                    }
-                                },
-                            };
-
-                            self.str_buf.extend(c.encode_utf8(&mut [0; 4]).as_bytes());
-                        }
-                        _ => {
-                            return Err(self.rdr.error(ErrorCode::InvalidEscape));
-                        }
-                    }
-                }
-                ch => {
-                    self.str_buf.push(ch);
-                }
-            }
-        }
-    }
-
-    fn parse_object_colon(&mut self) -> Result<()> {
-        self.rdr.parse_whitespace()?;
-
-        match self.rdr.next_char()? {
-            Some(b':') => Ok(()),
-            Some(_) => Err(self.rdr.error(ErrorCode::ExpectedColon)),
-            None => Err(self.rdr.error(ErrorCode::EofWhileParsingObject)),
-        }
-    }
-}
-
-impl<'de, 'a, Iter> de::Deserializer<'de> for &'a mut Deserializer<Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        if let State::Root = self.state {}
-
-        self.parse_value(visitor)
-    }
-
-    /// Parses a `null` as a None, and any other values as a `Some(...)`.
-    #[inline]
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        self.rdr.parse_whitespace()?;
-
-        match self.rdr.peek_or_null()? {
-            b'n' => {
-                self.rdr.eat_char();
-                self.parse_ident(b"ull")?;
-                visitor.visit_none()
-            }
-            _ => visitor.visit_some(self),
-        }
-    }
-
-    /// Parses a newtype struct as the underlying value.
-    #[inline]
-    fn deserialize_newtype_struct<V>(self, _name: &str, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
-    serde::forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf unit unit_struct seq tuple map
-        tuple_struct struct enum identifier ignored_any
-    }
-}
-
-struct SeqVisitor<'a, Iter: 'a + Iterator<Item = u8>> {
-    de: &'a mut Deserializer<Iter>,
-}
-
-impl<'a, Iter: Iterator<Item = u8>> SeqVisitor<'a, Iter> {
-    fn new(de: &'a mut Deserializer<Iter>) -> Self {
-        SeqVisitor { de }
-    }
-}
-
-impl<'de, 'a, Iter> de::SeqAccess<'de> for SeqVisitor<'a, Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    type Error = Error;
-
-    fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
-    where
-        T: de::DeserializeSeed<'de>,
-    {
-        self.de.rdr.parse_whitespace()?;
-
-        match self.de.rdr.peek()? {
-            Some(b']') => {
-                return Ok(None);
-            }
-            Some(_) => {}
-            None => {
-                return Err(self.de.rdr.error(ErrorCode::EofWhileParsingList));
-            }
-        }
-
-        let value = seed.deserialize(&mut *self.de)?;
-
-        // in Hjson the comma is optional and trailing commas are allowed
-        self.de.rdr.parse_whitespace()?;
-        if self.de.rdr.peek()? == Some(b',') {
-            self.de.rdr.eat_char();
-            self.de.rdr.parse_whitespace()?;
-        }
-
-        Ok(Some(value))
-    }
-}
-
-struct MapVisitor<'a, Iter: 'a + Iterator<Item = u8>> {
-    de: &'a mut Deserializer<Iter>,
-    first: bool,
-    root: bool,
-}
-
-impl<'a, Iter: Iterator<Item = u8>> MapVisitor<'a, Iter> {
-    fn new(de: &'a mut Deserializer<Iter>, root: bool) -> Self {
-        MapVisitor {
-            de,
-            first: true,
-            root,
-        }
-    }
-}
-
-impl<'de, 'a, Iter> de::MapAccess<'de> for MapVisitor<'a, Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    type Error = Error;
-
-    fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
-    where
-        K: de::DeserializeSeed<'de>,
-    {
-        self.de.rdr.parse_whitespace()?;
-
-        if self.first {
-            self.first = false;
-        } else if self.de.rdr.peek()? == Some(b',') {
-            // in Hjson the comma is optional and trailing commas are allowed
-            self.de.rdr.eat_char();
-            self.de.rdr.parse_whitespace()?;
-        }
-
-        match self.de.rdr.peek()? {
-            Some(b'}') => return Ok(None), // handled later for root
-            Some(_) => {}
-            None => {
-                if self.root {
-                    return Ok(None);
-                } else {
-                    return Err(self.de.rdr.error(ErrorCode::EofWhileParsingObject));
-                }
-            }
-        }
-
-        match self.de.rdr.peek()? {
-            Some(ch) => {
-                self.de.state = if ch == b'"' {
-                    State::Normal
-                } else {
-                    State::Keyname
-                };
-                Ok(Some(seed.deserialize(&mut *self.de)?))
-            }
-            None => Err(self.de.rdr.error(ErrorCode::EofWhileParsingValue)),
-        }
-    }
-
-    fn next_value_seed<V>(&mut self, seed: V) -> Result<V::Value>
-    where
-        V: de::DeserializeSeed<'de>,
-    {
-        self.de.parse_object_colon()?;
-
-        seed.deserialize(&mut *self.de)
-    }
-}
-
-impl<'de, 'a, Iter> de::VariantAccess<'de> for &'a mut Deserializer<Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    type Error = Error;
-
-    fn unit_variant(self) -> Result<()> {
-        de::Deserialize::deserialize(self)
-    }
-
-    fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value>
-    where
-        T: de::DeserializeSeed<'de>,
-    {
-        seed.deserialize(self)
-    }
-
-    fn tuple_variant<V>(self, _len: usize, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        de::Deserializer::deserialize_any(self, visitor)
-    }
-
-    fn struct_variant<V>(self, _fields: &'static [&'static str], visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        de::Deserializer::deserialize_any(self, visitor)
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-/// Iterator that deserializes a stream into multiple Hjson values.
-pub struct StreamDeserializer<T, Iter>
-where
-    Iter: Iterator<Item = u8>,
-    T: de::DeserializeOwned,
-{
-    deser: Deserializer<Iter>,
-    _marker: PhantomData<T>,
-}
-
-impl<T, Iter> StreamDeserializer<T, Iter>
-where
-    Iter: Iterator<Item = u8>,
-    T: de::DeserializeOwned,
-{
-    /// Returns an `Iterator` of decoded Hjson values from an iterator over
-    /// `Iterator<Item=u8>`.
-    pub fn new(iter: Iter) -> StreamDeserializer<T, Iter> {
-        StreamDeserializer {
-            deser: Deserializer::new(iter),
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<T, Iter> Iterator for StreamDeserializer<T, Iter>
-where
-    Iter: Iterator<Item = u8>,
-    T: de::DeserializeOwned,
-{
-    type Item = Result<T>;
-
-    fn next(&mut self) -> Option<Result<T>> {
-        // skip whitespaces, if any
-        // this helps with trailing whitespaces, since whitespaces between
-        // values are handled for us.
-        if let Err(e) = self.deser.rdr.parse_whitespace() {
-            return Some(Err(e));
-        };
-
-        match self.deser.rdr.eof() {
-            Ok(true) => None,
-            Ok(false) => match de::Deserialize::deserialize(&mut self.deser) {
-                Ok(v) => Some(Ok(v)),
-                Err(e) => Some(Err(e)),
-            },
-            Err(e) => Some(Err(e)),
-        }
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-/// Decodes a Hjson value from an iterator over an iterator
-/// `Iterator<Item=u8>`.
-pub fn from_iter<I, T>(iter: I) -> Result<T>
-where
-    I: Iterator<Item = io::Result<u8>>,
-    T: de::DeserializeOwned,
-{
-    let fold: io::Result<Vec<_>> = iter.collect();
-
-    if let Err(e) = fold {
-        return Err(Error::Io(e));
-    }
-
-    let bytes = fold.expect("Internal error: json parsing");
-
-    // deserialize tries first to decode with legacy support (new_for_root)
-    // and then with the standard method if this fails.
-    // todo: add compile switch
-
-    // deserialize and make sure the whole stream has been consumed
-    let mut de = Deserializer::new_for_root(bytes.iter().copied());
-    de::Deserialize::deserialize(&mut de)
-        .and_then(|x| de.end().map(|()| x))
-        .or_else(|_| {
-            let mut de2 = Deserializer::new(bytes.iter().copied());
-            de::Deserialize::deserialize(&mut de2).and_then(|x| de2.end().map(|()| x))
-        })
-
-    /* without legacy support:
-    // deserialize and make sure the whole stream has been consumed
-    let mut de = Deserializer::new(bytes.iter().map(|b| *b));
-    let value = match de::Deserialize::deserialize(&mut de)
-        .and_then(|x| { try!(de.end()); Ok(x) })
-    {
-        Ok(v) => Ok(v),
-        Err(e) => Err(e),
-    };
-    */
-}
-
-/// Decodes a Hjson value from a `std::io::Read`.
-pub fn from_reader<R, T>(rdr: R) -> Result<T>
-where
-    R: io::Read,
-    T: de::DeserializeOwned,
-{
-    from_iter(rdr.bytes())
-}
-
-/// Decodes a Hjson value from a byte slice `&[u8]`.
-pub fn from_slice<T>(v: &[u8]) -> Result<T>
-where
-    T: de::DeserializeOwned,
-{
-    from_iter(v.iter().map(|&byte| Ok(byte)))
-}
-
-/// Decodes a Hjson value from a `&str`.
-pub fn from_str<T>(s: &str) -> Result<T>
-where
-    T: de::DeserializeOwned,
-{
-    from_slice(s.as_bytes())
-}
diff --git a/old_nushell/crates/nu-json/src/error.rs b/old_nushell/crates/nu-json/src/error.rs
deleted file mode 100644
index 33d417c62..000000000
--- a/old_nushell/crates/nu-json/src/error.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-//! JSON Errors
-//!
-//! This module is centered around the `Error` and `ErrorCode` types, which represents all possible
-//! `serde_hjson` errors.
-
-use std::error;
-use std::fmt;
-use std::io;
-use std::result;
-use std::string::FromUtf8Error;
-
-use serde::de;
-use serde::ser;
-
-/// The errors that can arise while parsing a JSON stream.
-#[derive(Clone, PartialEq)]
-pub enum ErrorCode {
-    /// Catchall for syntax error messages
-    Custom(String),
-
-    /// EOF while parsing a list.
-    EofWhileParsingList,
-
-    /// EOF while parsing an object.
-    EofWhileParsingObject,
-
-    /// EOF while parsing a string.
-    EofWhileParsingString,
-
-    /// EOF while parsing a JSON value.
-    EofWhileParsingValue,
-
-    /// Expected this character to be a `':'`.
-    ExpectedColon,
-
-    /// Expected this character to be either a `','` or a `]`.
-    ExpectedListCommaOrEnd,
-
-    /// Expected this character to be either a `','` or a `}`.
-    ExpectedObjectCommaOrEnd,
-
-    /// Expected to parse either a `true`, `false`, or a `null`.
-    ExpectedSomeIdent,
-
-    /// Expected this character to start a JSON value.
-    ExpectedSomeValue,
-
-    /// Invalid hex escape code.
-    InvalidEscape,
-
-    /// Invalid number.
-    InvalidNumber,
-
-    /// Invalid Unicode code point.
-    InvalidUnicodeCodePoint,
-
-    /// Object key is not a string.
-    KeyMustBeAString,
-
-    /// Lone leading surrogate in hex escape.
-    LoneLeadingSurrogateInHexEscape,
-
-    /// JSON has non-whitespace trailing characters after the value.
-    TrailingCharacters,
-
-    /// Unexpected end of hex escape.
-    UnexpectedEndOfHexEscape,
-
-    /// Found a punctuator character when expecting a quoteless string.
-    PunctuatorInQlString,
-}
-
-impl fmt::Debug for ErrorCode {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        //use std::fmt::Debug;
-
-        match *self {
-            ErrorCode::Custom(ref msg) => write!(f, "{}", msg),
-            ErrorCode::EofWhileParsingList => "EOF while parsing a list".fmt(f),
-            ErrorCode::EofWhileParsingObject => "EOF while parsing an object".fmt(f),
-            ErrorCode::EofWhileParsingString => "EOF while parsing a string".fmt(f),
-            ErrorCode::EofWhileParsingValue => "EOF while parsing a value".fmt(f),
-            ErrorCode::ExpectedColon => "expected `:`".fmt(f),
-            ErrorCode::ExpectedListCommaOrEnd => "expected `,` or `]`".fmt(f),
-            ErrorCode::ExpectedObjectCommaOrEnd => "expected `,` or `}`".fmt(f),
-            ErrorCode::ExpectedSomeIdent => "expected ident".fmt(f),
-            ErrorCode::ExpectedSomeValue => "expected value".fmt(f),
-            ErrorCode::InvalidEscape => "invalid escape".fmt(f),
-            ErrorCode::InvalidNumber => "invalid number".fmt(f),
-            ErrorCode::InvalidUnicodeCodePoint => "invalid Unicode code point".fmt(f),
-            ErrorCode::KeyMustBeAString => "key must be a string".fmt(f),
-            ErrorCode::LoneLeadingSurrogateInHexEscape => {
-                "lone leading surrogate in hex escape".fmt(f)
-            }
-            ErrorCode::TrailingCharacters => "trailing characters".fmt(f),
-            ErrorCode::UnexpectedEndOfHexEscape => "unexpected end of hex escape".fmt(f),
-            ErrorCode::PunctuatorInQlString => {
-                "found a punctuator character when expecting a quoteless string".fmt(f)
-            }
-        }
-    }
-}
-
-/// This type represents all possible errors that can occur when serializing or deserializing a
-/// value into JSON.
-#[derive(Debug)]
-pub enum Error {
-    /// The JSON value had some syntactic error.
-    Syntax(ErrorCode, usize, usize),
-
-    /// Some IO error occurred when serializing or deserializing a value.
-    Io(io::Error),
-
-    /// Some UTF8 error occurred while serializing or deserializing a value.
-    FromUtf8(FromUtf8Error),
-}
-
-impl error::Error for Error {
-    fn cause(&self) -> Option<&dyn error::Error> {
-        match *self {
-            Error::Io(ref error) => Some(error),
-            Error::FromUtf8(ref error) => Some(error),
-            _ => None,
-        }
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            Error::Syntax(ref code, line, col) => {
-                write!(fmt, "{:?} at line {} column {}", code, line, col)
-            }
-            Error::Io(ref error) => fmt::Display::fmt(error, fmt),
-            Error::FromUtf8(ref error) => fmt::Display::fmt(error, fmt),
-        }
-    }
-}
-
-impl From<io::Error> for Error {
-    fn from(error: io::Error) -> Error {
-        Error::Io(error)
-    }
-}
-
-impl From<FromUtf8Error> for Error {
-    fn from(error: FromUtf8Error) -> Error {
-        Error::FromUtf8(error)
-    }
-}
-
-impl de::Error for Error {
-    fn custom<T: fmt::Display>(msg: T) -> Error {
-        Error::Syntax(ErrorCode::Custom(msg.to_string()), 0, 0)
-    }
-}
-
-impl ser::Error for Error {
-    /// Raised when there is general error when deserializing a type.
-    fn custom<T: fmt::Display>(msg: T) -> Error {
-        Error::Syntax(ErrorCode::Custom(msg.to_string()), 0, 0)
-    }
-}
-
-/// Helper alias for `Result` objects that return a JSON `Error`.
-pub type Result<T> = result::Result<T, Error>;
diff --git a/old_nushell/crates/nu-json/src/lib.rs b/old_nushell/crates/nu-json/src/lib.rs
deleted file mode 100644
index 6a196c527..000000000
--- a/old_nushell/crates/nu-json/src/lib.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub use self::de::{
-    from_iter, from_reader, from_slice, from_str, Deserializer, StreamDeserializer,
-};
-pub use self::error::{Error, ErrorCode, Result};
-pub use self::ser::{to_string, to_vec, to_writer, Serializer};
-pub use self::value::{from_value, to_value, Map, Value};
-
-pub mod builder;
-pub mod de;
-pub mod error;
-pub mod ser;
-mod util;
-pub mod value;
diff --git a/old_nushell/crates/nu-json/src/ser.rs b/old_nushell/crates/nu-json/src/ser.rs
deleted file mode 100644
index 200b90f1e..000000000
--- a/old_nushell/crates/nu-json/src/ser.rs
+++ /dev/null
@@ -1,1017 +0,0 @@
-//! Hjson Serialization
-//!
-//! This module provides for Hjson serialization with the type `Serializer`.
-
-use std::fmt::{Display, LowerExp};
-use std::io;
-use std::num::FpCategory;
-
-use super::error::{Error, ErrorCode, Result};
-use serde::ser;
-
-use super::util::ParseNumber;
-
-use regex::Regex;
-
-use lazy_static::lazy_static;
-
-/// A structure for serializing Rust values into Hjson.
-pub struct Serializer<W, F> {
-    writer: W,
-    formatter: F,
-}
-
-impl<'a, W> Serializer<W, HjsonFormatter<'a>>
-where
-    W: io::Write,
-{
-    /// Creates a new Hjson serializer.
-    #[inline]
-    pub fn new(writer: W) -> Self {
-        Serializer::with_formatter(writer, HjsonFormatter::new())
-    }
-}
-
-impl<W, F> Serializer<W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    /// Creates a new Hjson visitor whose output will be written to the writer
-    /// specified.
-    #[inline]
-    pub fn with_formatter(writer: W, formatter: F) -> Self {
-        Serializer { writer, formatter }
-    }
-
-    /// Unwrap the `Writer` from the `Serializer`.
-    #[inline]
-    pub fn into_inner(self) -> W {
-        self.writer
-    }
-}
-
-#[doc(hidden)]
-#[derive(Eq, PartialEq)]
-pub enum State {
-    Empty,
-    First,
-    Rest,
-}
-
-#[doc(hidden)]
-pub struct Compound<'a, W, F> {
-    ser: &'a mut Serializer<W, F>,
-    state: State,
-}
-
-impl<'a, W, F> ser::Serializer for &'a mut Serializer<W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    type SerializeSeq = Compound<'a, W, F>;
-    type SerializeTuple = Compound<'a, W, F>;
-    type SerializeTupleStruct = Compound<'a, W, F>;
-    type SerializeTupleVariant = Compound<'a, W, F>;
-    type SerializeMap = Compound<'a, W, F>;
-    type SerializeStruct = Compound<'a, W, F>;
-    type SerializeStructVariant = Compound<'a, W, F>;
-
-    #[inline]
-    fn serialize_bool(self, value: bool) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        if value {
-            self.writer.write_all(b"true").map_err(From::from)
-        } else {
-            self.writer.write_all(b"false").map_err(From::from)
-        }
-    }
-
-    #[inline]
-    fn serialize_i8(self, value: i8) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_i16(self, value: i16) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_i32(self, value: i32) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_i64(self, value: i64) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_u8(self, value: u8) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_u16(self, value: u16) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_u32(self, value: u32) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_u64(self, value: u64) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        write!(&mut self.writer, "{}", value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_f32(self, value: f32) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        fmt_f32_or_null(&mut self.writer, if value == -0f32 { 0f32 } else { value })
-            .map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_f64(self, value: f64) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        fmt_f64_or_null(&mut self.writer, if value == -0f64 { 0f64 } else { value })
-            .map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_char(self, value: char) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        escape_char(&mut self.writer, value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_str(self, value: &str) -> Result<()> {
-        quote_str(&mut self.writer, &mut self.formatter, value).map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_bytes(self, value: &[u8]) -> Result<()> {
-        let mut seq = self.serialize_seq(Some(value.len()))?;
-        for byte in value {
-            ser::SerializeSeq::serialize_element(&mut seq, byte)?
-        }
-        ser::SerializeSeq::end(seq)
-    }
-
-    #[inline]
-    fn serialize_unit(self) -> Result<()> {
-        self.formatter.start_value(&mut self.writer)?;
-        self.writer.write_all(b"null").map_err(From::from)
-    }
-
-    #[inline]
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<()> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-    ) -> Result<()> {
-        self.serialize_str(variant)
-    }
-
-    /// Serialize newtypes without an object wrapper.
-    #[inline]
-    fn serialize_newtype_struct<T>(self, _name: &'static str, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        value.serialize(self)
-    }
-
-    #[inline]
-    fn serialize_newtype_variant<T>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        value: &T,
-    ) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        self.formatter.open(&mut self.writer, b'{')?;
-        self.formatter.comma(&mut self.writer, true)?;
-        escape_key(&mut self.writer, variant)?;
-        self.formatter.colon(&mut self.writer)?;
-        value.serialize(&mut *self)?;
-        self.formatter.close(&mut self.writer, b'}')
-    }
-
-    #[inline]
-    fn serialize_none(self) -> Result<()> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_some<V>(self, value: &V) -> Result<()>
-    where
-        V: ?Sized + ser::Serialize,
-    {
-        value.serialize(self)
-    }
-
-    #[inline]
-    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq> {
-        let state = if len == Some(0) {
-            self.formatter.start_value(&mut self.writer)?;
-            self.writer.write_all(b"[]")?;
-            State::Empty
-        } else {
-            self.formatter.open(&mut self.writer, b'[')?;
-            State::First
-        };
-        Ok(Compound { ser: self, state })
-    }
-
-    #[inline]
-    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple> {
-        self.serialize_seq(Some(len))
-    }
-
-    #[inline]
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleStruct> {
-        self.serialize_seq(Some(len))
-    }
-
-    #[inline]
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleVariant> {
-        self.formatter.open(&mut self.writer, b'{')?;
-        self.formatter.comma(&mut self.writer, true)?;
-        escape_key(&mut self.writer, variant)?;
-        self.formatter.colon(&mut self.writer)?;
-        self.serialize_seq(Some(len))
-    }
-
-    #[inline]
-    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap> {
-        let state = if len == Some(0) {
-            self.formatter.start_value(&mut self.writer)?;
-            self.writer.write_all(b"{}")?;
-            State::Empty
-        } else {
-            self.formatter.open(&mut self.writer, b'{')?;
-            State::First
-        };
-        Ok(Compound { ser: self, state })
-    }
-
-    #[inline]
-    fn serialize_struct(self, _name: &'static str, len: usize) -> Result<Self::SerializeStruct> {
-        self.serialize_map(Some(len))
-    }
-
-    #[inline]
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeStructVariant> {
-        self.formatter.open(&mut self.writer, b'{')?;
-        self.formatter.comma(&mut self.writer, true)?;
-        escape_key(&mut self.writer, variant)?;
-        self.formatter.colon(&mut self.writer)?;
-        self.serialize_map(Some(len))
-    }
-}
-
-impl<'a, W, F> ser::SerializeSeq for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        self.ser
-            .formatter
-            .comma(&mut self.ser.writer, self.state == State::First)?;
-        self.state = State::Rest;
-        value.serialize(&mut *self.ser)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        match self.state {
-            State::Empty => Ok(()),
-            _ => self.ser.formatter.close(&mut self.ser.writer, b']'),
-        }
-    }
-}
-
-impl<'a, W, F> ser::SerializeTuple for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        ser::SerializeSeq::end(self)
-    }
-}
-
-impl<'a, W, F> ser::SerializeTupleStruct for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        ser::SerializeSeq::end(self)
-    }
-}
-
-impl<'a, W, F> ser::SerializeTupleVariant for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        match self.state {
-            State::Empty => {}
-            _ => self.ser.formatter.close(&mut self.ser.writer, b']')?,
-        }
-        self.ser.formatter.close(&mut self.ser.writer, b'}')
-    }
-}
-
-impl<'a, W, F> ser::SerializeMap for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        self.ser
-            .formatter
-            .comma(&mut self.ser.writer, self.state == State::First)?;
-        self.state = State::Rest;
-
-        key.serialize(MapKeySerializer { ser: self.ser })?;
-
-        self.ser.formatter.colon(&mut self.ser.writer)
-    }
-
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        value.serialize(&mut *self.ser)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        match self.state {
-            State::Empty => Ok(()),
-            _ => self.ser.formatter.close(&mut self.ser.writer, b'}'),
-        }
-    }
-}
-
-impl<'a, W, F> ser::SerializeStruct for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        ser::SerializeMap::serialize_entry(self, key, value)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        ser::SerializeMap::end(self)
-    }
-}
-
-impl<'a, W, F> ser::SerializeStructVariant for Compound<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<()>
-    where
-        T: serde::Serialize,
-    {
-        ser::SerializeStruct::serialize_field(self, key, value)
-    }
-
-    fn end(self) -> Result<Self::Ok> {
-        match self.state {
-            State::Empty => {}
-            _ => self.ser.formatter.close(&mut self.ser.writer, b'}')?,
-        }
-        self.ser.formatter.close(&mut self.ser.writer, b'}')
-    }
-}
-
-struct MapKeySerializer<'a, W: 'a, F: 'a> {
-    ser: &'a mut Serializer<W, F>,
-}
-
-impl<'a, W, F> ser::Serializer for MapKeySerializer<'a, W, F>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    type Ok = ();
-    type Error = Error;
-
-    #[inline]
-    fn serialize_str(self, value: &str) -> Result<()> {
-        escape_key(&mut self.ser.writer, value).map_err(From::from)
-    }
-
-    type SerializeSeq = ser::Impossible<(), Error>;
-    type SerializeTuple = ser::Impossible<(), Error>;
-    type SerializeTupleStruct = ser::Impossible<(), Error>;
-    type SerializeTupleVariant = ser::Impossible<(), Error>;
-    type SerializeMap = ser::Impossible<(), Error>;
-    type SerializeStruct = ser::Impossible<(), Error>;
-    type SerializeStructVariant = ser::Impossible<(), Error>;
-
-    fn serialize_bool(self, _value: bool) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_i8(self, _value: i8) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_i16(self, _value: i16) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_i32(self, _value: i32) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_i64(self, _value: i64) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_u8(self, _value: u8) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_u16(self, _value: u16) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_u32(self, _value: u32) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_u64(self, _value: u64) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_f32(self, _value: f32) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_f64(self, _value: f64) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_char(self, _value: char) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_bytes(self, _value: &[u8]) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_unit(self) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-    ) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_newtype_struct<T>(self, _name: &'static str, _value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_newtype_variant<T>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _value: &T,
-    ) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_none(self) -> Result<()> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_some<T>(self, _value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeStruct> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_tuple(self, _len: usize) -> Result<Self::SerializeTuple> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleStruct> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleVariant> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_struct(self, _name: &'static str, _len: usize) -> Result<Self::SerializeStruct> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStructVariant> {
-        Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0))
-    }
-}
-
-/// This trait abstracts away serializing the JSON control characters
-pub trait Formatter {
-    /// Called when serializing a '{' or '['.
-    fn open<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
-    where
-        W: io::Write;
-
-    /// Called when serializing a ','.
-    fn comma<W>(&mut self, writer: &mut W, first: bool) -> Result<()>
-    where
-        W: io::Write;
-
-    /// Called when serializing a ':'.
-    fn colon<W>(&mut self, writer: &mut W) -> Result<()>
-    where
-        W: io::Write;
-
-    /// Called when serializing a '}' or ']'.
-    fn close<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
-    where
-        W: io::Write;
-
-    /// Newline with indent.
-    fn newline<W>(&mut self, writer: &mut W, add_indent: i32) -> Result<()>
-    where
-        W: io::Write;
-
-    /// Start a value.
-    fn start_value<W>(&mut self, writer: &mut W) -> Result<()>
-    where
-        W: io::Write;
-}
-
-struct HjsonFormatter<'a> {
-    current_indent: usize,
-    current_is_array: bool,
-    stack: Vec<bool>,
-    at_colon: bool,
-    indent: &'a [u8],
-    braces_same_line: bool,
-}
-
-impl<'a> HjsonFormatter<'a> {
-    /// Construct a formatter that defaults to using two spaces for indentation.
-    pub fn new() -> Self {
-        HjsonFormatter::with_indent(b"  ")
-    }
-
-    /// Construct a formatter that uses the `indent` string for indentation.
-    pub fn with_indent(indent: &'a [u8]) -> Self {
-        HjsonFormatter {
-            current_indent: 0,
-            current_is_array: false,
-            stack: Vec::new(),
-            at_colon: false,
-            indent,
-            braces_same_line: false,
-        }
-    }
-}
-
-impl<'a> Formatter for HjsonFormatter<'a> {
-    fn open<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
-    where
-        W: io::Write,
-    {
-        if self.current_indent > 0 && !self.current_is_array && !self.braces_same_line {
-            self.newline(writer, 0)?;
-        } else {
-            self.start_value(writer)?;
-        }
-        self.current_indent += 1;
-        self.stack.push(self.current_is_array);
-        self.current_is_array = ch == b'[';
-        writer.write_all(&[ch]).map_err(From::from)
-    }
-
-    fn comma<W>(&mut self, writer: &mut W, _: bool) -> Result<()>
-    where
-        W: io::Write,
-    {
-        writer.write_all(b"\n")?;
-        indent(writer, self.current_indent, self.indent)
-    }
-
-    fn colon<W>(&mut self, writer: &mut W) -> Result<()>
-    where
-        W: io::Write,
-    {
-        self.at_colon = !self.braces_same_line;
-        writer
-            .write_all(if self.braces_same_line { b": " } else { b":" })
-            .map_err(From::from)
-    }
-
-    fn close<W>(&mut self, writer: &mut W, ch: u8) -> Result<()>
-    where
-        W: io::Write,
-    {
-        self.current_indent -= 1;
-        self.current_is_array = self.stack.pop().expect("Internal error: json parsing");
-        writer.write_all(b"\n")?;
-        indent(writer, self.current_indent, self.indent)?;
-        writer.write_all(&[ch]).map_err(From::from)
-    }
-
-    fn newline<W>(&mut self, writer: &mut W, add_indent: i32) -> Result<()>
-    where
-        W: io::Write,
-    {
-        self.at_colon = false;
-        writer.write_all(b"\n")?;
-        let ii = self.current_indent as i32 + add_indent;
-        indent(writer, if ii < 0 { 0 } else { ii as usize }, self.indent)
-    }
-
-    fn start_value<W>(&mut self, writer: &mut W) -> Result<()>
-    where
-        W: io::Write,
-    {
-        if self.at_colon {
-            self.at_colon = false;
-            writer.write_all(b" ")?
-        }
-        Ok(())
-    }
-}
-
-/// Serializes and escapes a `&[u8]` into a Hjson string.
-#[inline]
-pub fn escape_bytes<W>(wr: &mut W, bytes: &[u8]) -> Result<()>
-where
-    W: io::Write,
-{
-    wr.write_all(b"\"")?;
-
-    let mut start = 0;
-
-    for (i, byte) in bytes.iter().enumerate() {
-        let escaped = match *byte {
-            b'"' => b"\\\"",
-            b'\\' => b"\\\\",
-            b'\x08' => b"\\b",
-            b'\x0c' => b"\\f",
-            b'\n' => b"\\n",
-            b'\r' => b"\\r",
-            b'\t' => b"\\t",
-            _ => {
-                continue;
-            }
-        };
-
-        if start < i {
-            wr.write_all(&bytes[start..i])?;
-        }
-
-        wr.write_all(escaped)?;
-
-        start = i + 1;
-    }
-
-    if start != bytes.len() {
-        wr.write_all(&bytes[start..])?;
-    }
-
-    wr.write_all(b"\"")?;
-    Ok(())
-}
-
-/// Serializes and escapes a `&str` into a Hjson string.
-#[inline]
-pub fn quote_str<W, F>(wr: &mut W, formatter: &mut F, value: &str) -> Result<()>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    lazy_static! {
-        // NEEDS_ESCAPE tests if the string can be written without escapes
-        static ref NEEDS_ESCAPE: Regex = Regex::new("[\\\\\"\x00-\x1f\x7f-\u{9f}\u{00ad}\u{0600}-\u{0604}\u{070f}\u{17b4}\u{17b5}\u{200c}-\u{200f}\u{2028}-\u{202f}\u{2060}-\u{206f}\u{feff}\u{fff0}-\u{ffff}]").expect("Internal error: json parsing");
-        // NEEDS_QUOTES tests if the string can be written as a quoteless string (includes needsEscape but without \\ and \")
-        static ref NEEDS_QUOTES: Regex = Regex::new("^\\s|^\"|^'''|^#|^/\\*|^//|^\\{|^\\}|^\\[|^\\]|^:|^,|\\s$|[\x00-\x1f\x7f-\u{9f}\u{00ad}\u{0600}-\u{0604}\u{070f}\u{17b4}\u{17b5}\u{200c}-\u{200f}\u{2028}-\u{202f}\u{2060}-\u{206f}\u{feff}\u{fff0}-\u{ffff}]").expect("Internal error: json parsing");
-        // NEEDS_ESCAPEML tests if the string can be written as a multiline string (includes needsEscape but without \n, \r, \\ and \")
-        static ref NEEDS_ESCAPEML: Regex = Regex::new("'''|[\x00-\x09\x0b\x0c\x0e-\x1f\x7f-\u{9f}\u{00ad}\u{0600}-\u{0604}\u{070f}\u{17b4}\u{17b5}\u{200c}-\u{200f}\u{2028}-\u{202f}\u{2060}-\u{206f}\u{feff}\u{fff0}-\u{ffff}]").expect("Internal error: json parsing");
-        // starts with a keyword and optionally is followed by a comment
-        static ref STARTS_WITH_KEYWORD: Regex = Regex::new(r#"^(true|false|null)\s*((,|\]|\}|#|//|/\*).*)?$"#).expect("Internal error: json parsing");
-    }
-
-    if value.is_empty() {
-        formatter.start_value(wr)?;
-        return escape_bytes(wr, value.as_bytes());
-    }
-
-    // Check if we can insert this string without quotes
-    // see hjson syntax (must not parse as true, false, null or number)
-
-    let mut pn = ParseNumber::new(value.bytes());
-    let is_number = pn.parse(true).is_ok();
-
-    if is_number || NEEDS_QUOTES.is_match(value) || STARTS_WITH_KEYWORD.is_match(value) {
-        // First check if the string can be expressed in multiline format or
-        // we must replace the offending characters with safe escape sequences.
-
-        if NEEDS_ESCAPE.is_match(value) && !NEEDS_ESCAPEML.is_match(value)
-        /* && !isRootObject */
-        {
-            ml_str(wr, formatter, value)
-        } else {
-            formatter.start_value(wr)?;
-            escape_bytes(wr, value.as_bytes())
-        }
-    } else {
-        // without quotes
-        formatter.start_value(wr)?;
-        wr.write_all(value.as_bytes()).map_err(From::from)
-    }
-}
-
-/// Serializes and escapes a `&str` into a multiline Hjson string.
-pub fn ml_str<W, F>(wr: &mut W, formatter: &mut F, value: &str) -> Result<()>
-where
-    W: io::Write,
-    F: Formatter,
-{
-    // wrap the string into the ''' (multiline) format
-
-    let a: Vec<&str> = value.split('\n').collect();
-
-    if a.len() == 1 {
-        // The string contains only a single line. We still use the multiline
-        // format as it avoids escaping the \ character (e.g. when used in a
-        // regex).
-        formatter.start_value(wr)?;
-        wr.write_all(b"'''")?;
-        wr.write_all(a[0].as_bytes())?;
-        wr.write_all(b"'''")?
-    } else {
-        formatter.newline(wr, 1)?;
-        wr.write_all(b"'''")?;
-        for line in a {
-            formatter.newline(wr, if !line.is_empty() { 1 } else { -999 })?;
-            wr.write_all(line.as_bytes())?;
-        }
-        formatter.newline(wr, 1)?;
-        wr.write_all(b"'''")?;
-    }
-    Ok(())
-}
-
-/// Serializes and escapes a `&str` into a Hjson key.
-#[inline]
-pub fn escape_key<W>(wr: &mut W, value: &str) -> Result<()>
-where
-    W: io::Write,
-{
-    lazy_static! {
-        static ref NEEDS_ESCAPE_NAME: Regex =
-            Regex::new(r#"[,\{\[\}\]\s:#"]|//|/\*|'''|^$"#).expect("Internal error: json parsing");
-    }
-
-    // Check if we can insert this name without quotes
-    if NEEDS_ESCAPE_NAME.is_match(value) {
-        escape_bytes(wr, value.as_bytes()).map_err(From::from)
-    } else {
-        wr.write_all(value.as_bytes()).map_err(From::from)
-    }
-}
-
-#[inline]
-fn escape_char<W>(wr: &mut W, value: char) -> Result<()>
-where
-    W: io::Write,
-{
-    let mut scratch = [0_u8; 4];
-    escape_bytes(wr, value.encode_utf8(&mut scratch).as_bytes())
-}
-
-fn fmt_f32_or_null<W>(wr: &mut W, value: f32) -> Result<()>
-where
-    W: io::Write,
-{
-    match value.classify() {
-        FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null")?,
-        _ => wr.write_all(fmt_small(value).as_bytes())?,
-    }
-
-    Ok(())
-}
-
-fn fmt_f64_or_null<W>(wr: &mut W, value: f64) -> Result<()>
-where
-    W: io::Write,
-{
-    match value.classify() {
-        FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null")?,
-        _ => wr.write_all(fmt_small(value).as_bytes())?,
-    }
-
-    Ok(())
-}
-
-fn indent<W>(wr: &mut W, n: usize, s: &[u8]) -> Result<()>
-where
-    W: io::Write,
-{
-    for _ in 0..n {
-        wr.write_all(s)?;
-    }
-
-    Ok(())
-}
-
-// format similar to es6
-fn fmt_small<N>(value: N) -> String
-where
-    N: Display + LowerExp,
-{
-    let f1 = value.to_string();
-    let f2 = format!("{:e}", value);
-    if f1.len() <= f2.len() + 1 {
-        f1
-    } else if !f2.contains("e-") {
-        f2.replace("e", "e+")
-    } else {
-        f2
-    }
-}
-
-/// Encode the specified struct into a Hjson `[u8]` writer.
-#[inline]
-pub fn to_writer<W, T>(writer: &mut W, value: &T) -> Result<()>
-where
-    W: io::Write,
-    T: ser::Serialize,
-{
-    let mut ser = Serializer::new(writer);
-    value.serialize(&mut ser)?;
-    Ok(())
-}
-
-/// Encode the specified struct into a Hjson `[u8]` buffer.
-#[inline]
-pub fn to_vec<T>(value: &T) -> Result<Vec<u8>>
-where
-    T: ser::Serialize,
-{
-    // We are writing to a Vec, which doesn't fail. So we can ignore
-    // the error.
-    let mut writer = Vec::with_capacity(128);
-    to_writer(&mut writer, value)?;
-    Ok(writer)
-}
-
-/// Encode the specified struct into a Hjson `String` buffer.
-#[inline]
-pub fn to_string<T>(value: &T) -> Result<String>
-where
-    T: ser::Serialize,
-{
-    let vec = to_vec(value)?;
-    let string = String::from_utf8(vec)?;
-    Ok(string)
-}
diff --git a/old_nushell/crates/nu-json/src/util.rs b/old_nushell/crates/nu-json/src/util.rs
deleted file mode 100644
index 5f650b109..000000000
--- a/old_nushell/crates/nu-json/src/util.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-use std::io;
-use std::str;
-
-use super::error::{Error, ErrorCode, Result};
-
-pub struct StringReader<Iter: Iterator<Item = u8>> {
-    iter: Iter,
-    line: usize,
-    col: usize,
-    ch: Vec<u8>,
-}
-
-impl<Iter> StringReader<Iter>
-where
-    Iter: Iterator<Item = u8>,
-{
-    #[inline]
-    pub fn new(iter: Iter) -> Self {
-        StringReader {
-            iter,
-            line: 1,
-            col: 0,
-            ch: Vec::new(),
-        }
-    }
-
-    fn next(&mut self) -> Option<io::Result<u8>> {
-        match self.iter.next() {
-            None => None,
-            Some(b'\n') => {
-                self.line += 1;
-                self.col = 0;
-                Some(Ok(b'\n'))
-            }
-            Some(c) => {
-                self.col += 1;
-                Some(Ok(c))
-            }
-        }
-    }
-
-    pub fn pos(&mut self) -> (usize, usize) {
-        (self.line, self.col)
-    }
-
-    pub fn eof(&mut self) -> Result<bool> {
-        Ok(self.peek()?.is_none())
-    }
-
-    pub fn peek_next(&mut self, idx: usize) -> Result<Option<u8>> {
-        while self.ch.len() <= idx {
-            match self.next() {
-                Some(Err(err)) => return Err(Error::Io(err)),
-                Some(Ok(ch)) => self.ch.push(ch),
-                None => return Ok(None),
-            }
-        }
-        Ok(Some(self.ch[idx]))
-    }
-
-    // pub fn peek_next_or_null(&mut self, idx: usize) -> Result<u8> {
-    //     Ok(try!(self.peek_next(idx)).unwrap_or(b'\x00'))
-    // }
-
-    pub fn peek(&mut self) -> Result<Option<u8>> {
-        self.peek_next(0)
-    }
-
-    pub fn peek_or_null(&mut self) -> Result<u8> {
-        Ok(self.peek()?.unwrap_or(b'\x00'))
-    }
-
-    pub fn eat_char(&mut self) -> u8 {
-        self.ch.remove(0)
-    }
-
-    pub fn uneat_char(&mut self, ch: u8) {
-        self.ch.insert(0, ch);
-    }
-
-    pub fn next_char(&mut self) -> Result<Option<u8>> {
-        match self.ch.first() {
-            Some(&ch) => {
-                self.eat_char();
-                Ok(Some(ch))
-            }
-            None => match self.next() {
-                Some(Err(err)) => Err(Error::Io(err)),
-                Some(Ok(ch)) => Ok(Some(ch)),
-                None => Ok(None),
-            },
-        }
-    }
-
-    pub fn next_char_or_null(&mut self) -> Result<u8> {
-        Ok(self.next_char()?.unwrap_or(b'\x00'))
-    }
-
-    fn eat_line(&mut self) -> Result<()> {
-        loop {
-            match self.peek()? {
-                Some(b'\n') | None => return Ok(()),
-                _ => {}
-            }
-            self.eat_char();
-        }
-    }
-
-    pub fn parse_whitespace(&mut self) -> Result<()> {
-        loop {
-            match self.peek_or_null()? {
-                b' ' | b'\n' | b'\t' | b'\r' => {
-                    self.eat_char();
-                }
-                b'#' => self.eat_line()?,
-                b'/' => {
-                    match self.peek_next(1)? {
-                        Some(b'/') => self.eat_line()?,
-                        Some(b'*') => {
-                            self.eat_char();
-                            self.eat_char();
-                            while !(self.peek()?.unwrap_or(b'*') == b'*'
-                                && self.peek_next(1)?.unwrap_or(b'/') == b'/')
-                            {
-                                self.eat_char();
-                            }
-                            self.eat_char();
-                            self.eat_char();
-                        }
-                        Some(_) => {
-                            self.eat_char();
-                        }
-                        None => return Err(self.error(ErrorCode::TrailingCharacters)), //todo
-                    }
-                }
-                _ => {
-                    return Ok(());
-                }
-            }
-        }
-    }
-
-    pub fn error(&mut self, reason: ErrorCode) -> Error {
-        Error::Syntax(reason, self.line, self.col)
-    }
-}
-
-pub enum Number {
-    I64(i64),
-    U64(u64),
-    F64(f64),
-}
-
-pub struct ParseNumber<Iter: Iterator<Item = u8>> {
-    rdr: StringReader<Iter>,
-    result: Vec<u8>,
-}
-
-// macro_rules! try_or_invalid {
-//     ($e:expr) => {
-//         match $e {
-//             Some(v) => v,
-//             None => { return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0)); }
-//         }
-//     }
-// }
-
-impl<Iter: Iterator<Item = u8>> ParseNumber<Iter> {
-    #[inline]
-    pub fn new(iter: Iter) -> Self {
-        ParseNumber {
-            rdr: StringReader::new(iter),
-            result: Vec::new(),
-        }
-    }
-
-    pub fn parse(&mut self, stop_at_next: bool) -> Result<Number> {
-        match self.try_parse() {
-            Ok(()) => {
-                self.rdr.parse_whitespace()?;
-
-                let mut ch = self.rdr.next_char_or_null()?;
-
-                if stop_at_next {
-                    let ch2 = self.rdr.peek_or_null()?;
-                    // end scan if we find a punctuator character like ,}] or a comment
-                    if ch == b','
-                        || ch == b'}'
-                        || ch == b']'
-                        || ch == b'#'
-                        || ch == b'/' && (ch2 == b'/' || ch2 == b'*')
-                    {
-                        ch = b'\x00';
-                    }
-                }
-
-                match ch {
-                    b'\x00' => {
-                        let res =
-                            str::from_utf8(&self.result).expect("Internal error: json parsing");
-
-                        let mut is_float = false;
-                        for ch in res.chars() {
-                            if ch == '.' || ch == 'e' || ch == 'E' {
-                                is_float = true;
-                                break;
-                            }
-                        }
-
-                        if is_float {
-                            Ok(Number::F64(
-                                res.parse::<f64>().expect("Internal error: json parsing"),
-                            ))
-                        } else if res.starts_with('-') {
-                            Ok(Number::I64(
-                                res.parse::<i64>().expect("Internal error: json parsing"),
-                            ))
-                        } else {
-                            Ok(Number::U64(
-                                res.parse::<u64>().expect("Internal error: json parsing"),
-                            ))
-                        }
-                    }
-                    _ => Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0)),
-                }
-            }
-            Err(e) => Err(e),
-        }
-    }
-
-    fn try_parse(&mut self) -> Result<()> {
-        if self.rdr.peek_or_null()? == b'-' {
-            self.result.push(self.rdr.eat_char());
-        }
-
-        let mut has_value = false;
-
-        if self.rdr.peek_or_null()? == b'0' {
-            self.result.push(self.rdr.eat_char());
-            has_value = true;
-
-            // There can be only one leading '0'.
-            if let b'0'..=b'9' = self.rdr.peek_or_null()? {
-                return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-            }
-        }
-
-        loop {
-            match self.rdr.peek_or_null()? {
-                b'0'..=b'9' => {
-                    self.result.push(self.rdr.eat_char());
-                    has_value = true;
-                }
-                b'.' => {
-                    if !has_value {
-                        return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-                    }
-                    self.rdr.eat_char();
-                    return self.try_decimal();
-                }
-                b'e' | b'E' => {
-                    if !has_value {
-                        return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-                    }
-                    self.rdr.eat_char();
-                    return self.try_exponent();
-                }
-                _ => {
-                    if !has_value {
-                        return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-                    }
-                    return Ok(());
-                }
-            }
-        }
-    }
-
-    fn try_decimal(&mut self) -> Result<()> {
-        self.result.push(b'.');
-
-        // Make sure a digit follows the decimal place.
-        match self.rdr.next_char_or_null()? {
-            c @ b'0'..=b'9' => {
-                self.result.push(c);
-            }
-            _ => {
-                return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-            }
-        };
-
-        while let b'0'..=b'9' = self.rdr.peek_or_null()? {
-            self.result.push(self.rdr.eat_char());
-        }
-
-        match self.rdr.peek_or_null()? {
-            b'e' | b'E' => {
-                self.rdr.eat_char();
-                self.try_exponent()
-            }
-            _ => Ok(()),
-        }
-    }
-
-    fn try_exponent(&mut self) -> Result<()> {
-        self.result.push(b'e');
-
-        match self.rdr.peek_or_null()? {
-            b'+' => {
-                self.result.push(self.rdr.eat_char());
-            }
-            b'-' => {
-                self.result.push(self.rdr.eat_char());
-            }
-            _ => {}
-        };
-
-        // Make sure a digit follows the exponent place.
-        match self.rdr.next_char_or_null()? {
-            c @ b'0'..=b'9' => {
-                self.result.push(c);
-            }
-            _ => {
-                return Err(Error::Syntax(ErrorCode::InvalidNumber, 0, 0));
-            }
-        };
-
-        while let b'0'..=b'9' = self.rdr.peek_or_null()? {
-            self.result.push(self.rdr.eat_char());
-        }
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-json/src/value.rs b/old_nushell/crates/nu-json/src/value.rs
deleted file mode 100644
index 0d3533f9c..000000000
--- a/old_nushell/crates/nu-json/src/value.rs
+++ /dev/null
@@ -1,1158 +0,0 @@
-#[cfg(not(feature = "preserve_order"))]
-use std::collections::{btree_map, BTreeMap};
-
-#[cfg(feature = "preserve_order")]
-use linked_hash_map::{self, LinkedHashMap};
-
-use std::fmt;
-use std::io;
-use std::str;
-use std::vec;
-
-use num_traits::NumCast;
-
-use serde::de;
-use serde::ser;
-
-use crate::error::{Error, ErrorCode};
-
-type Result<T, E = Error> = std::result::Result<T, E>;
-
-/// Represents a key/value type.
-#[cfg(not(feature = "preserve_order"))]
-pub type Map<K, V> = BTreeMap<K, V>;
-/// Represents a key/value type.
-#[cfg(feature = "preserve_order")]
-pub type Map<K, V> = LinkedHashMap<K, V>;
-
-/// Represents the `IntoIter` type.
-#[cfg(not(feature = "preserve_order"))]
-pub type MapIntoIter<K, V> = btree_map::IntoIter<K, V>;
-/// Represents the IntoIter type.
-#[cfg(feature = "preserve_order")]
-pub type MapIntoIter<K, V> = linked_hash_map::IntoIter<K, V>;
-
-fn map_with_capacity<K: std::hash::Hash + Eq, V>(size: Option<usize>) -> Map<K, V> {
-    #[cfg(not(feature = "preserve_order"))]
-    {
-        let _ = size;
-        BTreeMap::new()
-    }
-
-    #[cfg(feature = "preserve_order")]
-    {
-        LinkedHashMap::with_capacity(size.unwrap_or(0))
-    }
-}
-
-/// Represents a Hjson/JSON value
-#[derive(Clone, PartialEq)]
-pub enum Value {
-    /// Represents a JSON null value
-    Null,
-
-    /// Represents a JSON Boolean
-    Bool(bool),
-
-    /// Represents a JSON signed integer
-    I64(i64),
-
-    /// Represents a JSON unsigned integer
-    U64(u64),
-
-    /// Represents a JSON floating point number
-    F64(f64),
-
-    /// Represents a JSON string
-    String(String),
-
-    /// Represents a JSON array
-    Array(Vec<Value>),
-
-    /// Represents a JSON object
-    Object(Map<String, Value>),
-}
-
-impl Value {
-    /// If the `Value` is an Object, returns the value associated with the provided key.
-    /// Otherwise, returns None.
-    pub fn find<'a>(&'a self, key: &str) -> Option<&'a Value> {
-        match *self {
-            Value::Object(ref map) => map.get(key),
-            _ => None,
-        }
-    }
-
-    /// Attempts to get a nested Value Object for each key in `keys`.
-    /// If any key is found not to exist, find_path will return None.
-    /// Otherwise, it will return the `Value` associated with the final key.
-    pub fn find_path<'a>(&'a self, keys: &[&str]) -> Option<&'a Value> {
-        let mut target = self;
-        for key in keys {
-            match target.find(key) {
-                Some(t) => {
-                    target = t;
-                }
-                None => return None,
-            }
-        }
-        Some(target)
-    }
-
-    /// Looks up a value by a JSON Pointer.
-    ///
-    /// JSON Pointer defines a string syntax for identifying a specific value
-    /// within a JavaScript Object Notation (JSON) document.
-    ///
-    /// A Pointer is a Unicode string with the reference tokens separated by `/`.
-    /// Inside tokens `/` is replaced by `~1` and `~` is replaced by `~0`. The
-    /// addressed value is returned and if there is no such value `None` is
-    /// returned.
-    ///
-    /// For more information read [RFC6901](https://tools.ietf.org/html/rfc6901).
-    pub fn pointer<'a>(&'a self, pointer: &str) -> Option<&'a Value> {
-        fn parse_index(s: &str) -> Option<usize> {
-            if s.starts_with('+') || (s.starts_with('0') && s.len() != 1) {
-                return None;
-            }
-            s.parse().ok()
-        }
-        if pointer.is_empty() {
-            return Some(self);
-        }
-        if !pointer.starts_with('/') {
-            return None;
-        }
-        let mut target = self;
-        for escaped_token in pointer.split('/').skip(1) {
-            let token = escaped_token.replace("~1", "/").replace("~0", "~");
-            let target_opt = match *target {
-                Value::Object(ref map) => map.get(&token[..]),
-                Value::Array(ref list) => parse_index(&token[..]).and_then(|x| list.get(x)),
-                _ => return None,
-            };
-            if let Some(t) = target_opt {
-                target = t;
-            } else {
-                return None;
-            }
-        }
-        Some(target)
-    }
-
-    /// If the `Value` is an Object, performs a depth-first search until
-    /// a value associated with the provided key is found. If no value is found
-    /// or the `Value` is not an Object, returns None.
-    pub fn search<'a>(&'a self, key: &str) -> Option<&'a Value> {
-        match self {
-            Value::Object(map) => map
-                .get(key)
-                .or_else(|| map.values().find_map(|v| v.search(key))),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is an Object. Returns false otherwise.
-    pub fn is_object(&self) -> bool {
-        self.as_object().is_some()
-    }
-
-    /// If the `Value` is an Object, returns the associated Map.
-    /// Returns None otherwise.
-    pub fn as_object(&self) -> Option<&Map<String, Value>> {
-        match *self {
-            Value::Object(ref map) => Some(map),
-            _ => None,
-        }
-    }
-
-    /// If the `Value` is an Object, returns the associated mutable Map.
-    /// Returns None otherwise.
-    pub fn as_object_mut(&mut self) -> Option<&mut Map<String, Value>> {
-        match *self {
-            Value::Object(ref mut map) => Some(map),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is an Array. Returns false otherwise.
-    pub fn is_array(&self) -> bool {
-        self.as_array().is_some()
-    }
-
-    /// If the `Value` is an Array, returns the associated vector.
-    /// Returns None otherwise.
-    pub fn as_array(&self) -> Option<&Vec<Value>> {
-        match self {
-            Value::Array(array) => Some(array),
-            _ => None,
-        }
-    }
-
-    /// If the `Value` is an Array, returns the associated mutable vector.
-    /// Returns None otherwise.
-    pub fn as_array_mut(&mut self) -> Option<&mut Vec<Value>> {
-        match self {
-            Value::Array(list) => Some(list),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is a String. Returns false otherwise.
-    pub fn is_string(&self) -> bool {
-        self.as_str().is_some()
-    }
-
-    /// If the `Value` is a String, returns the associated str.
-    /// Returns None otherwise.
-    pub fn as_str(&self) -> Option<&str> {
-        match self {
-            Value::String(s) => Some(s),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is a Number. Returns false otherwise.
-    pub fn is_number(&self) -> bool {
-        matches!(self, Value::I64(_) | Value::U64(_) | Value::F64(_))
-    }
-
-    /// Returns true if the `Value` is a i64. Returns false otherwise.
-    pub fn is_i64(&self) -> bool {
-        matches!(self, Value::I64(_))
-    }
-
-    /// Returns true if the `Value` is a u64. Returns false otherwise.
-    pub fn is_u64(&self) -> bool {
-        matches!(self, Value::U64(_))
-    }
-
-    /// Returns true if the `Value` is a f64. Returns false otherwise.
-    pub fn is_f64(&self) -> bool {
-        matches!(self, Value::F64(_))
-    }
-
-    /// If the `Value` is a number, return or cast it to a i64.
-    /// Returns None otherwise.
-    pub fn as_i64(&self) -> Option<i64> {
-        match *self {
-            Value::I64(n) => Some(n),
-            Value::U64(n) => NumCast::from(n),
-            _ => None,
-        }
-    }
-
-    /// If the `Value` is a number, return or cast it to a u64.
-    /// Returns None otherwise.
-    pub fn as_u64(&self) -> Option<u64> {
-        match *self {
-            Value::I64(n) => NumCast::from(n),
-            Value::U64(n) => Some(n),
-            _ => None,
-        }
-    }
-
-    /// If the `Value` is a number, return or cast it to a f64.
-    /// Returns None otherwise.
-    pub fn as_f64(&self) -> Option<f64> {
-        match *self {
-            Value::I64(n) => NumCast::from(n),
-            Value::U64(n) => NumCast::from(n),
-            Value::F64(n) => Some(n),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is a Boolean. Returns false otherwise.
-    pub fn is_boolean(&self) -> bool {
-        self.as_bool().is_some()
-    }
-
-    /// If the `Value` is a Boolean, returns the associated bool.
-    /// Returns None otherwise.
-    pub fn as_bool(&self) -> Option<bool> {
-        match *self {
-            Value::Bool(b) => Some(b),
-            _ => None,
-        }
-    }
-
-    /// Returns true if the `Value` is a Null. Returns false otherwise.
-    pub fn is_null(&self) -> bool {
-        self.as_null().is_some()
-    }
-
-    /// If the `Value` is a Null, returns ().
-    /// Returns None otherwise.
-    pub fn as_null(&self) -> Option<()> {
-        match self {
-            Value::Null => Some(()),
-            _ => None,
-        }
-    }
-
-    fn as_unexpected(&self) -> de::Unexpected<'_> {
-        match *self {
-            Value::Null => de::Unexpected::Unit,
-            Value::Bool(v) => de::Unexpected::Bool(v),
-            Value::I64(v) => de::Unexpected::Signed(v),
-            Value::U64(v) => de::Unexpected::Unsigned(v),
-            Value::F64(v) => de::Unexpected::Float(v),
-            Value::String(ref v) => de::Unexpected::Str(v),
-            Value::Array(_) => de::Unexpected::Seq,
-            Value::Object(_) => de::Unexpected::Map,
-        }
-    }
-}
-
-impl ser::Serialize for Value {
-    #[inline]
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: ser::Serializer,
-    {
-        match *self {
-            Value::Null => serializer.serialize_unit(),
-            Value::Bool(v) => serializer.serialize_bool(v),
-            Value::I64(v) => serializer.serialize_i64(v),
-            Value::U64(v) => serializer.serialize_u64(v),
-            Value::F64(v) => serializer.serialize_f64(v),
-            Value::String(ref v) => serializer.serialize_str(v),
-            Value::Array(ref v) => v.serialize(serializer),
-            Value::Object(ref v) => v.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> de::Deserialize<'de> for Value {
-    #[inline]
-    fn deserialize<D>(deserializer: D) -> Result<Value, D::Error>
-    where
-        D: de::Deserializer<'de>,
-    {
-        struct ValueVisitor;
-
-        impl<'de> de::Visitor<'de> for ValueVisitor {
-            type Value = Value;
-
-            fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.write_str("a json value")
-            }
-
-            #[inline]
-            fn visit_bool<E>(self, value: bool) -> Result<Value, E> {
-                Ok(Value::Bool(value))
-            }
-
-            #[inline]
-            fn visit_i64<E>(self, value: i64) -> Result<Value, E> {
-                if value < 0 {
-                    Ok(Value::I64(value))
-                } else {
-                    Ok(Value::U64(value as u64))
-                }
-            }
-
-            #[inline]
-            fn visit_u64<E>(self, value: u64) -> Result<Value, E> {
-                Ok(Value::U64(value))
-            }
-
-            #[inline]
-            fn visit_f64<E>(self, value: f64) -> Result<Value, E> {
-                Ok(Value::F64(value))
-            }
-
-            #[inline]
-            fn visit_str<E>(self, value: &str) -> Result<Value, E>
-            where
-                E: de::Error,
-            {
-                self.visit_string(String::from(value))
-            }
-
-            #[inline]
-            fn visit_string<E>(self, value: String) -> Result<Value, E> {
-                Ok(Value::String(value))
-            }
-
-            #[inline]
-            fn visit_none<E>(self) -> Result<Value, E> {
-                Ok(Value::Null)
-            }
-
-            #[inline]
-            fn visit_some<D>(self, deserializer: D) -> Result<Value, D::Error>
-            where
-                D: de::Deserializer<'de>,
-            {
-                de::Deserialize::deserialize(deserializer)
-            }
-
-            #[inline]
-            fn visit_unit<E>(self) -> Result<Value, E> {
-                Ok(Value::Null)
-            }
-
-            #[inline]
-            fn visit_seq<A>(self, mut seq: A) -> Result<Value, A::Error>
-            where
-                A: de::SeqAccess<'de>,
-            {
-                let mut v = match seq.size_hint() {
-                    Some(cap) => Vec::with_capacity(cap),
-                    None => Vec::new(),
-                };
-
-                while let Some(el) = seq.next_element()? {
-                    v.push(el)
-                }
-
-                Ok(Value::Array(v))
-            }
-
-            #[inline]
-            fn visit_map<A>(self, mut map: A) -> Result<Value, A::Error>
-            where
-                A: de::MapAccess<'de>,
-            {
-                let mut values = map_with_capacity(map.size_hint());
-                while let Some((k, v)) = map.next_entry()? {
-                    values.insert(k, v);
-                }
-                Ok(Value::Object(values))
-            }
-        }
-
-        deserializer.deserialize_any(ValueVisitor)
-    }
-}
-
-struct WriterFormatter<'a, 'b: 'a> {
-    inner: &'a mut fmt::Formatter<'b>,
-}
-
-impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        fn io_error<E>(_: E) -> io::Error {
-            // Value does not matter because fmt::Debug and fmt::Display impls
-            // below just map it to fmt::Error
-            io::Error::new(io::ErrorKind::Other, "fmt error")
-        }
-        let s = str::from_utf8(buf).map_err(io_error)?;
-        self.inner.write_str(s).map_err(io_error)?;
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl fmt::Debug for Value {
-    /// Serializes a Hjson value into a string
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut wr = WriterFormatter { inner: f };
-        super::ser::to_writer(&mut wr, self).map_err(|_| fmt::Error)
-    }
-}
-
-impl fmt::Display for Value {
-    /// Serializes a Hjson value into a string
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mut wr = WriterFormatter { inner: f };
-        super::ser::to_writer(&mut wr, self).map_err(|_| fmt::Error)
-    }
-}
-
-impl str::FromStr for Value {
-    type Err = Error;
-    fn from_str(s: &str) -> Result<Value> {
-        super::de::from_str(s)
-    }
-}
-
-/// Create a `serde::Serializer` that serializes a `Serialize`e into a `Value`.
-#[derive(Default)]
-pub struct Serializer;
-
-impl ser::Serializer for Serializer {
-    type Ok = Value;
-    type Error = Error;
-
-    type SerializeSeq = SerializeVec;
-    type SerializeTuple = SerializeVec;
-    type SerializeTupleStruct = SerializeVec;
-    type SerializeTupleVariant = SerializeTupleVariant;
-    type SerializeMap = SerializeMap;
-    type SerializeStruct = SerializeMap;
-    type SerializeStructVariant = SerializeStructVariant;
-
-    #[inline]
-    fn serialize_bool(self, value: bool) -> Result<Value> {
-        Ok(Value::Bool(value))
-    }
-
-    #[inline]
-    fn serialize_i8(self, value: i8) -> Result<Value> {
-        self.serialize_i64(value as i64)
-    }
-
-    #[inline]
-    fn serialize_i16(self, value: i16) -> Result<Value> {
-        self.serialize_i64(value as i64)
-    }
-
-    #[inline]
-    fn serialize_i32(self, value: i32) -> Result<Value> {
-        self.serialize_i64(value as i64)
-    }
-
-    fn serialize_i64(self, value: i64) -> Result<Value> {
-        let v = if value < 0 {
-            Value::I64(value)
-        } else {
-            Value::U64(value as u64)
-        };
-        Ok(v)
-    }
-
-    #[inline]
-    fn serialize_u8(self, value: u8) -> Result<Value> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u16(self, value: u16) -> Result<Value> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u32(self, value: u32) -> Result<Value> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u64(self, value: u64) -> Result<Value> {
-        Ok(Value::U64(value))
-    }
-
-    #[inline]
-    fn serialize_f32(self, value: f32) -> Result<Value> {
-        self.serialize_f64(value as f64)
-    }
-
-    #[inline]
-    fn serialize_f64(self, value: f64) -> Result<Value> {
-        Ok(Value::F64(value))
-    }
-
-    #[inline]
-    fn serialize_char(self, value: char) -> Result<Value> {
-        let mut s = String::new();
-        s.push(value);
-        self.serialize_str(&s)
-    }
-
-    #[inline]
-    fn serialize_str(self, value: &str) -> Result<Value> {
-        Ok(Value::String(String::from(value)))
-    }
-
-    fn serialize_bytes(self, value: &[u8]) -> Result<Value> {
-        let mut state = self.serialize_seq(Some(value.len()))?;
-        for byte in value {
-            ser::SerializeSeq::serialize_element(&mut state, byte)?;
-        }
-        ser::SerializeSeq::end(state)
-    }
-
-    #[inline]
-    fn serialize_unit(self) -> Result<Value> {
-        Ok(Value::Null)
-    }
-
-    #[inline]
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<Value> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-    ) -> Result<Value> {
-        self.serialize_str(variant)
-    }
-
-    #[inline]
-    fn serialize_newtype_struct<T>(self, _name: &'static str, value: &T) -> Result<Value>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_newtype_variant<T>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        value: &T,
-    ) -> Result<Value>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        let mut values = Map::new();
-        values.insert(String::from(variant), to_value(&value)?);
-        Ok(Value::Object(values))
-    }
-
-    #[inline]
-    fn serialize_none(self) -> Result<Value> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_some<V>(self, value: &V) -> Result<Value>
-    where
-        V: ?Sized + ser::Serialize,
-    {
-        value.serialize(self)
-    }
-
-    #[inline]
-    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(SerializeVec {
-            vec: Vec::with_capacity(len.unwrap_or(0)),
-        })
-    }
-
-    #[inline]
-    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {
-        self.serialize_seq(Some(len))
-    }
-
-    #[inline]
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
-        self.serialize_seq(Some(len))
-    }
-
-    #[inline]
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
-        Ok(SerializeTupleVariant {
-            name: variant,
-            vec: Vec::with_capacity(len),
-        })
-    }
-
-    #[inline]
-    fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(SerializeMap {
-            map: map_with_capacity(len),
-            next_key: None,
-        })
-    }
-
-    #[inline]
-    fn serialize_struct(
-        self,
-        _name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        self.serialize_map(Some(len))
-    }
-
-    #[inline]
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Ok(SerializeStructVariant {
-            name: variant,
-            map: map_with_capacity(Some(len)),
-        })
-    }
-}
-
-#[doc(hidden)]
-pub struct SerializeVec {
-    vec: Vec<Value>,
-}
-
-#[doc(hidden)]
-pub struct SerializeTupleVariant {
-    name: &'static str,
-    vec: Vec<Value>,
-}
-
-#[doc(hidden)]
-pub struct SerializeMap {
-    map: Map<String, Value>,
-    next_key: Option<String>,
-}
-
-#[doc(hidden)]
-pub struct SerializeStructVariant {
-    name: &'static str,
-    map: Map<String, Value>,
-}
-
-impl ser::SerializeSeq for SerializeVec {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_element<T>(&mut self, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        self.vec.push(to_value(&value)?);
-        Ok(())
-    }
-
-    fn end(self) -> Result<Value> {
-        Ok(Value::Array(self.vec))
-    }
-}
-
-impl ser::SerializeTuple for SerializeVec {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_element<T>(&mut self, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<Value> {
-        ser::SerializeSeq::end(self)
-    }
-}
-
-impl ser::SerializeTupleStruct for SerializeVec {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<Value> {
-        ser::SerializeSeq::end(self)
-    }
-}
-
-impl ser::SerializeTupleVariant for SerializeTupleVariant {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        self.vec.push(to_value(&value)?);
-        Ok(())
-    }
-
-    fn end(self) -> Result<Value> {
-        let mut object = Map::new();
-
-        object.insert(self.name.to_owned(), Value::Array(self.vec));
-
-        Ok(Value::Object(object))
-    }
-}
-
-impl ser::SerializeMap for SerializeMap {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_key<T>(&mut self, key: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        match to_value(key)? {
-            Value::String(s) => self.next_key = Some(s),
-            _ => return Err(Error::Syntax(ErrorCode::KeyMustBeAString, 0, 0)),
-        };
-        Ok(())
-    }
-
-    fn serialize_value<T>(&mut self, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        let key = self.next_key.take();
-        // Panic because this indicates a bug in the program rather than an
-        // expected failure.
-        let key = key.expect("serialize_value called before serialize_key");
-        self.map.insert(key, to_value(value)?);
-        Ok(())
-    }
-
-    fn end(self) -> Result<Value> {
-        Ok(Value::Object(self.map))
-    }
-}
-
-impl ser::SerializeStruct for SerializeMap {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        ser::SerializeMap::serialize_entry(self, key, value)
-    }
-
-    fn end(self) -> Result<Value> {
-        ser::SerializeMap::end(self)
-    }
-}
-
-impl ser::SerializeStructVariant for SerializeStructVariant {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<()>
-    where
-        T: ?Sized + ser::Serialize,
-    {
-        self.map.insert(key.to_owned(), to_value(&value)?);
-        Ok(())
-    }
-
-    fn end(self) -> Result<Value> {
-        let mut object = map_with_capacity(Some(1));
-
-        object.insert(self.name.to_owned(), Value::Object(self.map));
-
-        Ok(Value::Object(object))
-    }
-}
-
-impl<'de> de::Deserializer<'de> for Value {
-    type Error = Error;
-
-    #[inline]
-    fn deserialize_any<V>(self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        match self {
-            Value::Null => visitor.visit_unit(),
-            Value::Bool(v) => visitor.visit_bool(v),
-            Value::I64(v) => visitor.visit_i64(v),
-            Value::U64(v) => visitor.visit_u64(v),
-            Value::F64(v) => visitor.visit_f64(v),
-            Value::String(v) => visitor.visit_string(v),
-            Value::Array(v) => visitor.visit_seq(SeqDeserializer {
-                iter: v.into_iter(),
-            }),
-            Value::Object(v) => visitor.visit_map(MapDeserializer {
-                iter: v.into_iter(),
-                value: None,
-            }),
-        }
-    }
-
-    #[inline]
-    fn deserialize_option<V>(self, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        match self {
-            Value::Null => visitor.visit_none(),
-            _ => visitor.visit_some(self),
-        }
-    }
-
-    #[inline]
-    fn deserialize_enum<V>(
-        self,
-        _name: &str,
-        _variants: &'static [&'static str],
-        visitor: V,
-    ) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        let (variant, value) = match self {
-            Value::Object(value) => {
-                let mut iter = value.into_iter();
-                let (variant, value) = match iter.next() {
-                    Some(v) => v,
-                    None => {
-                        return Err(de::Error::invalid_type(
-                            de::Unexpected::Map,
-                            &"map with a single key",
-                        ));
-                    }
-                };
-                // enums are encoded in json as maps with a single key:value pair
-                if iter.next().is_some() {
-                    return Err(de::Error::invalid_type(
-                        de::Unexpected::Map,
-                        &"map with a single key",
-                    ));
-                }
-                (variant, Some(value))
-            }
-            Value::String(variant) => (variant, None),
-            val => {
-                return Err(de::Error::invalid_type(
-                    val.as_unexpected(),
-                    &"string or map",
-                ))
-            }
-        };
-
-        visitor.visit_enum(EnumDeserializer { variant, value })
-    }
-
-    #[inline]
-    fn deserialize_newtype_struct<V>(
-        self,
-        _name: &'static str,
-        visitor: V,
-    ) -> Result<V::Value, Self::Error>
-    where
-        V: de::Visitor<'de>,
-    {
-        visitor.visit_newtype_struct(self)
-    }
-
-    serde::forward_to_deserialize_any! {
-        bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string
-        bytes byte_buf unit unit_struct seq tuple
-        tuple_struct map struct identifier ignored_any
-    }
-}
-
-struct EnumDeserializer {
-    variant: String,
-    value: Option<Value>,
-}
-
-impl<'de> de::EnumAccess<'de> for EnumDeserializer {
-    type Error = Error;
-
-    type Variant = VariantDeserializer;
-
-    fn variant_seed<V>(self, seed: V) -> Result<(V::Value, Self::Variant), Self::Error>
-    where
-        V: de::DeserializeSeed<'de>,
-    {
-        let variant = de::IntoDeserializer::into_deserializer(self.variant);
-        let visitor = VariantDeserializer { val: self.value };
-        seed.deserialize(variant).map(|v| (v, visitor))
-    }
-}
-
-struct VariantDeserializer {
-    val: Option<Value>,
-}
-
-impl<'de, 'a> de::VariantAccess<'de> for VariantDeserializer {
-    type Error = Error;
-
-    fn unit_variant(self) -> Result<()> {
-        match self.val {
-            Some(val) => de::Deserialize::deserialize(val),
-            None => Ok(()),
-        }
-    }
-
-    fn newtype_variant_seed<T>(self, seed: T) -> Result<T::Value>
-    where
-        T: de::DeserializeSeed<'de>,
-    {
-        match self.val {
-            Some(value) => seed.deserialize(value),
-            None => Err(serde::de::Error::invalid_type(
-                de::Unexpected::UnitVariant,
-                &"newtype variant",
-            )),
-        }
-    }
-
-    fn tuple_variant<V>(self, _len: usize, visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        let val = self.val.expect("val is missing");
-        if let Value::Array(fields) = val {
-            visitor.visit_seq(SeqDeserializer {
-                iter: fields.into_iter(),
-            })
-        } else {
-            Err(de::Error::invalid_type(val.as_unexpected(), &visitor))
-        }
-    }
-
-    fn struct_variant<V>(self, _fields: &'static [&'static str], visitor: V) -> Result<V::Value>
-    where
-        V: de::Visitor<'de>,
-    {
-        match self.val {
-            Some(Value::Object(fields)) => visitor.visit_map(MapDeserializer {
-                iter: fields.into_iter(),
-                value: None,
-            }),
-            Some(other) => Err(de::Error::invalid_type(
-                other.as_unexpected(),
-                &"struct variant",
-            )),
-            None => Err(de::Error::invalid_type(
-                de::Unexpected::UnitVariant,
-                &"struct variant",
-            )),
-        }
-    }
-}
-
-struct SeqDeserializer {
-    iter: vec::IntoIter<Value>,
-}
-
-impl<'de> de::SeqAccess<'de> for SeqDeserializer {
-    type Error = Error;
-
-    fn next_element_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>, Self::Error>
-    where
-        T: de::DeserializeSeed<'de>,
-    {
-        match self.iter.next() {
-            Some(value) => Ok(Some(seed.deserialize(value)?)),
-            None => Ok(None),
-        }
-    }
-
-    fn size_hint(&self) -> Option<usize> {
-        match self.iter.size_hint() {
-            (lower, Some(upper)) if lower == upper => Some(upper),
-            _ => None,
-        }
-    }
-}
-
-struct MapDeserializer {
-    iter: MapIntoIter<String, Value>,
-    value: Option<Value>,
-}
-
-impl<'de, 'a> de::MapAccess<'de> for MapDeserializer {
-    type Error = Error;
-
-    fn next_key_seed<K>(&mut self, seed: K) -> Result<Option<K::Value>>
-    where
-        K: de::DeserializeSeed<'de>,
-    {
-        match self.iter.next() {
-            Some((key, value)) => {
-                self.value = Some(value);
-                Ok(Some(seed.deserialize(Value::String(key))?))
-            }
-            None => Ok(None),
-        }
-    }
-
-    fn next_value_seed<V>(&mut self, seed: V) -> Result<V::Value, Self::Error>
-    where
-        V: de::DeserializeSeed<'de>,
-    {
-        let value = self.value.take().expect("value is missing");
-        seed.deserialize(value)
-    }
-
-    fn size_hint(&self) -> Option<usize> {
-        match self.iter.size_hint() {
-            (lower, Some(upper)) if lower == upper => Some(upper),
-            _ => None,
-        }
-    }
-}
-
-pub fn to_value<T: ?Sized>(value: &T) -> Result<Value>
-where
-    T: ser::Serialize,
-{
-    value.serialize(Serializer)
-}
-
-/// Shortcut function to decode a Hjson `Value` into a `T`
-pub fn from_value<T>(value: Value) -> Result<T>
-where
-    T: de::DeserializeOwned,
-{
-    de::Deserialize::deserialize(value)
-}
-
-/// A trait for converting values to Hjson
-pub trait ToJson {
-    /// Converts the value of `self` to an instance of Hjson
-    fn to_json(&self) -> Value;
-}
-
-impl<T: ?Sized> ToJson for T
-where
-    T: ser::Serialize,
-{
-    fn to_json(&self) -> Value {
-        to_value(&self).expect("failed to serialize")
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::Value;
-    use crate::de::from_str;
-
-    #[test]
-    fn number_deserialize() {
-        let v: Value = from_str("{\"a\":1}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert_eq!(vo["a"].as_u64().unwrap(), 1);
-
-        let v: Value = from_str("{\"a\":-1}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert_eq!(vo["a"].as_i64().unwrap(), -1);
-
-        let v: Value = from_str("{\"a\":1.1}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert!(vo["a"].as_f64().unwrap() - 1.1 < std::f64::EPSILON);
-
-        let v: Value = from_str("{\"a\":-1.1}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert!(vo["a"].as_f64().unwrap() + 1.1 > -(std::f64::EPSILON));
-
-        let v: Value = from_str("{\"a\":1e6}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert!(vo["a"].as_f64().unwrap() - 1e6 < std::f64::EPSILON);
-
-        let v: Value = from_str("{\"a\":-1e6}").unwrap();
-        let vo = v.as_object().unwrap();
-        assert!(vo["a"].as_f64().unwrap() + 1e6 > -(std::f64::EPSILON));
-    }
-}
diff --git a/old_nushell/crates/nu-json/tests/main.rs b/old_nushell/crates/nu-json/tests/main.rs
deleted file mode 100644
index 9b20a6b49..000000000
--- a/old_nushell/crates/nu-json/tests/main.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-extern crate nu_json;
-extern crate nu_test_support;
-extern crate serde;
-extern crate serde_json;
-
-use nu_json::Value;
-use regex::Regex;
-use std::fs;
-use std::io;
-use std::path::{Path, PathBuf};
-
-fn txt(text: &str) -> String {
-    let out = String::from_utf8_lossy(text.as_bytes());
-
-    #[cfg(windows)]
-    {
-        out.replace("\r\n", "").replace("\n", "")
-    }
-
-    #[cfg(not(windows))]
-    {
-        out.to_string()
-    }
-}
-
-fn hjson_expectations() -> PathBuf {
-    let assets = nu_test_support::fs::assets().join("nu_json");
-
-    nu_path::canonicalize(assets.clone()).unwrap_or_else(|e| {
-        panic!(
-            "Couldn't canonicalize hjson assets path {}: {:?}",
-            assets.display(),
-            e
-        )
-    })
-}
-
-fn get_test_content(name: &str) -> io::Result<String> {
-    let expectations = hjson_expectations();
-
-    let mut p = format!("{}/{}_test.hjson", expectations.display(), name);
-
-    if !Path::new(&p).exists() {
-        p = format!("{}/{}_test.json", expectations.display(), name);
-    }
-
-    fs::read_to_string(&p)
-}
-
-fn get_result_content(name: &str) -> io::Result<(String, String)> {
-    let expectations = hjson_expectations();
-
-    let p1 = format!("{}/{}_result.json", expectations.display(), name);
-    let p2 = format!("{}/{}_result.hjson", expectations.display(), name);
-
-    Ok((fs::read_to_string(&p1)?, fs::read_to_string(&p2)?))
-}
-
-macro_rules! run_test {
-    // {{ is a workaround for rust stable
-    ($v: ident, $list: expr, $fix: expr) => {{
-        let name = stringify!($v);
-        $list.push(format!("{}_test", name));
-        println!("- running {}", name);
-        let should_fail = name.starts_with("fail");
-        let test_content = get_test_content(name).unwrap();
-        let data: nu_json::Result<Value> = nu_json::from_str(&test_content);
-        assert!(should_fail == data.is_err());
-
-        if !should_fail {
-            let udata = data.unwrap();
-            let (rjson, rhjson) = get_result_content(name).unwrap();
-            let rjson = txt(&rjson);
-            let rhjson = txt(&rhjson);
-            let actual_hjson = nu_json::to_string(&udata).unwrap();
-            let actual_hjson = txt(&actual_hjson);
-            let actual_json = $fix(serde_json::to_string_pretty(&udata).unwrap());
-            let actual_json = txt(&actual_json);
-            if rhjson != actual_hjson {
-                println!(
-                    "{:?}\n---hjson expected\n{}\n---hjson actual\n{}\n---\n",
-                    name, rhjson, actual_hjson
-                );
-            }
-            if rjson != actual_json {
-                println!(
-                    "{:?}\n---json expected\n{}\n---json actual\n{}\n---\n",
-                    name, rjson, actual_json
-                );
-            }
-            assert!(rhjson == actual_hjson && rjson == actual_json);
-        }
-    }};
-}
-
-// add fixes where rust's json differs from javascript
-
-fn std_fix(json: String) -> String {
-    // serde_json serializes integers with a superfluous .0 suffix
-    let re = Regex::new(r"(?m)(?P<d>\d)\.0(?P<s>,?)$").unwrap();
-    re.replace_all(&json, "$d$s").to_string()
-}
-
-fn fix_kan(json: String) -> String {
-    std_fix(json).replace("    -0,", "    0,")
-}
-
-fn fix_pass1(json: String) -> String {
-    std_fix(json)
-        .replace("1.23456789e34", "1.23456789e+34")
-        .replace("2.3456789012e76", "2.3456789012e+76")
-}
-
-#[test]
-fn test_hjson() {
-    let mut done: Vec<String> = Vec::new();
-
-    println!();
-    run_test!(charset, done, std_fix);
-    run_test!(comments, done, std_fix);
-    run_test!(empty, done, std_fix);
-    run_test!(failCharset1, done, std_fix);
-    run_test!(failJSON02, done, std_fix);
-    run_test!(failJSON05, done, std_fix);
-    run_test!(failJSON06, done, std_fix);
-    run_test!(failJSON07, done, std_fix);
-    run_test!(failJSON08, done, std_fix);
-    run_test!(failJSON10, done, std_fix);
-    run_test!(failJSON11, done, std_fix);
-    run_test!(failJSON12, done, std_fix);
-    run_test!(failJSON13, done, std_fix);
-    run_test!(failJSON14, done, std_fix);
-    run_test!(failJSON15, done, std_fix);
-    run_test!(failJSON16, done, std_fix);
-    run_test!(failJSON17, done, std_fix);
-    run_test!(failJSON19, done, std_fix);
-    run_test!(failJSON20, done, std_fix);
-    run_test!(failJSON21, done, std_fix);
-    run_test!(failJSON22, done, std_fix);
-    run_test!(failJSON23, done, std_fix);
-    run_test!(failJSON24, done, std_fix);
-    run_test!(failJSON26, done, std_fix);
-    run_test!(failJSON28, done, std_fix);
-    run_test!(failJSON29, done, std_fix);
-    run_test!(failJSON30, done, std_fix);
-    run_test!(failJSON31, done, std_fix);
-    run_test!(failJSON32, done, std_fix);
-    run_test!(failJSON33, done, std_fix);
-    run_test!(failJSON34, done, std_fix);
-    run_test!(failKey1, done, std_fix);
-    run_test!(failKey2, done, std_fix);
-    run_test!(failKey3, done, std_fix);
-    run_test!(failKey4, done, std_fix);
-    run_test!(failMLStr1, done, std_fix);
-    run_test!(failObj1, done, std_fix);
-    run_test!(failObj2, done, std_fix);
-    run_test!(failObj3, done, std_fix);
-    run_test!(failStr1a, done, std_fix);
-    run_test!(failStr1b, done, std_fix);
-    run_test!(failStr1c, done, std_fix);
-    run_test!(failStr1d, done, std_fix);
-    run_test!(failStr2a, done, std_fix);
-    run_test!(failStr2b, done, std_fix);
-    run_test!(failStr2c, done, std_fix);
-    run_test!(failStr2d, done, std_fix);
-    run_test!(failStr3a, done, std_fix);
-    run_test!(failStr3b, done, std_fix);
-    run_test!(failStr3c, done, std_fix);
-    run_test!(failStr3d, done, std_fix);
-    run_test!(failStr4a, done, std_fix);
-    run_test!(failStr4b, done, std_fix);
-    run_test!(failStr4c, done, std_fix);
-    run_test!(failStr4d, done, std_fix);
-    run_test!(failStr5a, done, std_fix);
-    run_test!(failStr5b, done, std_fix);
-    run_test!(failStr5c, done, std_fix);
-    run_test!(failStr5d, done, std_fix);
-    run_test!(failStr6a, done, std_fix);
-    run_test!(failStr6b, done, std_fix);
-    run_test!(failStr6c, done, std_fix);
-    run_test!(failStr6d, done, std_fix);
-    run_test!(kan, done, fix_kan);
-    run_test!(keys, done, std_fix);
-    run_test!(oa, done, std_fix);
-    run_test!(pass1, done, fix_pass1);
-    run_test!(pass2, done, std_fix);
-    run_test!(pass3, done, std_fix);
-    run_test!(pass4, done, std_fix);
-    run_test!(passSingle, done, std_fix);
-    run_test!(root, done, std_fix);
-    run_test!(stringify1, done, std_fix);
-    run_test!(strings, done, std_fix);
-    run_test!(trail, done, std_fix);
-
-    // check if we include all assets
-    let paths = fs::read_dir(hjson_expectations()).unwrap();
-
-    let all = paths
-        .map(|item| String::from(item.unwrap().path().file_stem().unwrap().to_str().unwrap()))
-        .filter(|x| x.contains("_test"));
-
-    let missing = all
-        .into_iter()
-        .filter(|x| done.iter().find(|y| &x == y) == None)
-        .collect::<Vec<String>>();
-
-    if !missing.is_empty() {
-        for item in missing {
-            println!("missing: {}", item);
-        }
-        panic!();
-    }
-}
diff --git a/old_nushell/crates/nu-parser/Cargo.toml b/old_nushell/crates/nu-parser/Cargo.toml
deleted file mode 100644
index eb937612a..000000000
--- a/old_nushell/crates/nu-parser/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Nushell parser"
-edition = "2018"
-license = "MIT"
-name = "nu-parser"
-version = "0.43.0"
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-derive-new = "0.5.8"
-indexmap = { version="1.6.1", features=["serde-1"] }
-log = "0.4"
-num-bigint = { version="0.4.3", features=["serde"] }
-itertools = "0.10.0"
-smart-default = "0.6.0"
-
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-data = { version = "0.43.0", path="../nu-data" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-nu-test-support = { version = "0.43.0", path="../nu-test-support" }
-
-[features]
-stable = []
diff --git a/old_nushell/crates/nu-parser/src/errors.rs b/old_nushell/crates/nu-parser/src/errors.rs
deleted file mode 100644
index cb576ebcf..000000000
--- a/old_nushell/crates/nu-parser/src/errors.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// use std::fmt::Debug;
-
-// A combination of an informative parse error, and what has been successfully parsed so far
-// #[derive(Debug)]
-// pub struct ParseError {
-//     /// An informative cause for this parse error
-//     pub cause: nu_errors::ParseError,
-//     // /// What has been successfully parsed, if anything
-//     // pub partial: Option<T>,
-// }
-
-// pub type ParseResult<T> = Result<T, ParseError<T>>;
-
-// impl<T: Debug> From<ParseError<T>> for nu_errors::ShellError {
-//     fn from(e: ParseError<T>) -> Self {
-//         e.cause.into()
-//     }
-// }
diff --git a/old_nushell/crates/nu-parser/src/flag.rs b/old_nushell/crates/nu-parser/src/flag.rs
deleted file mode 100644
index 0c97bf34d..000000000
--- a/old_nushell/crates/nu-parser/src/flag.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use nu_errors::{ArgumentError, ParseError};
-use nu_protocol::hir::InternalCommand;
-use nu_protocol::NamedType;
-use nu_source::{Span, Spanned, SpannedItem};
-
-/// Match the available flags in a signature with what the user provided. This will check both long-form flags (--long) and shorthand flags (-l)
-/// This also allows users to provide a group of shorthand flags (-la) that correspond to multiple shorthand flags at once.
-pub fn get_flag_signature_spec(
-    signature: &nu_protocol::Signature,
-    cmd: &InternalCommand,
-    arg: &Spanned<String>,
-) -> (Vec<(String, NamedType)>, Option<ParseError>) {
-    if arg.item.starts_with('-') {
-        // It's a flag (or set of flags)
-        let mut output = vec![];
-        let mut error = None;
-
-        let remainder: String = arg.item.chars().skip(1).collect();
-
-        if remainder.starts_with('-') {
-            // Long flag expected
-            let mut remainder: String = remainder.chars().skip(1).collect();
-
-            if remainder.contains('=') {
-                let assignment: Vec<_> = remainder.split('=').collect();
-
-                if assignment.len() != 2 {
-                    error = Some(ParseError::argument_error(
-                        cmd.name.to_string().spanned(cmd.name_span),
-                        ArgumentError::InvalidExternalWord,
-                    ));
-                } else {
-                    remainder = assignment[0].to_string();
-                }
-            }
-
-            if let Some((named_type, _)) = signature.named.get(&remainder) {
-                output.push((remainder.clone(), named_type.clone()));
-            } else {
-                error = Some(ParseError::argument_error(
-                    cmd.name.to_string().spanned(cmd.name_span),
-                    ArgumentError::UnexpectedFlag(arg.clone()),
-                ));
-            }
-        } else {
-            // Short flag(s) expected
-            let mut starting_pos = arg.span.start() + 1;
-            for c in remainder.chars() {
-                let mut found = false;
-                for (full_name, named_arg) in &signature.named {
-                    if Some(c) == named_arg.0.get_short() {
-                        found = true;
-                        output.push((full_name.clone(), named_arg.0.clone()));
-                        break;
-                    }
-                }
-
-                if !found {
-                    error = Some(ParseError::argument_error(
-                        cmd.name.to_string().spanned(cmd.name_span),
-                        ArgumentError::UnexpectedFlag(
-                            arg.item
-                                .clone()
-                                .spanned(Span::new(starting_pos, starting_pos + c.len_utf8())),
-                        ),
-                    ));
-                }
-
-                starting_pos += c.len_utf8();
-            }
-        }
-
-        (output, error)
-    } else {
-        // It's not a flag, so don't bother with it
-        (vec![], None)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::get_flag_signature_spec;
-    use crate::{lex, parse_block};
-    use nu_protocol::{hir::InternalCommand, NamedType, Signature, SyntaxShape};
-    use nu_source::{HasSpan, Span};
-
-    fn bundle() -> Signature {
-        Signature::build("bundle add")
-            .switch("skip-install", "Adds the gem to the Gemfile but does not install it.", None)
-            .named("group", SyntaxShape::String, "Specify the group(s) for the added gem. Multiple groups should be separated by commas.", Some('g'))
-            .rest("rest", SyntaxShape::Any, "options")
-    }
-
-    #[test]
-    fn parses_longform_flag_containing_equal_sign() {
-        let input = "bundle add rails --group=development";
-        let (tokens, _) = lex(input, 0, lex::lexer::NewlineMode::Normal);
-        let (root_node, _) = parse_block(tokens);
-
-        assert_eq!(root_node.block.len(), 1);
-        assert_eq!(root_node.block[0].pipelines.len(), 1);
-        assert_eq!(root_node.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(root_node.block[0].pipelines[0].commands[0].parts.len(), 4);
-
-        let command_node = root_node.block[0].pipelines[0].commands[0].clone();
-        let idx = 1;
-
-        let (name, name_span) = (
-            command_node.parts[0..(idx + 1)]
-                .iter()
-                .map(|x| x.item.clone())
-                .collect::<Vec<String>>()
-                .join(" "),
-            Span::new(
-                command_node.parts[0].span.start(),
-                command_node.parts[idx].span.end(),
-            ),
-        );
-
-        let mut internal = InternalCommand::new(name, name_span, command_node.span());
-
-        let signature = bundle();
-
-        internal.args.set_initial_flags(&signature);
-
-        let (flags, err) = get_flag_signature_spec(&signature, &internal, &command_node.parts[3]);
-        let (long_name, spec) = flags[0].clone();
-
-        assert!(err.is_none());
-        assert_eq!(long_name, "group".to_string());
-        assert_eq!(spec.get_short(), Some('g'));
-
-        match spec {
-            NamedType::Optional(_, _) => {}
-            _ => panic!("optional flag didn't parse successfully"),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/lex/lexer.rs b/old_nushell/crates/nu-parser/src/lex/lexer.rs
deleted file mode 100644
index 4cad0b8be..000000000
--- a/old_nushell/crates/nu-parser/src/lex/lexer.rs
+++ /dev/null
@@ -1,537 +0,0 @@
-use smart_default::SmartDefault;
-use std::iter::Peekable;
-use std::str::CharIndices;
-
-use nu_errors::ParseError;
-use nu_source::{HasSpan, Span, Spanned, SpannedItem};
-
-use super::token_group::TokenBuilder;
-
-use super::tokens::{
-    CommandBuilder, CommentsBuilder, GroupBuilder, LiteBlock, LiteCommand, LiteComment,
-    PipelineBuilder, TokenContents,
-};
-
-type Input<'t> = Peekable<CharIndices<'t>>;
-
-#[derive(Debug, Clone)]
-pub struct Token {
-    pub contents: TokenContents,
-    pub span: Span,
-}
-
-impl Token {
-    pub fn new(contents: TokenContents, span: Span) -> Token {
-        Token { contents, span }
-    }
-}
-
-#[derive(Debug, Eq, PartialEq, Clone)]
-pub enum NewlineMode {
-    /// Treat newlines as a group separator
-    Normal,
-    /// Treat newlines as just another whitespace
-    Whitespace,
-}
-
-#[derive(Clone, Copy)]
-enum BlockKind {
-    Paren,
-    CurlyBracket,
-    SquareBracket,
-}
-
-impl BlockKind {
-    fn closing(self) -> char {
-        match self {
-            BlockKind::Paren => ')',
-            BlockKind::SquareBracket => ']',
-            BlockKind::CurlyBracket => '}',
-        }
-    }
-}
-
-/// Finds the extents of a basline token, returning the string with its
-/// associated span, along with any parse error that was discovered along the
-/// way.
-///
-/// Baseline tokens are unparsed content separated by spaces or a command
-/// separator (like pipe or semicolon) Baseline tokens may be surrounded by
-/// quotes (single, double, or backtick) or braces (square, paren, curly)
-///
-/// Baseline tokens may be further processed based on the needs of the syntax
-/// shape that encounters them. They are still lightly lexed. For example, if a
-/// baseline token begins with `{`, the entire token will continue until the
-/// closing `}`, taking comments into consideration.
-pub fn baseline(src: &mut Input, span_offset: usize) -> (Spanned<String>, Option<ParseError>) {
-    let mut token_contents = String::new();
-    let start_offset = if let Some((pos, _)) = src.peek() {
-        *pos
-    } else {
-        0
-    };
-
-    // This variable tracks the starting character of a string literal, so that
-    // we remain inside the string literal lexer mode until we encounter the
-    // closing quote.
-    let mut quote_start: Option<char> = None;
-
-    let mut in_comment = false;
-
-    // This Vec tracks paired delimiters
-    let mut block_level: Vec<BlockKind> = vec![];
-
-    // A baseline token is terminated if it's not nested inside of a paired
-    // delimiter and the next character is one of: `|`, `;`, `#` or any
-    // whitespace.
-    fn is_termination(block_level: &[BlockKind], c: char) -> bool {
-        block_level.is_empty() && (c.is_whitespace() || c == '|' || c == ';' || c == '#')
-    }
-
-    // The process of slurping up a baseline token repeats:
-    //
-    // - String literal, which begins with `'`, `"` or `\``, and continues until
-    //   the same character is encountered again.
-    // - Delimiter pair, which begins with `[`, `(`, or `{`, and continues until
-    //   the matching closing delimiter is found, skipping comments and string
-    //   literals.
-    // - When not nested inside of a delimiter pair, when a terminating
-    //   character (whitespace, `|`, `;` or `#`) is encountered, the baseline
-    //   token is done.
-    // - Otherwise, accumulate the character into the current baseline token.
-    while let Some((_, c)) = src.peek() {
-        let c = *c;
-
-        if quote_start.is_some() {
-            // If we encountered the closing quote character for the current
-            // string, we're done with the current string.
-            if Some(c) == quote_start {
-                quote_start = None;
-            }
-        } else if c == '#' {
-            if is_termination(&block_level, c) {
-                break;
-            }
-            in_comment = true;
-        } else if c == '\n' {
-            in_comment = false;
-            if is_termination(&block_level, c) {
-                break;
-            }
-        } else if in_comment {
-            if is_termination(&block_level, c) {
-                break;
-            }
-        } else if c == '\'' || c == '"' || c == '`' {
-            // We encountered the opening quote of a string literal.
-            quote_start = Some(c);
-        } else if c == '[' {
-            // We encountered an opening `[` delimiter.
-            block_level.push(BlockKind::SquareBracket);
-        } else if c == ']' {
-            // We encountered a closing `]` delimiter. Pop off the opening `[`
-            // delimiter.
-            if let Some(BlockKind::SquareBracket) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if c == '{' {
-            // We encountered an opening `{` delimiter.
-            block_level.push(BlockKind::CurlyBracket);
-        } else if c == '}' {
-            // We encountered a closing `}` delimiter. Pop off the opening `{`.
-            if let Some(BlockKind::CurlyBracket) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if c == '(' {
-            // We enceountered an opening `(` delimiter.
-            block_level.push(BlockKind::Paren);
-        } else if c == ')' {
-            // We encountered a closing `)` delimiter. Pop off the opening `(`.
-            if let Some(BlockKind::Paren) = block_level.last() {
-                let _ = block_level.pop();
-            }
-        } else if is_termination(&block_level, c) {
-            break;
-        }
-
-        // Otherwise, accumulate the character into the current token.
-        token_contents.push(c);
-
-        // Consume the character.
-        let _ = src.next();
-    }
-
-    let span = Span::new(
-        start_offset + span_offset,
-        start_offset + span_offset + token_contents.len(),
-    );
-
-    // If there is still unclosed opening delimiters, close them and add
-    // synthetic closing characters to the accumulated token.
-    if let Some(block) = block_level.last() {
-        let delim: char = (*block).closing();
-        let cause = ParseError::unexpected_eof(delim.to_string(), span);
-
-        while let Some(bk) = block_level.pop() {
-            token_contents.push(bk.closing());
-        }
-
-        return (token_contents.spanned(span), Some(cause));
-    }
-
-    if let Some(delimiter) = quote_start {
-        // The non-lite parse trims quotes on both sides, so we add the expected quote so that
-        // anyone wanting to consume this partial parse (e.g., completions) will be able to get
-        // correct information from the non-lite parse.
-        token_contents.push(delimiter);
-
-        return (
-            token_contents.spanned(span),
-            Some(ParseError::unexpected_eof(delimiter.to_string(), span)),
-        );
-    }
-
-    // If we didn't accumulate any characters, it's an unexpected error.
-    if token_contents.is_empty() {
-        return (
-            token_contents.spanned(span),
-            Some(ParseError::unexpected_eof("command".to_string(), span)),
-        );
-    }
-
-    (token_contents.spanned(span), None)
-}
-
-/// We encountered a `#` character. Keep consuming characters until we encounter
-/// a newline character (but don't consume it).
-fn parse_comment(input: &mut Input, hash_offset: usize) -> LiteComment {
-    let mut comment = String::new();
-    let mut in_ws = true;
-    let mut body_start = 0;
-
-    input.next();
-
-    while let Some((_, c)) = input.peek() {
-        if *c == '\n' {
-            break;
-        }
-
-        if in_ws && c.is_whitespace() {
-            body_start += c.len_utf8();
-        } else if in_ws && !c.is_whitespace() {
-            in_ws = false;
-        }
-
-        comment.push(*c);
-        input.next();
-    }
-
-    if body_start == 0 {
-        let len = comment.len();
-
-        LiteComment::new(comment.spanned(Span::new(hash_offset + 1, hash_offset + 1 + len)))
-    } else {
-        let ws = comment[..body_start].to_string();
-        let body = comment[body_start..].to_string();
-
-        let body_len = body.len();
-
-        LiteComment::new_with_ws(
-            ws.spanned(Span::new(hash_offset + 1, hash_offset + 1 + body_start)),
-            body.spanned(Span::new(
-                hash_offset + 1 + body_start,
-                hash_offset + 1 + body_start + body_len,
-            )),
-        )
-    }
-}
-
-#[derive(SmartDefault)]
-struct BlockParser {
-    groups: TokenBuilder<GroupBuilder>,
-    group: GroupBuilder,
-    pipeline: PipelineBuilder,
-    command: CommandBuilder,
-    prev_token: Option<Token>,
-    prev_comments: CommentsBuilder,
-    prev_comment_indent: usize,
-}
-
-impl BlockParser {
-    fn consumed(&mut self, token: Token) {
-        self.prev_token = Some(token);
-    }
-
-    fn success(mut self) -> (LiteBlock, Option<ParseError>) {
-        self.close_group();
-
-        (LiteBlock::new(self.groups.map(|g| g.into())), None)
-    }
-
-    fn fail(self, error: ParseError) -> (LiteBlock, Option<ParseError>) {
-        (LiteBlock::new(self.groups.map(|g| g.into())), Some(error))
-    }
-
-    fn comment(&mut self, token: &LiteComment) {
-        if self.prev_comments.is_empty() {
-            self.prev_comment_indent = token.ws_len();
-        }
-
-        self.prev_comments
-            .push(token.unindent(self.prev_comment_indent));
-    }
-
-    fn eoleol(&mut self) {
-        self.prev_comment_indent = 0;
-        self.prev_comments.take();
-
-        self.eol();
-    }
-
-    fn eol(&mut self) {
-        // If the last token on the current line is a `|`, the group
-        // continues on the next line.
-        if let Some(prev) = &self.prev_token {
-            if let TokenContents::Pipe = prev.contents {
-                return;
-            }
-        }
-
-        self.close_group();
-    }
-
-    fn pipe(&mut self) -> Result<(), ()> {
-        // If the current command has content, accumulate it into
-        // the current pipeline and start a new command.
-
-        match self.close_command() {
-            None => Err(()),
-            Some(command) => {
-                self.pipeline.push(command);
-                Ok(())
-            }
-        }
-    }
-
-    fn semicolon(&mut self) {
-        self.close_pipeline();
-    }
-
-    fn baseline(&mut self, part: Spanned<String>) {
-        // We encountered an unclassified character. Accumulate it into
-        // the current command as a string.
-
-        self.command.push(part);
-    }
-
-    fn close_command(&mut self) -> Option<LiteCommand> {
-        let command = self.command.take()?;
-        let command = LiteCommand {
-            parts: command.into(),
-            comments: self.prev_comments.take().map(|c| c.into()),
-        };
-
-        self.prev_comment_indent = 0;
-
-        Some(command)
-    }
-
-    fn close_pipeline(&mut self) {
-        if let Some(command) = self.close_command() {
-            self.pipeline.push(command);
-        }
-
-        if let Some(pipeline) = self.pipeline.take() {
-            self.group.push(pipeline);
-        }
-    }
-
-    fn close_group(&mut self) {
-        self.close_pipeline();
-
-        if let Some(group) = self.group.take() {
-            self.groups.push(group);
-        }
-    }
-}
-
-/// Try to parse a list of tokens into a block.
-pub fn parse_block(tokens: Vec<Token>) -> (LiteBlock, Option<ParseError>) {
-    let mut parser = BlockParser::default();
-
-    let mut tokens = tokens.iter().peekable();
-
-    // The parsing process repeats:
-    //
-    // - newline (`\n` or `\r`)
-    // - pipes (`|`)
-    // - semicolon
-    while let Some(token) = tokens.next() {
-        match &token.contents {
-            TokenContents::Eol => {
-                // If we encounter two newline characters in a row, use a special eoleol event,
-                // which allows the parser to discard comments that shouldn't be treated as
-                // documentation for the following item.
-                let last_was_comment = std::matches!(
-                    parser.prev_token,
-                    Some(Token {
-                        contents: TokenContents::Comment(..),
-                        ..
-                    })
-                );
-                let next_is_eol = std::matches!(
-                    tokens.peek(),
-                    Some(Token {
-                        contents: TokenContents::Eol,
-                        ..
-                    })
-                );
-                if last_was_comment && next_is_eol {
-                    tokens.next();
-                    parser.eoleol();
-                } else {
-                    // We encountered a newline character. If the last token on the
-                    // current line is a `|`, continue the current group on the next
-                    // line. Otherwise, close up the current group by rolling up the
-                    // current command into the current pipeline, and then roll up
-                    // the current pipeline into the group.
-                    parser.eol();
-                }
-            }
-            TokenContents::Pipe => {
-                // We encountered a pipe (`|`) character, which terminates a
-                // command.
-
-                if parser.pipe().is_err() {
-                    // If the current command doesn't have content, return an
-                    // error that indicates that the `|` was unexpected.
-                    return parser.fail(ParseError::extra_tokens(
-                        "|".to_string().spanned(token.span),
-                    ));
-                }
-                // match parser.pipe() {}
-            }
-            TokenContents::Semicolon => {
-                // We encountered a semicolon (`;`) character, which terminates
-                // a pipeline.
-
-                parser.semicolon();
-            }
-            TokenContents::Baseline(part) => {
-                // We encountered an unclassified character. Accumulate it into
-                // the current command as a string.
-
-                parser.baseline(part.to_string().spanned(token.span));
-            }
-            TokenContents::Comment(comment) => parser.comment(comment),
-        }
-
-        parser.consumed(token.clone());
-    }
-
-    parser.success()
-}
-
-/// Breaks the input string into a vector of tokens. This tokenization only tries to classify separators like
-/// semicolons, pipes, etc from external bare values (values that haven't been classified further)
-/// Takes in a string and and offset, which is used to offset the spans created (for when this function is used to parse inner strings)
-pub fn lex(
-    input: &str,
-    span_offset: usize,
-    newline_mode: NewlineMode,
-) -> (Vec<Token>, Option<ParseError>) {
-    // Break the input slice into an iterator of Unicode characters.
-    let mut char_indices = input.char_indices().peekable();
-    let mut error = None;
-
-    let mut output = vec![];
-    let mut is_complete = true;
-
-    // The lexing process repeats. One character of lookahead is sufficient to decide what to do next.
-    //
-    // - `|`: the token is either `|` token or a `||` token
-    // - `;`: the token is a semicolon
-    // - `\n` or `\r`: the token is an EOL (end of line) token
-    // - other whitespace: ignored
-    // - `#` the token starts a line comment, which contains all of the subsequent characters until the next EOL
-    // -
-    while let Some((idx, c)) = char_indices.peek() {
-        if *c == '|' {
-            // If the next character is `|`, it's either `|` or `||`.
-
-            let idx = *idx;
-            let prev_idx = idx;
-            let _ = char_indices.next();
-
-            // If the next character is `|`, we're looking at a `||`.
-            if let Some((idx, c)) = char_indices.peek() {
-                if *c == '|' {
-                    let idx = *idx;
-                    let _ = char_indices.next();
-                    output.push(Token::new(
-                        TokenContents::Baseline("||".into()),
-                        Span::new(span_offset + prev_idx, span_offset + idx + 1),
-                    ));
-                    continue;
-                }
-            }
-
-            // Otherwise, it's just a regular `|` token.
-            output.push(Token::new(
-                TokenContents::Pipe,
-                Span::new(span_offset + idx, span_offset + idx + 1),
-            ));
-            is_complete = false;
-        } else if *c == ';' {
-            // If the next character is a `;`, we're looking at a semicolon token.
-
-            if !is_complete && error.is_none() {
-                error = Some(ParseError::extra_tokens(
-                    ";".to_string().spanned(Span::new(*idx, idx + 1)),
-                ));
-            }
-            let idx = *idx;
-            let _ = char_indices.next();
-            output.push(Token::new(
-                TokenContents::Semicolon,
-                Span::new(span_offset + idx, span_offset + idx + 1),
-            ));
-        } else if *c == '\n' || *c == '\r' {
-            // If the next character is a newline, we're looking at an EOL (end of line) token.
-
-            let idx = *idx;
-            let _ = char_indices.next();
-            if newline_mode == NewlineMode::Normal {
-                output.push(Token::new(
-                    TokenContents::Eol,
-                    Span::new(span_offset + idx, span_offset + idx + 1),
-                ));
-            }
-        } else if *c == '#' {
-            // If the next character is `#`, we're at the beginning of a line
-            // comment. The comment continues until the next newline.
-            let idx = *idx;
-
-            let comment = parse_comment(&mut char_indices, idx);
-            let span = comment.span();
-
-            output.push(Token::new(TokenContents::Comment(comment), span));
-        } else if c.is_whitespace() {
-            // If the next character is non-newline whitespace, skip it.
-
-            let _ = char_indices.next();
-        } else {
-            // Otherwise, try to consume an unclassified token.
-
-            let (result, err) = baseline(&mut char_indices, span_offset);
-            if error.is_none() {
-                error = err;
-            }
-            is_complete = true;
-            let Spanned { item, span } = result;
-            output.push(Token::new(TokenContents::Baseline(item), span));
-        }
-    }
-
-    (output, error)
-}
diff --git a/old_nushell/crates/nu-parser/src/lex/mod.rs b/old_nushell/crates/nu-parser/src/lex/mod.rs
deleted file mode 100644
index c9e8ed0f6..000000000
--- a/old_nushell/crates/nu-parser/src/lex/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod lexer;
-mod token_group;
-pub mod tokens;
-
-#[cfg(test)]
-mod tests;
diff --git a/old_nushell/crates/nu-parser/src/lex/tests.rs b/old_nushell/crates/nu-parser/src/lex/tests.rs
deleted file mode 100644
index ab9acf16a..000000000
--- a/old_nushell/crates/nu-parser/src/lex/tests.rs
+++ /dev/null
@@ -1,508 +0,0 @@
-use nu_source::{Span, SpannedItem};
-
-use super::lexer::*;
-use super::tokens::*;
-
-fn span(left: usize, right: usize) -> Span {
-    Span::new(left, right)
-}
-
-mod bare {
-
-    use super::*;
-
-    #[test]
-    fn simple_1() {
-        let input = "foo bar baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 3));
-    }
-
-    #[test]
-    fn simple_2() {
-        let input = "'foo bar' baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 9));
-    }
-
-    #[test]
-    fn simple_3() {
-        let input = "'foo\" bar' baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 10));
-    }
-
-    #[test]
-    fn simple_4() {
-        let input = "[foo bar] baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 9));
-    }
-
-    #[test]
-    fn simple_5() {
-        let input = "'foo 'bar baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 9));
-    }
-
-    #[test]
-    fn simple_6() {
-        let input = "''foo baz";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 5));
-    }
-
-    #[test]
-    fn simple_7() {
-        let input = "'' foo";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 2));
-    }
-
-    #[test]
-    fn simple_8() {
-        let input = " '' foo";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(1, 3));
-    }
-
-    #[test]
-    fn simple_9() {
-        let input = " 'foo' foo";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(1, 6));
-    }
-
-    #[test]
-    fn simple_10() {
-        let input = "[foo, bar]";
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_none());
-        assert_eq!(result[0].span, span(0, 10));
-    }
-
-    #[test]
-    fn lex_comment() {
-        let input = r#"
-#A comment
-def e [] {echo hi}
-            "#;
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-
-        //result[0] == EOL
-        assert_eq!(result[1].span, span(2, 11));
-        assert_eq!(
-            result[1].contents,
-            TokenContents::Comment(LiteComment::new(
-                "A comment".to_string().spanned(Span::new(2, 11))
-            ))
-        );
-    }
-
-    #[test]
-    fn lex_multi_comments() {
-        let input = r#"
-#A comment
-def e [] {echo hi}
-
-#Another comment
-def e2 [] {echo hello}
-            "#;
-
-        let (result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-
-        let span1 = span(2, 11);
-        assert_eq!(result[1].span, span1);
-        assert_eq!(
-            result[1].contents,
-            TokenContents::Comment(LiteComment::new("A comment".to_string().spanned(span1)))
-        );
-        let span2 = span(33, 48);
-        assert_eq!(result[9].span, span2);
-        assert_eq!(
-            result[9].contents,
-            TokenContents::Comment(LiteComment::new(
-                "Another comment".to_string().spanned(span2)
-            ))
-        );
-    }
-
-    #[test]
-    fn def_comment_with_single_quote() {
-        let input = r#"def f [] {
-            # shouldn't return error
-            echo hi
-        }"#;
-        let (_result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-    }
-
-    #[test]
-    fn def_comment_with_double_quote() {
-        let input = r#"def f [] {
-            # should "not return error
-            echo hi
-        }"#;
-        let (_result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-    }
-
-    #[test]
-    fn def_comment_with_bracket() {
-        let input = r#"def f [] {
-            # should not [return error
-            echo hi
-        }"#;
-        let (_result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-    }
-
-    #[test]
-    fn def_comment_with_curly_brace() {
-        let input = r#"def f [] {
-            # should not return {error
-            echo hi
-        }"#;
-        let (_result, err) = lex(input, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-    }
-
-    #[test]
-    fn ignore_future() {
-        let input = "foo 'bar";
-
-        let (result, _) = lex(input, 0, NewlineMode::Normal);
-
-        assert_eq!(result[0].span, span(0, 3));
-    }
-
-    #[test]
-    fn invalid_1() {
-        let input = "'foo bar";
-
-        let (_, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_some());
-    }
-
-    #[test]
-    fn invalid_2() {
-        let input = "'bar";
-
-        let (_, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_some());
-    }
-
-    #[test]
-    fn invalid_4() {
-        let input = " 'bar";
-
-        let (_, err) = lex(input, 0, NewlineMode::Normal);
-
-        assert!(err.is_some());
-    }
-}
-
-mod lite_parse {
-    use nu_source::HasSpan;
-
-    use super::*;
-
-    #[test]
-    fn pipeline() {
-        let (result, err) = lex("cmd1 | cmd2 ; deploy", 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-        assert_eq!(result.span(), span(0, 20));
-        assert_eq!(result.block[0].pipelines[0].span(), span(0, 11));
-        assert_eq!(result.block[0].pipelines[1].span(), span(14, 20));
-    }
-
-    #[test]
-    fn simple_1() {
-        let (result, err) = lex("foo", 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-        assert_eq!(result.block.len(), 1);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 1);
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].parts[0].span,
-            span(0, 3)
-        );
-    }
-
-    #[test]
-    fn simple_offset() {
-        let (result, err) = lex("foo", 10, NewlineMode::Normal);
-        assert!(err.is_none());
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 1);
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].parts[0].span,
-            span(10, 13)
-        );
-    }
-
-    #[test]
-    fn incomplete_result() {
-        let (result, err) = lex("my_command \"foo' --test", 10, NewlineMode::Normal);
-        assert!(matches!(
-            err.unwrap().reason(),
-            nu_errors::ParseErrorReason::Eof { .. }
-        ));
-        let (result, _) = parse_block(result);
-
-        assert_eq!(result.block.len(), 1);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 2);
-
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].parts[0].item,
-            "my_command"
-        );
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].parts[1].item,
-            "\"foo' --test\""
-        );
-    }
-    #[test]
-    fn command_with_comment() {
-        let code = r#"
-# My echo
-# * It's much better :)
-def my_echo [arg] { echo $arg }
-        "#;
-        let (result, err) = lex(code, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-
-        assert_eq!(result.block.len(), 1);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 4);
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].comments,
-            Some(vec![
-                //Leading space is trimmed
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(2, 3)),
-                    "My echo".to_string().spanned(Span::new(3, 10))
-                ),
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(12, 13)),
-                    "* It's much better :)"
-                        .to_string()
-                        .spanned(Span::new(13, 34))
-                )
-            ])
-        );
-    }
-
-    #[test]
-    fn two_commands_with_comments() {
-        let code = r#"
-# My echo
-# * It's much better :)
-def my_echo [arg] { echo $arg }
-
-# My echo2
-# * It's even better!
-def my_echo2 [arg] { echo $arg }
-        "#;
-        let (result, err) = lex(code, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-
-        assert_eq!(result.block.len(), 2);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 4);
-        assert_eq!(
-            result.block[0].pipelines[0].commands[0].comments,
-            Some(vec![
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(2, 3)),
-                    "My echo".to_string().spanned(Span::new(3, 10))
-                ),
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(12, 13)),
-                    "* It's much better :)"
-                        .to_string()
-                        .spanned(Span::new(13, 34))
-                )
-            ])
-        );
-
-        assert_eq!(result.block[1].pipelines.len(), 1);
-        assert_eq!(result.block[1].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[1].pipelines[0].commands[0].parts.len(), 4);
-        assert_eq!(
-            result.block[1].pipelines[0].commands[0].comments,
-            Some(vec![
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(69, 70)),
-                    "My echo2".to_string().spanned(Span::new(70, 78))
-                ),
-                LiteComment::new_with_ws(
-                    " ".to_string().spanned(Span::new(80, 81)),
-                    "* It's even better!"
-                        .to_string()
-                        .spanned(Span::new(81, 100))
-                )
-            ])
-        );
-    }
-
-    #[test]
-    fn discarded_comment() {
-        let code = r#"
-# This comment gets discarded, because of the following empty line
-
-echo 42
-        "#;
-        let (result, err) = lex(code, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        // assert_eq!(format!("{:?}", result), "");
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-        assert_eq!(result.block.len(), 1);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 2);
-        assert_eq!(result.block[0].pipelines[0].commands[0].comments, None);
-    }
-
-    #[test]
-    fn discarded_comment_multi_newline() {
-        let code = r#"
-# This comment gets discarded, because of the following empty line
-
-
-
-echo 42
-        "#;
-        let (result, err) = lex(code, 0, NewlineMode::Normal);
-        assert!(err.is_none());
-        // assert_eq!(format!("{:?}", result), "");
-        let (result, err) = parse_block(result);
-        assert!(err.is_none());
-        assert_eq!(result.block.len(), 1);
-        assert_eq!(result.block[0].pipelines.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-        assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 2);
-        assert_eq!(result.block[0].pipelines[0].commands[0].comments, None);
-    }
-}
-
-#[test]
-fn no_discarded_white_space_start_of_comment() {
-    let code = r#"
-#No white_space at first line ==> No white_space discarded
-#   Starting space is not discarded
-echo 42
-        "#;
-    let (result, err) = lex(code, 0, NewlineMode::Normal);
-    assert!(err.is_none());
-    // assert_eq!(format!("{:?}", result), "");
-    let (result, err) = parse_block(result);
-    assert!(err.is_none());
-    assert_eq!(result.block.len(), 1);
-    assert_eq!(result.block[0].pipelines.len(), 1);
-    assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-    assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 2);
-    assert_eq!(
-        result.block[0].pipelines[0].commands[0].comments,
-        Some(vec![
-            LiteComment::new(
-                "No white_space at first line ==> No white_space discarded"
-                    .to_string()
-                    .spanned(Span::new(2, 59))
-            ),
-            LiteComment::new(
-                "   Starting space is not discarded"
-                    .to_string()
-                    .spanned(Span::new(61, 95))
-            ),
-        ])
-    );
-}
-
-#[test]
-fn multiple_discarded_white_space_start_of_comment() {
-    let code = r#"
-#  Discard 2 spaces
-# Discard 1 space
-#  Discard 2 spaces
-echo 42
-        "#;
-    let (result, err) = lex(code, 0, NewlineMode::Normal);
-    assert!(err.is_none());
-    // assert_eq!(format!("{:?}", result), "");
-    let (result, err) = parse_block(result);
-    assert!(err.is_none());
-    assert_eq!(result.block.len(), 1);
-    assert_eq!(result.block[0].pipelines.len(), 1);
-    assert_eq!(result.block[0].pipelines[0].commands.len(), 1);
-    assert_eq!(result.block[0].pipelines[0].commands[0].parts.len(), 2);
-    assert_eq!(
-        result.block[0].pipelines[0].commands[0].comments,
-        Some(vec![
-            LiteComment::new_with_ws(
-                "  ".to_string().spanned(Span::new(2, 4)),
-                "Discard 2 spaces".to_string().spanned(Span::new(4, 20))
-            ),
-            LiteComment::new_with_ws(
-                " ".to_string().spanned(Span::new(22, 23)),
-                "Discard 1 space".to_string().spanned(Span::new(23, 38))
-            ),
-            LiteComment::new_with_ws(
-                "  ".to_string().spanned(Span::new(40, 42)),
-                "Discard 2 spaces".to_string().spanned(Span::new(42, 58))
-            ),
-        ])
-    );
-}
diff --git a/old_nushell/crates/nu-parser/src/lex/token_group.rs b/old_nushell/crates/nu-parser/src/lex/token_group.rs
deleted file mode 100644
index 99f2b8735..000000000
--- a/old_nushell/crates/nu-parser/src/lex/token_group.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use smart_default::SmartDefault;
-use std::iter::FromIterator;
-
-use derive_new::new;
-use nu_source::{HasSpan, Span};
-
-#[derive(Debug, Clone, SmartDefault, new)]
-pub struct TokenBuilder<T: HasSpan> {
-    #[default(None)]
-    contents: Option<Vec<T>>,
-}
-
-impl<T> From<TokenBuilder<T>> for Vec<T>
-where
-    T: HasSpan,
-{
-    fn from(x: TokenBuilder<T>) -> Self {
-        x.contents.unwrap_or_else(Vec::new)
-    }
-}
-
-impl<T> HasSpan for TokenBuilder<T>
-where
-    T: HasSpan,
-{
-    fn span(&self) -> Span {
-        match &self.contents {
-            Some(vec) => {
-                let mut iter = vec.iter();
-                let head = iter.next();
-                let last = iter.last().or(head);
-
-                match (head, last) {
-                    (Some(head), Some(last)) => Span::new(head.span().start(), last.span().end()),
-                    _ => Span::default(),
-                }
-            }
-            None => Span::new(0, 0),
-        }
-    }
-}
-
-impl<T> TokenBuilder<T>
-where
-    T: HasSpan,
-{
-    pub fn is_empty(&self) -> bool {
-        self.contents.is_none()
-    }
-
-    pub fn take(&mut self) -> Option<TokenBuilder<T>> {
-        self.contents.take().map(|c| TokenBuilder::new(Some(c)))
-    }
-
-    pub fn map<I, U>(self, mapper: impl Fn(T) -> U) -> I
-    where
-        I: FromIterator<U>,
-    {
-        match self.contents {
-            Some(contents) => contents.into_iter().map(mapper).collect(),
-            None => I::from_iter(None),
-        }
-    }
-
-    pub fn push(&mut self, item: T) {
-        let contents = match self.contents.take() {
-            Some(mut contents) => {
-                contents.push(item);
-                contents
-            }
-            None => vec![item],
-        };
-
-        self.contents.replace(contents);
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/lex/tokens.rs b/old_nushell/crates/nu-parser/src/lex/tokens.rs
deleted file mode 100644
index b83d6a4d4..000000000
--- a/old_nushell/crates/nu-parser/src/lex/tokens.rs
+++ /dev/null
@@ -1,218 +0,0 @@
-use derive_new::new;
-use itertools::Itertools;
-use std::fmt;
-
-use nu_source::{HasSpan, Span, Spanned, SpannedItem};
-
-use super::token_group::TokenBuilder;
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum TokenContents {
-    /// A baseline token is an atomic chunk of source code. This means that the
-    /// token contains the entirety of string literals, as well as the entirety
-    /// of sections delimited by paired delimiters.
-    ///
-    /// For example, if the token begins with `{`, the baseline token continues
-    /// until the closing `}` (after taking comments and string literals into
-    /// consideration).
-    Baseline(String),
-    Comment(LiteComment),
-    Pipe,
-    Semicolon,
-    Eol,
-}
-
-impl fmt::Display for TokenContents {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            TokenContents::Baseline(base) => write!(f, "{}", base),
-            TokenContents::Comment(comm) => write!(f, "{}", comm),
-            TokenContents::Pipe => write!(f, "|"),
-            TokenContents::Semicolon => write!(f, ";"),
-            TokenContents::Eol => write!(f, "\\n"),
-        }
-    }
-}
-
-impl TokenContents {
-    pub fn is_eol(&self) -> bool {
-        matches!(self, Self::Eol)
-    }
-}
-
-pub type CommandBuilder = TokenBuilder<Spanned<String>>;
-pub type CommentsBuilder = TokenBuilder<LiteComment>;
-pub type PipelineBuilder = TokenBuilder<LiteCommand>;
-pub type GroupBuilder = TokenBuilder<PipelineBuilder>;
-
-/// A LiteComment is a line comment. It begins with `#` and continues until (but not including) the
-/// next newline.
-///
-/// It remembers any leading whitespace, which is used in later processing steps to strip off
-/// leading whitespace for an entire comment block when it is associated with a definition.
-#[derive(Debug, PartialEq, Clone)]
-pub struct LiteComment {
-    leading_ws: Option<Spanned<String>>,
-    rest: Spanned<String>,
-}
-
-impl LiteComment {
-    pub fn new(string: impl Into<Spanned<String>>) -> LiteComment {
-        LiteComment {
-            leading_ws: None,
-            rest: string.into(),
-        }
-    }
-
-    pub fn new_with_ws(
-        ws: impl Into<Spanned<String>>,
-        comment: impl Into<Spanned<String>>,
-    ) -> LiteComment {
-        LiteComment {
-            leading_ws: Some(ws.into()),
-            rest: comment.into(),
-        }
-    }
-
-    pub fn unindent(&self, excluded_spaces: usize) -> LiteComment {
-        match &self.leading_ws {
-            // If there's no leading whitespace, there's no whitespace to exclude
-            None => self.clone(),
-            Some(Spanned { item, span }) => {
-                // If the number of spaces to exclude is larger than the amount of whitespace we
-                // have, there's no whitespace to move into the comment body.
-                if excluded_spaces > item.len() {
-                    self.clone()
-                } else {
-                    // If there are no spaces to exclude, prepend all of the leading_whitespace to
-                    // the comment body.
-                    if excluded_spaces == 0 {
-                        let rest_span = self.span();
-                        let rest = format!("{}{}", item, self.rest.item).spanned(rest_span);
-                        return LiteComment {
-                            leading_ws: None,
-                            rest,
-                        };
-                    }
-
-                    // Pull off excluded_spaces number of spaces, and create a new Spanned<String>
-                    // for that whitespace. Any remaining spaces will be added to the comment.
-                    let excluded_ws = item[..excluded_spaces]
-                        .to_string()
-                        .spanned(Span::new(span.start(), span.start() + excluded_spaces));
-
-                    let included_ws = &item[excluded_spaces..];
-                    let rest_start = span.start() + excluded_spaces;
-                    let rest_span = Span::new(rest_start, rest_start + self.rest.len());
-
-                    let rest = format!("{}{}", included_ws, self.rest.item).spanned(rest_span);
-
-                    LiteComment {
-                        leading_ws: Some(excluded_ws),
-                        rest,
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn ws_len(&self) -> usize {
-        match &self.leading_ws {
-            None => 0,
-            Some(ws) => ws.item.len(),
-        }
-    }
-
-    pub(crate) fn trim(&self) -> Spanned<String> {
-        let trimmed = self.rest.trim();
-
-        trimmed.to_string().spanned(Span::new(
-            self.rest.span().start(),
-            self.rest.span().start() + trimmed.len(),
-        ))
-    }
-}
-
-impl fmt::Display for LiteComment {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match &self.leading_ws {
-            None => write!(f, "#{}", self.rest.item),
-            Some(leading) => write!(f, "#{}{}", leading.item, self.rest.item),
-        }
-    }
-}
-
-impl HasSpan for LiteComment {
-    fn span(&self) -> Span {
-        match &self.leading_ws {
-            None => self.rest.span(),
-            Some(leading) => leading.span().until(self.rest.span()),
-        }
-    }
-}
-
-/// A `LiteCommand` is a list of words that will get meaning when processed by
-/// the parser.
-#[derive(Debug, Default, Clone)]
-pub struct LiteCommand {
-    pub parts: Vec<Spanned<String>>,
-    /// Preceding comments.
-    pub comments: Option<Vec<LiteComment>>,
-}
-
-impl HasSpan for LiteCommand {
-    fn span(&self) -> Span {
-        Span::from_list(&self.parts)
-    }
-}
-
-impl LiteCommand {
-    pub fn comments_joined(&self) -> String {
-        match &self.comments {
-            None => "".to_string(),
-            Some(text) => text.iter().map(|s| s.trim().item).join("\n"),
-        }
-    }
-}
-
-/// A `LitePipeline` is a series of `LiteCommand`s, separated by `|`.
-#[derive(Debug, Clone, new)]
-pub struct LitePipeline {
-    pub commands: Vec<LiteCommand>,
-}
-
-impl HasSpan for LitePipeline {
-    fn span(&self) -> Span {
-        Span::from_list(&self.commands)
-    }
-}
-
-/// A `LiteGroup` is a series of `LitePipeline`s, separated by `;`.
-#[derive(Debug, Clone, new)]
-pub struct LiteGroup {
-    pub pipelines: Vec<LitePipeline>,
-}
-
-impl From<GroupBuilder> for LiteGroup {
-    fn from(group: GroupBuilder) -> Self {
-        LiteGroup::new(group.map(|p| LitePipeline::new(p.into())))
-    }
-}
-
-impl HasSpan for LiteGroup {
-    fn span(&self) -> Span {
-        Span::from_list(&self.pipelines)
-    }
-}
-
-/// A `LiteBlock` is a series of `LiteGroup`s, separated by newlines.
-#[derive(Debug, Clone, new)]
-pub struct LiteBlock {
-    pub block: Vec<LiteGroup>,
-}
-
-impl HasSpan for LiteBlock {
-    fn span(&self) -> Span {
-        Span::from_list(&self.block)
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/lib.rs b/old_nushell/crates/nu-parser/src/lib.rs
deleted file mode 100644
index ee120446c..000000000
--- a/old_nushell/crates/nu-parser/src/lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#[macro_use]
-extern crate derive_new;
-
-mod errors;
-mod flag;
-mod lex;
-mod parse;
-mod scope;
-mod shapes;
-
-pub use lex::lexer::{lex, parse_block, NewlineMode};
-pub use lex::tokens::{LiteBlock, LiteCommand, LiteGroup, LitePipeline};
-pub use parse::{classify_block, garbage, parse, parse_full_column_path, parse_math_expression};
-pub use scope::ParserScope;
-pub use shapes::shapes;
diff --git a/old_nushell/crates/nu-parser/src/parse.rs b/old_nushell/crates/nu-parser/src/parse.rs
deleted file mode 100644
index a039cd9a9..000000000
--- a/old_nushell/crates/nu-parser/src/parse.rs
+++ /dev/null
@@ -1,2469 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use bigdecimal::BigDecimal;
-use indexmap::IndexMap;
-use log::trace;
-use nu_errors::{ArgumentError, ParseError};
-use nu_path::expand_path;
-use nu_protocol::hir::{
-    self, Binary, Block, Call, ClassifiedCommand, Expression, ExternalRedirection, Flag, FlagKind,
-    Group, InternalCommand, Member, NamedArguments, Operator, Pipeline, RangeOperator,
-    SpannedExpression, Synthetic, Unit,
-};
-use nu_protocol::{NamedType, PositionalType, Signature, SyntaxShape, UnspannedPathMember};
-use nu_source::{HasSpan, Span, Spanned, SpannedItem};
-use num_bigint::BigInt;
-
-use crate::parse::source::parse_source_internal;
-use crate::{lex::lexer::NewlineMode, parse::def::parse_parameter};
-use crate::{
-    lex::lexer::{lex, parse_block},
-    ParserScope,
-};
-use crate::{
-    lex::{
-        lexer::Token,
-        tokens::{LiteBlock, LiteCommand, LitePipeline, TokenContents},
-    },
-    parse::def::lex_split_baseline_tokens_on,
-};
-
-use self::{
-    def::{parse_definition, parse_definition_prototype},
-    util::trim_quotes,
-    util::verify_and_strip,
-};
-
-mod def;
-mod source;
-mod util;
-
-pub use self::util::garbage;
-
-/// Parses a simple column path, one without a variable (implied or explicit) at the head
-pub fn parse_simple_column_path(
-    lite_arg: &Spanned<String>,
-) -> (SpannedExpression, Option<ParseError>) {
-    let mut delimiter = '.';
-    let mut inside_delimiter = false;
-    let mut output = vec![];
-    let mut current_part = String::new();
-    let mut start_index = 0;
-    let mut last_index = 0;
-
-    for (idx, c) in lite_arg.item.char_indices() {
-        last_index = idx;
-        if inside_delimiter {
-            if c == delimiter {
-                inside_delimiter = false;
-            }
-        } else if c == '\'' || c == '"' {
-            inside_delimiter = true;
-            delimiter = c;
-        } else if c == '.' {
-            let part_span = Span::new(
-                lite_arg.span.start() + start_index,
-                lite_arg.span.start() + idx,
-            );
-
-            if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(Member::Int(row_number, part_span));
-            } else {
-                let trimmed = trim_quotes(&current_part);
-                output.push(Member::Bare(trimmed.spanned(part_span)));
-            }
-            current_part.clear();
-            // Note: I believe this is safe because of the delimiter we're using,
-            // but if we get fancy with Unicode we'll need to change this.
-            start_index = idx + '.'.len_utf8();
-            continue;
-        }
-        current_part.push(c);
-    }
-
-    if !current_part.is_empty() {
-        let part_span = Span::new(
-            lite_arg.span.start() + start_index,
-            lite_arg.span.start() + last_index + 1,
-        );
-        if let Ok(row_number) = current_part.parse::<i64>() {
-            output.push(Member::Int(row_number, part_span));
-        } else {
-            let current_part = trim_quotes(&current_part);
-            output.push(Member::Bare(current_part.spanned(part_span)));
-        }
-    }
-
-    (
-        SpannedExpression::new(Expression::simple_column_path(output), lite_arg.span),
-        None,
-    )
-}
-
-/// Parses a column path, adding in the preceding reference to $it if it's elided
-pub fn parse_full_column_path(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    let mut inside_delimiter = vec![];
-    let mut output = vec![];
-    let mut current_part = String::new();
-    let mut start_index = 0;
-    let mut last_index = 0;
-    let mut error = None;
-
-    let mut head = None;
-
-    for (idx, c) in lite_arg.item.char_indices() {
-        last_index = idx;
-        if c == '(' {
-            inside_delimiter.push(')');
-        } else if let Some(delimiter) = inside_delimiter.last() {
-            if c == *delimiter {
-                inside_delimiter.pop();
-            }
-        } else if c == '\'' || c == '"' {
-            inside_delimiter.push(c);
-        } else if c == '.' {
-            let part_span = Span::new(
-                lite_arg.span.start() + start_index,
-                lite_arg.span.start() + idx,
-            );
-
-            if head.is_none() && current_part.starts_with('(') && current_part.ends_with(')') {
-                let (invoc, err) =
-                    parse_subexpression(&current_part.clone().spanned(part_span), scope);
-                if error.is_none() {
-                    error = err;
-                }
-                head = Some(invoc.expr);
-            } else if head.is_none() && current_part.starts_with('$') {
-                // We have the variable head
-                head = Some(Expression::variable(current_part.clone(), part_span))
-            } else if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-            } else {
-                let current_part = trim_quotes(&current_part);
-                output.push(
-                    UnspannedPathMember::String(current_part.clone()).into_path_member(part_span),
-                );
-            }
-            current_part.clear();
-            // Note: I believe this is safe because of the delimiter we're using,
-            // but if we get fancy with Unicode we'll need to change this.
-            start_index = idx + '.'.len_utf8();
-            continue;
-        }
-        current_part.push(c);
-    }
-
-    if !current_part.is_empty() {
-        let part_span = Span::new(
-            lite_arg.span.start() + start_index,
-            lite_arg.span.start() + last_index + 1,
-        );
-
-        if head.is_none() {
-            if current_part.starts_with('(') && current_part.ends_with(')') {
-                let (invoc, err) = parse_subexpression(&current_part.spanned(part_span), scope);
-                if error.is_none() {
-                    error = err;
-                }
-                head = Some(invoc.expr);
-            } else if current_part.starts_with('$') {
-                head = Some(Expression::variable(current_part, lite_arg.span));
-            } else if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-            } else {
-                let current_part = trim_quotes(&current_part);
-                output.push(UnspannedPathMember::String(current_part).into_path_member(part_span));
-            }
-        } else if let Ok(row_number) = current_part.parse::<i64>() {
-            output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-        } else {
-            let current_part = trim_quotes(&current_part);
-            output.push(UnspannedPathMember::String(current_part).into_path_member(part_span));
-        }
-    }
-
-    if let Some(head) = head {
-        (
-            SpannedExpression::new(
-                Expression::path(SpannedExpression::new(head, lite_arg.span), output),
-                lite_arg.span,
-            ),
-            error,
-        )
-    } else {
-        (
-            SpannedExpression::new(
-                Expression::path(
-                    SpannedExpression::new(
-                        Expression::variable("$it".into(), lite_arg.span),
-                        lite_arg.span,
-                    ),
-                    output,
-                ),
-                lite_arg.span,
-            ),
-            error,
-        )
-    }
-}
-
-/// Parse a numeric range
-fn parse_range(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    let lite_arg_span_start = lite_arg.span.start();
-    let lite_arg_len = lite_arg.item.len();
-    let (dotdot_pos, operator_str, operator) = if let Some(pos) = lite_arg.item.find("..<") {
-        (pos, "..<", RangeOperator::RightExclusive)
-    } else if let Some(pos) = lite_arg.item.find("..") {
-        (pos, "..", RangeOperator::Inclusive)
-    } else {
-        return (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("range", lite_arg.clone())),
-        );
-    };
-
-    if lite_arg.item[0..dotdot_pos].is_empty()
-        && lite_arg.item[(dotdot_pos + operator_str.len())..].is_empty()
-    {
-        return (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("range", lite_arg.clone())),
-        );
-    }
-
-    let numbers: Vec<_> = lite_arg.item.split(operator_str).collect();
-
-    if numbers.len() != 2 {
-        return (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("range", lite_arg.clone())),
-        );
-    }
-
-    let right_number_offset = operator_str.len();
-
-    let lhs = numbers[0].to_string().spanned(Span::new(
-        lite_arg_span_start,
-        lite_arg_span_start + dotdot_pos,
-    ));
-    let rhs = numbers[1].to_string().spanned(Span::new(
-        lite_arg_span_start + dotdot_pos + right_number_offset,
-        lite_arg_span_start + lite_arg_len,
-    ));
-
-    let left_hand_open = dotdot_pos == 0;
-    let right_hand_open = dotdot_pos == lite_arg_len - right_number_offset;
-
-    let left = if left_hand_open {
-        None
-    } else if let (left, None) = parse_arg(SyntaxShape::Number, scope, &lhs) {
-        Some(left)
-    } else {
-        return (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("range", lhs)),
-        );
-    };
-
-    let right = if right_hand_open {
-        None
-    } else if let (right, None) = parse_arg(SyntaxShape::Number, scope, &rhs) {
-        Some(right)
-    } else {
-        return (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("range", rhs)),
-        );
-    };
-
-    (
-        SpannedExpression::new(
-            Expression::range(
-                left,
-                operator.spanned(Span::new(
-                    lite_arg_span_start + dotdot_pos,
-                    lite_arg_span_start + dotdot_pos + right_number_offset,
-                )),
-                right,
-            ),
-            lite_arg.span,
-        ),
-        None,
-    )
-}
-
-/// Parse any allowed operator, including word-based operators
-fn parse_operator(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
-    let operator = match &lite_arg.item[..] {
-        "==" => Operator::Equal,
-        "!=" => Operator::NotEqual,
-        "<" => Operator::LessThan,
-        "<=" => Operator::LessThanOrEqual,
-        ">" => Operator::GreaterThan,
-        ">=" => Operator::GreaterThanOrEqual,
-        "=~" => Operator::Contains,
-        "!~" => Operator::NotContains,
-        "+" => Operator::Plus,
-        "-" => Operator::Minus,
-        "*" => Operator::Multiply,
-        "/" => Operator::Divide,
-        "in" => Operator::In,
-        "not-in" => Operator::NotIn,
-        "mod" => Operator::Modulo,
-        "&&" => Operator::And,
-        "||" => Operator::Or,
-        "**" => Operator::Pow,
-        _ => {
-            return (
-                garbage(lite_arg.span),
-                Some(ParseError::mismatch("operator", lite_arg.clone())),
-            );
-        }
-    };
-
-    (
-        SpannedExpression::new(Expression::operator(operator), lite_arg.span),
-        None,
-    )
-}
-
-/// Parse a duration type, eg '10day'
-fn parse_duration(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
-    fn parse_decimal_str_to_number(decimal: &str) -> Option<i64> {
-        let string_to_parse = format!("0.{}", decimal);
-        if let Ok(x) = string_to_parse.parse::<f64>() {
-            return Some((1_f64 / x) as i64);
-        }
-        None
-    }
-    let unit_groups = [
-        (Unit::Nanosecond, "NS", None),
-        (Unit::Microsecond, "US", Some((Unit::Nanosecond, 1000))),
-        (Unit::Millisecond, "MS", Some((Unit::Microsecond, 1000))),
-        (Unit::Second, "SEC", Some((Unit::Millisecond, 1000))),
-        (Unit::Minute, "MIN", Some((Unit::Second, 60))),
-        (Unit::Hour, "HR", Some((Unit::Minute, 60))),
-        (Unit::Day, "DAY", Some((Unit::Minute, 1440))),
-        (Unit::Week, "WK", Some((Unit::Day, 7))),
-    ];
-    if let Some(unit) = unit_groups
-        .iter()
-        .find(|&x| lite_arg.to_uppercase().ends_with(x.1))
-    {
-        let mut lhs = lite_arg.item.clone();
-        for _ in 0..unit.1.len() {
-            lhs.pop();
-        }
-
-        let input: Vec<&str> = lhs.split('.').collect();
-        let (value, unit_to_use) = match &input[..] {
-            [number_str] => (number_str.parse::<i64>().ok(), unit.0),
-            [number_str, decimal_part_str] => match unit.2 {
-                Some(unit_to_convert_to) => match (
-                    number_str.parse::<i64>(),
-                    parse_decimal_str_to_number(decimal_part_str),
-                ) {
-                    (Ok(number), Some(decimal_part)) => (
-                        Some(
-                            (number * unit_to_convert_to.1) + (unit_to_convert_to.1 / decimal_part),
-                        ),
-                        unit_to_convert_to.0,
-                    ),
-                    _ => (None, unit.0),
-                },
-                None => (None, unit.0),
-            },
-            _ => (None, unit.0),
-        };
-
-        if let Some(x) = value {
-            let lhs_span = Span::new(lite_arg.span.start(), lite_arg.span.start() + lhs.len());
-            let unit_span = Span::new(lite_arg.span.start() + lhs.len(), lite_arg.span.end());
-            return (
-                SpannedExpression::new(
-                    Expression::unit(x.spanned(lhs_span), unit_to_use.spanned(unit_span)),
-                    lite_arg.span,
-                ),
-                None,
-            );
-        }
-    }
-
-    (
-        garbage(lite_arg.span),
-        Some(ParseError::mismatch("duration", lite_arg.clone())),
-    )
-}
-
-/// Parse a unit type, eg '10kb'
-fn parse_filesize(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
-    fn parse_decimal_str_to_number(decimal: &str) -> Option<i64> {
-        let string_to_parse = format!("0.{}", decimal);
-        if let Ok(x) = string_to_parse.parse::<f64>() {
-            return Some((1_f64 / x) as i64);
-        }
-        None
-    }
-    let unit_groups = [
-        (Unit::Kilobyte, "KB", Some((Unit::Byte, 1000))),
-        (Unit::Megabyte, "MB", Some((Unit::Kilobyte, 1000))),
-        (Unit::Gigabyte, "GB", Some((Unit::Megabyte, 1000))),
-        (Unit::Terabyte, "TB", Some((Unit::Gigabyte, 1000))),
-        (Unit::Petabyte, "PB", Some((Unit::Terabyte, 1000))),
-        (Unit::Kibibyte, "KIB", Some((Unit::Byte, 1024))),
-        (Unit::Mebibyte, "MIB", Some((Unit::Kibibyte, 1024))),
-        (Unit::Gibibyte, "GIB", Some((Unit::Mebibyte, 1024))),
-        (Unit::Tebibyte, "TIB", Some((Unit::Gibibyte, 1024))),
-        (Unit::Pebibyte, "PIB", Some((Unit::Tebibyte, 1024))),
-        (Unit::Byte, "B", None),
-    ];
-    if let Some(unit) = unit_groups
-        .iter()
-        .find(|&x| lite_arg.to_uppercase().ends_with(x.1))
-    {
-        let mut lhs = lite_arg.item.clone();
-        for _ in 0..unit.1.len() {
-            lhs.pop();
-        }
-
-        let input: Vec<&str> = lhs.split('.').collect();
-        let (value, unit_to_use) = match &input[..] {
-            [number_str] => (number_str.parse::<i64>().ok(), unit.0),
-            [number_str, decimal_part_str] => match unit.2 {
-                Some(unit_to_convert_to) => match (
-                    number_str.parse::<i64>(),
-                    parse_decimal_str_to_number(decimal_part_str),
-                ) {
-                    (Ok(number), Some(decimal_part)) => (
-                        Some(
-                            (number * unit_to_convert_to.1) + (unit_to_convert_to.1 / decimal_part),
-                        ),
-                        unit_to_convert_to.0,
-                    ),
-                    _ => (None, unit.0),
-                },
-                None => (None, unit.0),
-            },
-            _ => (None, unit.0),
-        };
-
-        if let Some(x) = value {
-            let lhs_span = Span::new(lite_arg.span.start(), lite_arg.span.start() + lhs.len());
-            let unit_span = Span::new(lite_arg.span.start() + lhs.len(), lite_arg.span.end());
-            return (
-                SpannedExpression::new(
-                    Expression::unit(x.spanned(lhs_span), unit_to_use.spanned(unit_span)),
-                    lite_arg.span,
-                ),
-                None,
-            );
-        }
-    }
-
-    (
-        garbage(lite_arg.span),
-        Some(ParseError::mismatch("unit", lite_arg.clone())),
-    )
-}
-
-fn parse_subexpression(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    let mut error = None;
-
-    let string: String = lite_arg
-        .item
-        .chars()
-        .skip(1)
-        .take(lite_arg.item.chars().count() - 2)
-        .collect();
-
-    // We haven't done much with the inner string, so let's go ahead and work with it
-    let (tokens, err) = lex(&string, lite_arg.span.start() + 1, NewlineMode::Whitespace);
-    if error.is_none() {
-        error = err;
-    };
-    let (lite_block, err) = parse_block(tokens);
-    if error.is_none() {
-        error = err;
-    };
-
-    scope.enter_scope();
-    let (classified_block, err) = classify_block(&lite_block, scope);
-    if error.is_none() {
-        error = err;
-    };
-    scope.exit_scope();
-
-    (
-        SpannedExpression::new(Expression::Subexpression(classified_block), lite_arg.span),
-        error,
-    )
-}
-
-fn parse_variable(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    if lite_arg.item == "$it" {
-        trace!("parsing $it");
-        parse_full_column_path(lite_arg, scope)
-    } else {
-        (
-            SpannedExpression::new(
-                Expression::variable(lite_arg.item.clone(), lite_arg.span),
-                lite_arg.span,
-            ),
-            None,
-        )
-    }
-}
-/// Parses the given lite_arg starting with dollar returning
-/// a expression starting with $
-/// Currently either Variable, String interpolation, FullColumnPath
-fn parse_dollar_expr(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    trace!("Parsing dollar expression: {:?}", lite_arg.item);
-    if (lite_arg.item.starts_with("$\"") && lite_arg.item.len() > 1 && lite_arg.item.ends_with('"'))
-        || (lite_arg.item.starts_with("$'")
-            && lite_arg.item.len() > 1
-            && lite_arg.item.ends_with('\''))
-    {
-        // This is an interpolated string
-        parse_interpolated_string(lite_arg, scope)
-    } else if let (expr, None) = parse_range(lite_arg, scope) {
-        (expr, None)
-    } else if let (expr, None) = parse_full_column_path(lite_arg, scope) {
-        (expr, None)
-    } else {
-        parse_variable(lite_arg, scope)
-    }
-}
-
-#[derive(Debug)]
-enum FormatCommand {
-    Text(Spanned<String>),
-    Column(Spanned<String>),
-}
-
-fn format(input: &str, start: usize) -> (Vec<FormatCommand>, Option<ParseError>) {
-    let original_start = start;
-    let mut output = vec![];
-    let mut error = None;
-
-    let mut loop_input = input.chars().peekable();
-    let mut start = start;
-    let mut end = start;
-    loop {
-        let mut before = String::new();
-
-        loop {
-            end += 1;
-            if let Some(c) = loop_input.next() {
-                if c == '(' {
-                    break;
-                }
-                before.push(c);
-            } else {
-                break;
-            }
-        }
-
-        if !before.is_empty() {
-            output.push(FormatCommand::Text(
-                before.to_string().spanned(Span::new(start, end - 1)),
-            ));
-        }
-        // Look for column as we're now at one
-        let mut column = String::new();
-        start = end;
-
-        let mut found_end = false;
-        let mut delimiter_stack = vec![')'];
-
-        for c in &mut loop_input {
-            end += 1;
-            if let Some('\'') = delimiter_stack.last() {
-                if c == '\'' {
-                    delimiter_stack.pop();
-                }
-            } else if let Some('"') = delimiter_stack.last() {
-                if c == '"' {
-                    delimiter_stack.pop();
-                }
-            } else if c == '\'' {
-                delimiter_stack.push('\'');
-            } else if c == '"' {
-                delimiter_stack.push('"');
-            } else if c == '(' {
-                delimiter_stack.push(')');
-            } else if c == ')' {
-                if let Some(')') = delimiter_stack.last() {
-                    delimiter_stack.pop();
-                }
-                if delimiter_stack.is_empty() {
-                    found_end = true;
-                    break;
-                }
-            }
-            column.push(c);
-        }
-
-        if !column.is_empty() {
-            output.push(FormatCommand::Column(
-                column.to_string().spanned(Span::new(start, end)),
-            ));
-        }
-
-        if column.is_empty() {
-            break;
-        }
-
-        if !found_end {
-            error = Some(ParseError::argument_error(
-                input.spanned(Span::new(original_start, end)),
-                ArgumentError::MissingValueForName("unclosed ()".to_string()),
-            ));
-        }
-
-        start = end;
-    }
-
-    (output, error)
-}
-
-/// Parses an interpolated string, one that has expressions inside of it
-fn parse_interpolated_string(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    trace!("Parse_interpolated_string");
-    let string_len = lite_arg.item.chars().count();
-    let inner_string = lite_arg
-        .item
-        .chars()
-        .skip(2)
-        .take(string_len - 3)
-        .collect::<String>();
-    let mut error = None;
-
-    let (format_result, err) = format(&inner_string, lite_arg.span.start() + 2);
-
-    if error.is_none() {
-        error = err;
-    }
-
-    let mut output = vec![];
-
-    for f in format_result {
-        match f {
-            FormatCommand::Text(t) => {
-                output.push(SpannedExpression {
-                    expr: Expression::Literal(hir::Literal::String(t.item)),
-                    span: t.span,
-                });
-            }
-            FormatCommand::Column(c) => {
-                let result = parse(&c, c.span.start(), scope);
-                match result {
-                    (classified_block, None) => {
-                        output.push(SpannedExpression {
-                            expr: Expression::Subexpression(classified_block),
-                            span: c.span,
-                        });
-                    }
-                    (_, Some(err)) => {
-                        return (garbage(c.span), Some(err));
-                    }
-                }
-            }
-        }
-    }
-
-    let pipelines = vec![Pipeline {
-        span: lite_arg.span,
-        list: vec![ClassifiedCommand::Internal(InternalCommand {
-            name: "build-string".to_owned(),
-            name_span: lite_arg.span,
-            args: hir::Call {
-                head: Box::new(SpannedExpression {
-                    expr: Expression::Synthetic(hir::Synthetic::String("build-string".to_owned())),
-                    span: lite_arg.span,
-                }),
-                external_redirection: ExternalRedirection::Stdout,
-                named: None,
-                positional: Some(output),
-                span: lite_arg.span,
-            },
-        })],
-    }];
-
-    let group = Group::new(pipelines, lite_arg.span);
-
-    let call = SpannedExpression {
-        expr: Expression::Subexpression(Arc::new(Block::new(
-            Signature::new("<subexpression>"),
-            vec![group],
-            IndexMap::new(),
-            lite_arg.span,
-        ))),
-        span: lite_arg.span,
-    };
-
-    (call, error)
-}
-
-/// Parses the given argument using the shape as a guide for how to correctly parse the argument
-fn parse_external_arg(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (SpannedExpression, Option<ParseError>) {
-    if lite_arg.item.starts_with('$') {
-        parse_dollar_expr(lite_arg, scope)
-    } else if lite_arg.item.starts_with('(') {
-        parse_full_column_path(lite_arg, scope)
-    } else {
-        (
-            SpannedExpression::new(Expression::string(lite_arg.item.clone()), lite_arg.span),
-            None,
-        )
-    }
-}
-
-fn parse_list(
-    lite_block: &LiteBlock,
-    scope: &dyn ParserScope,
-) -> (Vec<SpannedExpression>, Option<ParseError>) {
-    let mut error = None;
-
-    if lite_block.block.is_empty() {
-        return (vec![], None);
-    }
-    let lite_pipeline = &lite_block.block[0];
-    let mut output = vec![];
-    for lite_pipeline in &lite_pipeline.pipelines {
-        for lite_inner in &lite_pipeline.commands {
-            for part in &lite_inner.parts {
-                let item = if part.ends_with(',') {
-                    let mut str: String = part.item.clone();
-                    str.pop();
-                    str.spanned(Span::new(part.span.start(), part.span.end() - 1))
-                } else {
-                    part.clone()
-                };
-                let (part, err) = parse_arg(SyntaxShape::Any, scope, &item);
-                output.push(part);
-
-                if error.is_none() {
-                    error = err;
-                }
-            }
-        }
-    }
-
-    (output, error)
-}
-
-fn parse_table(
-    lite_block: &LiteBlock,
-    scope: &dyn ParserScope,
-    span: Span,
-) -> (SpannedExpression, Option<ParseError>) {
-    let mut error = None;
-    let mut output = vec![];
-
-    // Header
-    let lite_group = &lite_block.block[0];
-    let lite_pipeline = &lite_group.pipelines[0];
-    let lite_inner = &lite_pipeline.commands[0];
-
-    let (string, err) = verify_and_strip(&lite_inner.parts[0], '[', ']');
-    if error.is_none() {
-        error = err;
-    }
-
-    let (tokens, err) = lex(
-        &string,
-        lite_inner.parts[0].span.start() + 1,
-        NewlineMode::Whitespace,
-    );
-    if err.is_some() {
-        return (garbage(lite_inner.span()), err);
-    }
-
-    let (lite_header, err) = parse_block(tokens);
-    if err.is_some() {
-        return (garbage(lite_inner.span()), err);
-    }
-
-    let (headers, err) = parse_list(&lite_header, scope);
-    if error.is_none() {
-        error = err;
-    }
-
-    // Cells
-    let lite_rows = &lite_group.pipelines[1];
-    let lite_cells = &lite_rows.commands[0];
-
-    for arg in &lite_cells.parts {
-        let (string, err) = verify_and_strip(arg, '[', ']');
-        if error.is_none() {
-            error = err;
-        }
-        let (tokens, err) = lex(&string, arg.span.start() + 1, NewlineMode::Whitespace);
-        if err.is_some() {
-            return (garbage(arg.span), err);
-        }
-        let (lite_cell, err) = parse_block(tokens);
-        if err.is_some() {
-            return (garbage(arg.span), err);
-        }
-        let (inner_cell, err) = parse_list(&lite_cell, scope);
-        if error.is_none() {
-            error = err;
-        }
-        output.push(inner_cell);
-    }
-
-    (
-        SpannedExpression::new(Expression::Table(headers, output), span),
-        error,
-    )
-}
-
-fn parse_int(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
-    if lite_arg.item.starts_with("0x") {
-        if let Ok(v) = i64::from_str_radix(&lite_arg.item[2..], 16) {
-            (
-                SpannedExpression::new(Expression::integer(v), lite_arg.span),
-                None,
-            )
-        } else {
-            (
-                garbage(lite_arg.span),
-                Some(ParseError::mismatch("int", lite_arg.clone())),
-            )
-        }
-    } else if lite_arg.item.starts_with("0b") {
-        if let Ok(v) = i64::from_str_radix(&lite_arg.item[2..], 2) {
-            (
-                SpannedExpression::new(Expression::integer(v), lite_arg.span),
-                None,
-            )
-        } else {
-            (
-                garbage(lite_arg.span),
-                Some(ParseError::mismatch("int", lite_arg.clone())),
-            )
-        }
-    } else if lite_arg.item.starts_with("0o") {
-        if let Ok(v) = i64::from_str_radix(&lite_arg.item[2..], 8) {
-            (
-                SpannedExpression::new(Expression::integer(v), lite_arg.span),
-                None,
-            )
-        } else {
-            (
-                garbage(lite_arg.span),
-                Some(ParseError::mismatch("int", lite_arg.clone())),
-            )
-        }
-    } else if let Ok(x) = lite_arg.item.parse::<i64>() {
-        (
-            SpannedExpression::new(Expression::integer(x), lite_arg.span),
-            None,
-        )
-    } else {
-        (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("int", lite_arg.clone())),
-        )
-    }
-}
-
-/// Parses the given argument using the shape as a guide for how to correctly parse the argument
-fn parse_arg(
-    expected_type: SyntaxShape,
-    scope: &dyn ParserScope,
-    lite_arg: &Spanned<String>,
-) -> (SpannedExpression, Option<ParseError>) {
-    if lite_arg.item.starts_with('$') {
-        return parse_dollar_expr(lite_arg, scope);
-    }
-
-    // before anything else, try to see if this is a number in parenthesis
-    if lite_arg.item.starts_with('(') {
-        return parse_full_column_path(lite_arg, scope);
-    }
-
-    match expected_type {
-        SyntaxShape::Number => {
-            if let (x, None) = parse_int(lite_arg) {
-                (x, None)
-            } else if let Ok(x) = lite_arg.item.parse::<BigInt>() {
-                (
-                    SpannedExpression::new(Expression::big_integer(x), lite_arg.span),
-                    None,
-                )
-            } else if let Ok(x) = lite_arg.item.parse::<BigDecimal>() {
-                (
-                    SpannedExpression::new(Expression::decimal(x), lite_arg.span),
-                    None,
-                )
-            } else {
-                (
-                    garbage(lite_arg.span),
-                    Some(ParseError::mismatch("number", lite_arg.clone())),
-                )
-            }
-        }
-        SyntaxShape::Int => {
-            if let Ok(x) = lite_arg.item.parse::<i64>() {
-                (
-                    SpannedExpression::new(Expression::integer(x), lite_arg.span),
-                    None,
-                )
-            } else if let Ok(x) = lite_arg.item.parse::<BigInt>() {
-                (
-                    SpannedExpression::new(Expression::big_integer(x), lite_arg.span),
-                    None,
-                )
-            } else {
-                (
-                    garbage(lite_arg.span),
-                    Some(ParseError::mismatch("int", lite_arg.clone())),
-                )
-            }
-        }
-        SyntaxShape::String => {
-            let trimmed = trim_quotes(&lite_arg.item);
-            (
-                SpannedExpression::new(Expression::string(trimmed), lite_arg.span),
-                None,
-            )
-        }
-        SyntaxShape::GlobPattern => {
-            let trimmed = trim_quotes(&lite_arg.item);
-            let expanded = expand_path(trimmed).to_string_lossy().to_string();
-            (
-                SpannedExpression::new(Expression::glob_pattern(expanded), lite_arg.span),
-                None,
-            )
-        }
-
-        SyntaxShape::Range => parse_range(lite_arg, scope),
-        SyntaxShape::Operator => (
-            garbage(lite_arg.span),
-            Some(ParseError::mismatch("operator", lite_arg.clone())),
-        ),
-        SyntaxShape::Filesize => parse_filesize(lite_arg),
-        SyntaxShape::Duration => parse_duration(lite_arg),
-        SyntaxShape::FilePath => {
-            let trimmed = trim_quotes(&lite_arg.item);
-            let path = PathBuf::from(trimmed);
-            let expanded = expand_path(path);
-            (
-                SpannedExpression::new(Expression::FilePath(expanded), lite_arg.span),
-                None,
-            )
-        }
-        SyntaxShape::ColumnPath => parse_simple_column_path(lite_arg),
-        SyntaxShape::FullColumnPath => parse_full_column_path(lite_arg, scope),
-        SyntaxShape::Any => {
-            let shapes = vec![
-                SyntaxShape::Int,
-                SyntaxShape::Number,
-                SyntaxShape::Range,
-                SyntaxShape::Filesize,
-                SyntaxShape::Duration,
-                SyntaxShape::Block,
-                SyntaxShape::Table,
-                SyntaxShape::String,
-            ];
-            for shape in &shapes {
-                if let (s, None) = parse_arg(*shape, scope, lite_arg) {
-                    return (s, None);
-                }
-            }
-            (
-                garbage(lite_arg.span),
-                Some(ParseError::mismatch("any shape", lite_arg.clone())),
-            )
-        }
-        SyntaxShape::Table => {
-            let mut chars = lite_arg.item.chars();
-
-            match (chars.next(), chars.next_back()) {
-                (Some('['), Some(']')) => {
-                    // We have a literal row
-                    let string: String = chars.collect();
-
-                    // We haven't done much with the inner string, so let's go ahead and work with it
-                    let (tokens, err) =
-                        lex(&string, lite_arg.span.start() + 1, NewlineMode::Whitespace);
-                    if err.is_some() {
-                        return (garbage(lite_arg.span), err);
-                    }
-
-                    let (lite_block, err) = parse_block(tokens);
-                    if err.is_some() {
-                        return (garbage(lite_arg.span), err);
-                    }
-
-                    let lite_groups = &lite_block.block;
-
-                    if lite_groups.is_empty() {
-                        return (
-                            SpannedExpression::new(Expression::List(vec![]), lite_arg.span),
-                            None,
-                        );
-                    }
-                    if lite_groups[0].pipelines.len() == 1 {
-                        let (items, err) = parse_list(&lite_block, scope);
-                        (
-                            SpannedExpression::new(Expression::List(items), lite_arg.span),
-                            err,
-                        )
-                    } else if lite_groups[0].pipelines.len() == 2 {
-                        parse_table(&lite_block, scope, lite_arg.span)
-                    } else {
-                        (
-                            garbage(lite_arg.span),
-                            Some(ParseError::mismatch(
-                                "list or table",
-                                "unknown".to_string().spanned(lite_arg.span),
-                            )),
-                        )
-                    }
-                }
-                _ => (
-                    garbage(lite_arg.span),
-                    Some(ParseError::mismatch("table", lite_arg.clone())),
-                ),
-            }
-        }
-        SyntaxShape::MathExpression => parse_arg(SyntaxShape::Any, scope, lite_arg),
-
-        SyntaxShape::Block | SyntaxShape::RowCondition => {
-            // Blocks have one of two forms: the literal block and the implied block
-            // To parse a literal block, we need to detect that what we have is itself a block
-            let mut chars: Vec<_> = lite_arg.item.chars().collect();
-
-            match chars.first() {
-                Some('{') => {
-                    let mut error = None;
-
-                    if let Some('}') = chars.last() {
-                        chars = chars[1..(chars.len() - 1)].to_vec();
-                    } else {
-                        chars = chars[1..].to_vec();
-                        error = Some(ParseError::unclosed(
-                            "}".into(),
-                            Span::new(lite_arg.span.end(), lite_arg.span.end()),
-                        ));
-                    }
-                    // We have a literal block
-                    let string: String = chars.into_iter().collect();
-
-                    // We haven't done much with the inner string, so let's go ahead and work with it
-                    let (mut tokens, err) =
-                        lex(&string, lite_arg.span.start() + 1, NewlineMode::Normal);
-                    if error.is_none() {
-                        error = err;
-                    }
-
-                    // Check to see if we have parameters
-                    let params = if matches!(
-                        tokens.first(),
-                        Some(Token {
-                            contents: TokenContents::Pipe,
-                            ..
-                        })
-                    ) {
-                        // We've found a parameter list
-                        let mut param_tokens = vec![];
-                        let mut token_iter = tokens.into_iter().skip(1);
-                        for token in &mut token_iter {
-                            if matches!(
-                                token,
-                                Token {
-                                    contents: TokenContents::Pipe,
-                                    ..
-                                }
-                            ) {
-                                break;
-                            } else {
-                                param_tokens.push(token);
-                            }
-                        }
-                        let split_tokens =
-                            lex_split_baseline_tokens_on(param_tokens, &[',', ':', '?']);
-
-                        let mut i = 0;
-                        let mut params = vec![];
-
-                        while i < split_tokens.len() {
-                            let (parameter, advance_by, error) =
-                                parse_parameter(&split_tokens[i..], split_tokens[i].span);
-
-                            if error.is_some() {
-                                return (garbage(lite_arg.span), error);
-                            }
-                            i += advance_by;
-                            params.push(parameter);
-                        }
-
-                        tokens = token_iter.collect();
-                        if tokens.is_empty() {
-                            return (
-                                garbage(lite_arg.span),
-                                Some(ParseError::mismatch(
-                                    "block with parameters",
-                                    lite_arg.clone(),
-                                )),
-                            );
-                        }
-                        params
-                    } else {
-                        vec![]
-                    };
-
-                    let (lite_block, err) = parse_block(tokens);
-                    if error.is_none() {
-                        error = err;
-                    }
-
-                    scope.enter_scope();
-                    let (mut classified_block, err) = classify_block(&lite_block, scope);
-                    if error.is_none() {
-                        error = err;
-                    }
-                    scope.exit_scope();
-
-                    if let Some(classified_block) = Arc::get_mut(&mut classified_block) {
-                        classified_block.span = lite_arg.span;
-                        if !params.is_empty() {
-                            classified_block.params.positional.clear();
-                            for param in params {
-                                classified_block
-                                    .params
-                                    .positional
-                                    .push((param.pos_type, param.desc.unwrap_or_default()));
-                            }
-                        }
-                    }
-
-                    (
-                        SpannedExpression::new(Expression::Block(classified_block), lite_arg.span),
-                        error,
-                    )
-                }
-                _ => {
-                    // We have an implied block, but we can't parse this here
-                    // it needed to have been parsed up higher where we have control over more than one arg
-                    (
-                        garbage(lite_arg.span),
-                        Some(ParseError::mismatch("block", lite_arg.clone())),
-                    )
-                }
-            }
-        }
-    }
-}
-
-/// This is a bit of a "fix-up" of previously parsed areas. In cases where we're in shorthand mode (eg in the `where` command), we need
-/// to use the original source to parse a column path. Without it, we'll lose a little too much information to parse it correctly. As we'll
-/// only know we were on the left-hand side of an expression after we do the full math parse, we need to do this step after rather than during
-/// the initial parse.
-fn shorthand_reparse(
-    left: SpannedExpression,
-    orig_left: Option<Spanned<String>>,
-    scope: &dyn ParserScope,
-    shorthand_mode: bool,
-) -> (SpannedExpression, Option<ParseError>) {
-    // If we're in shorthand mode, we need to reparse the left-hand side if possible
-    if shorthand_mode {
-        if let Some(orig_left) = orig_left {
-            parse_arg(SyntaxShape::FullColumnPath, scope, &orig_left)
-        } else {
-            (left, None)
-        }
-    } else {
-        (left, None)
-    }
-}
-
-fn parse_possibly_parenthesized(
-    lite_arg: &Spanned<String>,
-    scope: &dyn ParserScope,
-) -> (
-    (Option<Spanned<String>>, SpannedExpression),
-    Option<ParseError>,
-) {
-    let (lhs, err) = parse_arg(SyntaxShape::Any, scope, lite_arg);
-    ((Some(lite_arg.clone()), lhs), err)
-}
-
-/// Handle parsing math expressions, complete with working with the precedence of the operators
-pub fn parse_math_expression(
-    incoming_idx: usize,
-    lite_args: &[Spanned<String>],
-    scope: &dyn ParserScope,
-    shorthand_mode: bool,
-) -> (usize, SpannedExpression, Option<ParseError>) {
-    // Precedence parsing is included
-    // shorthand_mode means that the left-hand side of an expression can point to a column-path.
-    // To make this possible, we parse as normal, but then go back and when we detect a
-    // left-hand side, reparse that value if it's a string
-
-    let mut idx = 0;
-    let mut error = None;
-
-    let mut working_exprs = vec![];
-    let mut prec = vec![];
-
-    let (lhs_working_expr, err) = parse_possibly_parenthesized(&lite_args[idx], scope);
-
-    if error.is_none() {
-        error = err;
-    }
-    working_exprs.push(lhs_working_expr);
-
-    idx += 1;
-
-    prec.push(0);
-
-    while idx < lite_args.len() {
-        let (op, err) = parse_operator(&lite_args[idx]);
-        if error.is_none() {
-            error = err;
-        }
-        idx += 1;
-
-        if idx == lite_args.len() {
-            if error.is_none() {
-                error = Some(ParseError::argument_error(
-                    lite_args[idx - 1].clone(),
-                    ArgumentError::MissingMandatoryPositional("right hand side".into()),
-                ));
-            }
-            working_exprs.push((None, garbage(op.span)));
-            working_exprs.push((None, garbage(op.span)));
-            prec.push(0);
-            break;
-        }
-
-        trace!(
-            "idx: {} working_exprs: {:#?} prec: {:?}",
-            idx,
-            working_exprs,
-            prec
-        );
-
-        let (rhs_working_expr, err) = parse_possibly_parenthesized(&lite_args[idx], scope);
-
-        if error.is_none() {
-            error = err;
-        }
-
-        let next_prec = op.precedence();
-
-        if !prec.is_empty() && next_prec > *prec.last().expect("this shouldn't happen") {
-            prec.push(next_prec);
-            working_exprs.push((None, op));
-            working_exprs.push(rhs_working_expr);
-            idx += 1;
-            continue;
-        }
-        while !prec.is_empty()
-                    && *prec.last().expect("This shouldn't happen") >= next_prec
-                    && next_prec > 0 // Not garbage
-                    && working_exprs.len() >= 3
-        {
-            // Pop 3 and create and expression, push and repeat
-            trace!(
-                "idx: {} working_exprs: {:#?} prec: {:?}",
-                idx,
-                working_exprs,
-                prec
-            );
-            let (_, right) = working_exprs.pop().expect("This shouldn't be possible");
-            let (_, op) = working_exprs.pop().expect("This shouldn't be possible");
-            let (orig_left, left) = working_exprs.pop().expect("This shouldn't be possible");
-
-            // If we're in shorthand mode, we need to reparse the left-hand side if possible
-            let (left, err) = shorthand_reparse(left, orig_left, scope, shorthand_mode);
-            if error.is_none() {
-                error = err;
-            }
-
-            let span = Span::new(left.span.start(), right.span.end());
-            working_exprs.push((
-                None,
-                SpannedExpression {
-                    expr: Expression::Binary(Box::new(Binary { left, op, right })),
-                    span,
-                },
-            ));
-            prec.pop();
-        }
-        working_exprs.push((None, op));
-        working_exprs.push(rhs_working_expr);
-        prec.push(next_prec);
-
-        idx += 1;
-    }
-
-    while working_exprs.len() >= 3 {
-        // Pop 3 and create and expression, push and repeat
-        let (_, right) = working_exprs.pop().expect("This shouldn't be possible");
-        let (_, op) = working_exprs.pop().expect("This shouldn't be possible");
-        let (orig_left, left) = working_exprs.pop().expect("This shouldn't be possible");
-
-        let (left, err) = shorthand_reparse(left, orig_left, scope, shorthand_mode);
-        if error.is_none() {
-            error = err;
-        }
-
-        let span = Span::new(left.span.start(), right.span.end());
-        working_exprs.push((
-            None,
-            SpannedExpression {
-                expr: Expression::Binary(Box::new(Binary { left, op, right })),
-                span,
-            },
-        ));
-    }
-
-    let (orig_left, left) = working_exprs.pop().expect("This shouldn't be possible");
-    let (left, err) = shorthand_reparse(left, orig_left, scope, shorthand_mode);
-    if error.is_none() {
-        error = err;
-    }
-
-    (incoming_idx + idx, left, error)
-}
-
-/// Handles parsing the positional arguments as a batch
-/// This allows us to check for times where multiple arguments are treated as one shape, as is the case with SyntaxShape::Math
-fn parse_positional_argument(
-    idx: usize,
-    lite_cmd: &LiteCommand,
-    positional_type: &PositionalType,
-    remaining_positionals: usize,
-    scope: &dyn ParserScope,
-) -> (usize, SpannedExpression, Option<ParseError>) {
-    let mut idx = idx;
-    let mut error = None;
-    let arg = match positional_type {
-        PositionalType::Mandatory(_, SyntaxShape::MathExpression)
-        | PositionalType::Optional(_, SyntaxShape::MathExpression) => {
-            let end_idx = if (lite_cmd.parts.len() - 1) > remaining_positionals {
-                lite_cmd.parts.len() - remaining_positionals
-            } else {
-                lite_cmd.parts.len()
-            };
-
-            let (new_idx, arg, err) =
-                parse_math_expression(idx, &lite_cmd.parts[idx..end_idx], scope, false);
-
-            let span = arg.span;
-            let mut commands = hir::Pipeline::new(span);
-            commands.push(ClassifiedCommand::Expr(Box::new(arg)));
-
-            let block = hir::Block::new(
-                Signature::new("<initializer>"),
-                vec![Group::new(vec![commands], lite_cmd.span())],
-                IndexMap::new(),
-                span,
-            );
-
-            let arg = SpannedExpression::new(Expression::Block(Arc::new(block)), span);
-
-            idx = new_idx - 1;
-            if error.is_none() {
-                error = err;
-            }
-            arg
-        }
-        PositionalType::Mandatory(_, SyntaxShape::RowCondition)
-        | PositionalType::Optional(_, SyntaxShape::RowCondition) => {
-            // A condition can take up multiple arguments, as we build the operation as <arg> <operator> <arg>
-            // We need to do this here because in parse_arg, we have access to only one arg at a time
-
-            if idx < lite_cmd.parts.len() {
-                if lite_cmd.parts[idx].item.starts_with('{') {
-                    // It's an explicit math expression, so parse it deeper in
-                    let (arg, err) =
-                        parse_arg(SyntaxShape::RowCondition, scope, &lite_cmd.parts[idx]);
-                    if error.is_none() {
-                        error = err;
-                    }
-                    arg
-                } else {
-                    let end_idx = if (lite_cmd.parts.len() - 1) > remaining_positionals {
-                        lite_cmd.parts.len() - remaining_positionals
-                    } else {
-                        lite_cmd.parts.len()
-                    };
-
-                    let (new_idx, arg, err) =
-                        parse_math_expression(idx, &lite_cmd.parts[idx..end_idx], scope, true);
-
-                    let span = arg.span;
-                    let mut commands = hir::Pipeline::new(span);
-                    commands.push(ClassifiedCommand::Expr(Box::new(arg)));
-
-                    let mut block = hir::Block::new(
-                        Signature::new("<cond>"),
-                        vec![Group::new(vec![commands], lite_cmd.span())],
-                        IndexMap::new(),
-                        span,
-                    );
-
-                    block.infer_params();
-
-                    let arg = SpannedExpression::new(Expression::Block(Arc::new(block)), span);
-
-                    idx = new_idx - 1;
-                    if error.is_none() {
-                        error = err;
-                    }
-                    arg
-                }
-            } else {
-                if error.is_none() {
-                    error = Some(ParseError::argument_error(
-                        lite_cmd.parts[0].clone(),
-                        ArgumentError::MissingMandatoryPositional("condition".into()),
-                    ))
-                }
-                garbage(lite_cmd.span())
-            }
-        }
-        PositionalType::Mandatory(_, shape) | PositionalType::Optional(_, shape) => {
-            let (arg, err) = parse_arg(*shape, scope, &lite_cmd.parts[idx]);
-            if error.is_none() {
-                error = err;
-            }
-            arg
-        }
-    };
-
-    (idx, arg, error)
-}
-
-/// Does a full parse of an internal command using the lite-ly parse command as a starting point
-/// This main focus at this level is to understand what flags were passed in, what positional arguments were passed in, what rest arguments were passed in
-/// and to ensure that the basic requirements in terms of number of each were met.
-fn parse_internal_command(
-    lite_cmd: &LiteCommand,
-    scope: &dyn ParserScope,
-    signature: &Signature,
-    mut idx: usize,
-) -> (InternalCommand, Option<ParseError>) {
-    // This is a known internal command, so we need to work with the arguments and parse them according to the expected types
-
-    let (name, name_span) = (
-        lite_cmd.parts[0..(idx + 1)]
-            .iter()
-            .map(|x| x.item.clone())
-            .collect::<Vec<String>>()
-            .join(" "),
-        Span::new(
-            lite_cmd.parts[0].span.start(),
-            lite_cmd.parts[idx].span.end(),
-        ),
-    );
-
-    let mut internal_command = InternalCommand::new(name, name_span, lite_cmd.span());
-    internal_command.args.set_initial_flags(signature);
-
-    let mut current_positional = 0;
-    let mut named = NamedArguments::new();
-    let mut positional = vec![];
-    let mut error = None;
-    idx += 1; // Start where the arguments begin
-
-    while idx < lite_cmd.parts.len() {
-        if lite_cmd.parts[idx].item.starts_with('-') && lite_cmd.parts[idx].item.len() > 1 {
-            let (named_types, err) = super::flag::get_flag_signature_spec(
-                signature,
-                &internal_command,
-                &lite_cmd.parts[idx],
-            );
-
-            if err.is_none() {
-                for (full_name, named_type) in &named_types {
-                    match named_type {
-                        NamedType::Mandatory(_, shape) | NamedType::Optional(_, shape) => {
-                            if lite_cmd.parts[idx].item.contains('=') {
-                                let mut offset = 0;
-
-                                let value = lite_cmd.parts[idx]
-                                    .item
-                                    .chars()
-                                    .skip_while(|prop| {
-                                        offset += 1;
-                                        *prop != '='
-                                    })
-                                    .nth(1);
-
-                                offset = if value.is_none() { offset - 1 } else { offset };
-
-                                let flag_value = Span::new(
-                                    lite_cmd.parts[idx].span.start() + offset,
-                                    lite_cmd.parts[idx].span.end(),
-                                );
-                                let value = lite_cmd.parts[idx].item[offset..]
-                                    .to_string()
-                                    .spanned(flag_value);
-                                let (arg, err) = parse_arg(*shape, scope, &value);
-                                named.insert_mandatory(
-                                    full_name.clone(),
-                                    lite_cmd.parts[idx].span,
-                                    arg,
-                                );
-
-                                if error.is_none() {
-                                    error = err;
-                                }
-                            } else if idx == lite_cmd.parts.len() {
-                                // Oops, we're missing the argument to our named argument
-                                if error.is_none() {
-                                    error = Some(ParseError::argument_error(
-                                        lite_cmd.parts[0].clone(),
-                                        ArgumentError::MissingValueForName(format!("{:?}", shape)),
-                                    ));
-                                }
-                            } else {
-                                idx += 1;
-                                if lite_cmd.parts.len() > idx {
-                                    let (arg, err) = parse_arg(*shape, scope, &lite_cmd.parts[idx]);
-                                    named.insert_mandatory(
-                                        full_name.clone(),
-                                        lite_cmd.parts[idx - 1].span,
-                                        arg,
-                                    );
-
-                                    if error.is_none() {
-                                        error = err;
-                                    }
-                                } else {
-                                    if error.is_none() {
-                                        error = Some(ParseError::argument_error(
-                                            lite_cmd.parts[0].clone(),
-                                            ArgumentError::MissingValueForName(
-                                                full_name.to_owned(),
-                                            ),
-                                        ));
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                        NamedType::Switch(_) => {
-                            named.insert_switch(
-                                full_name.clone(),
-                                Some(Flag::new(FlagKind::Longhand, lite_cmd.parts[idx].span)),
-                            );
-                        }
-                    }
-                }
-            } else {
-                positional.push(garbage(lite_cmd.parts[idx].span));
-
-                if error.is_none() {
-                    error = err;
-                }
-            }
-        } else if signature.positional.len() > current_positional {
-            let arg = {
-                let (new_idx, expr, err) = parse_positional_argument(
-                    idx,
-                    lite_cmd,
-                    &signature.positional[current_positional].0,
-                    signature.positional.len() - current_positional - 1,
-                    scope,
-                );
-                idx = new_idx;
-                if error.is_none() {
-                    error = err;
-                }
-                expr
-            };
-
-            positional.push(arg);
-            current_positional += 1;
-        } else if let Some((_, rest_type, _)) = &signature.rest_positional {
-            let (arg, err) = parse_arg(*rest_type, scope, &lite_cmd.parts[idx]);
-            if error.is_none() {
-                error = err;
-            }
-
-            positional.push(arg);
-            current_positional += 1;
-        } else {
-            positional.push(garbage(lite_cmd.parts[idx].span));
-
-            if error.is_none() {
-                error = Some(ParseError::argument_error(
-                    lite_cmd.parts[0].clone(),
-                    ArgumentError::UnexpectedArgument(lite_cmd.parts[idx].clone()),
-                ));
-            }
-        }
-
-        idx += 1;
-    }
-
-    // Count the required positional arguments and ensure these have been met
-    let mut required_arg_count = 0;
-    for positional_arg in &signature.positional {
-        if let PositionalType::Mandatory(_, _) = positional_arg.0 {
-            required_arg_count += 1;
-        }
-    }
-    if positional.len() < required_arg_count && error.is_none() {
-        // to make "command -h" work even if required arguments are missing
-        if !named.named.contains_key("help") {
-            let (_, name) = &signature.positional[positional.len()];
-            error = Some(ParseError::argument_error(
-                lite_cmd.parts[0].clone(),
-                ArgumentError::MissingMandatoryPositional(name.to_owned()),
-            ));
-        }
-    }
-
-    if !named.is_empty() {
-        internal_command.args.named = Some(named);
-    }
-
-    if !positional.is_empty() {
-        internal_command.args.positional = Some(positional);
-    }
-
-    (internal_command, error)
-}
-
-fn parse_external_call(
-    lite_cmd: &LiteCommand,
-    end_of_pipeline: bool,
-    scope: &dyn ParserScope,
-) -> (Option<ClassifiedCommand>, Option<ParseError>) {
-    let mut error = None;
-    let name = lite_cmd.parts[0].clone().map(|v| {
-        let trimmed = trim_quotes(&v);
-        expand_path(trimmed).to_string_lossy().to_string()
-    });
-
-    let mut args = vec![];
-
-    let (name, err) = parse_arg(SyntaxShape::String, scope, &name);
-    let name_span = name.span;
-    if error.is_none() {
-        error = err;
-    }
-    args.push(name);
-
-    for lite_arg in &lite_cmd.parts[1..] {
-        let (expr, err) = parse_external_arg(lite_arg, scope);
-        if error.is_none() {
-            error = err;
-        }
-        args.push(expr);
-    }
-
-    (
-        Some(ClassifiedCommand::Internal(InternalCommand {
-            name: "run_external".to_string(),
-            name_span,
-            args: hir::Call {
-                head: Box::new(SpannedExpression {
-                    expr: Expression::string("run_external".to_string()),
-                    span: name_span,
-                }),
-                positional: Some(args),
-                named: None,
-                span: name_span,
-                external_redirection: if end_of_pipeline {
-                    ExternalRedirection::None
-                } else {
-                    ExternalRedirection::Stdout
-                },
-            },
-        })),
-        error,
-    )
-}
-
-fn parse_value_call(
-    call: LiteCommand,
-    scope: &dyn ParserScope,
-) -> (Option<ClassifiedCommand>, Option<ParseError>) {
-    let mut err = None;
-
-    let (head, error) = parse_arg(SyntaxShape::Block, scope, &call.parts[0]);
-    let mut span = head.span;
-    if err.is_none() {
-        err = error;
-    }
-
-    let mut args = vec![];
-    for arg in call.parts.iter().skip(1) {
-        let (arg, error) = parse_arg(SyntaxShape::Any, scope, arg);
-        if err.is_none() {
-            err = error;
-        }
-        span = span.until(arg.span);
-        args.push(arg);
-    }
-
-    (
-        Some(ClassifiedCommand::Dynamic(hir::Call {
-            head: Box::new(head),
-            positional: Some(args),
-            named: None,
-            span,
-            external_redirection: ExternalRedirection::None,
-        })),
-        err,
-    )
-}
-
-fn expand_aliases_in_call(call: &mut LiteCommand, scope: &dyn ParserScope) {
-    if let Some(name) = call.parts.get(0) {
-        if let Some(mut expansion) = scope.get_alias(name) {
-            // set the expansion's spans to point to the alias itself
-            for item in &mut expansion {
-                item.span = name.span;
-            }
-
-            // replace the alias with the expansion
-            call.parts.remove(0);
-            expansion.append(&mut call.parts);
-            call.parts = expansion;
-        }
-    }
-}
-
-fn parse_call(
-    mut lite_cmd: LiteCommand,
-    end_of_pipeline: bool,
-    scope: &dyn ParserScope,
-) -> (Option<ClassifiedCommand>, Option<ParseError>) {
-    expand_aliases_in_call(&mut lite_cmd, scope);
-
-    let mut error = None;
-    if lite_cmd.parts.is_empty() {
-        return (None, None);
-    } else if lite_cmd.parts[0].item.starts_with('^') {
-        let mut name = lite_cmd.parts[0]
-            .clone()
-            .map(|v| v.chars().skip(1).collect::<String>());
-
-        name.span = Span::new(name.span.start() + 1, name.span.end());
-
-        // TODO this is the same as the `else` branch below, only the name differs. Find a way
-        //      to share this functionality.
-        let mut args = vec![];
-
-        let (name, err) = parse_arg(SyntaxShape::String, scope, &name);
-        let name_span = name.span;
-        if error.is_none() {
-            error = err;
-        }
-        args.push(name);
-
-        for lite_arg in &lite_cmd.parts[1..] {
-            let (expr, err) = parse_external_arg(lite_arg, scope);
-            if error.is_none() {
-                error = err;
-            }
-            args.push(expr);
-        }
-
-        return (
-            Some(ClassifiedCommand::Internal(InternalCommand {
-                name: "run_external".to_string(),
-                name_span,
-                args: hir::Call {
-                    head: Box::new(SpannedExpression {
-                        expr: Expression::string("run_external".to_string()),
-                        span: name_span,
-                    }),
-                    positional: Some(args),
-                    named: None,
-                    span: name_span,
-                    external_redirection: if end_of_pipeline {
-                        ExternalRedirection::None
-                    } else {
-                        ExternalRedirection::Stdout
-                    },
-                },
-            })),
-            error,
-        );
-    } else if lite_cmd.parts[0].item.starts_with('{') {
-        return parse_value_call(lite_cmd, scope);
-    } else if lite_cmd.parts[0].item.starts_with('$')
-        || lite_cmd.parts[0].item.starts_with('\"')
-        || lite_cmd.parts[0].item.starts_with('\'')
-        || (lite_cmd.parts[0].item.starts_with('-')
-            && parse_arg(SyntaxShape::Number, scope, &lite_cmd.parts[0])
-                .1
-                .is_none())
-        || (lite_cmd.parts[0].item.starts_with('-')
-            && parse_arg(SyntaxShape::Range, scope, &lite_cmd.parts[0])
-                .1
-                .is_none())
-        || lite_cmd.parts[0].item.starts_with('0')
-        || lite_cmd.parts[0].item.starts_with('1')
-        || lite_cmd.parts[0].item.starts_with('2')
-        || lite_cmd.parts[0].item.starts_with('3')
-        || lite_cmd.parts[0].item.starts_with('4')
-        || lite_cmd.parts[0].item.starts_with('5')
-        || lite_cmd.parts[0].item.starts_with('6')
-        || lite_cmd.parts[0].item.starts_with('7')
-        || lite_cmd.parts[0].item.starts_with('8')
-        || lite_cmd.parts[0].item.starts_with('9')
-        || lite_cmd.parts[0].item.starts_with('[')
-        || lite_cmd.parts[0].item.starts_with('(')
-    {
-        let (_, expr, err) = parse_math_expression(0, &lite_cmd.parts[..], scope, false);
-        error = error.or(err);
-        return (Some(ClassifiedCommand::Expr(Box::new(expr))), error);
-    } else if lite_cmd.parts.len() > 1 {
-        // FIXME: only build up valid subcommands instead of all arguments
-        // by checking each part to see if it's a valid identifier name
-        let mut parts: Vec<_> = lite_cmd.parts.clone().into_iter().map(|x| x.item).collect();
-
-        while parts.len() > 1 {
-            // Check if it's a sub-command
-            if let Some(signature) = scope.get_signature(&parts.join(" ")) {
-                let (mut internal_command, err) =
-                    parse_internal_command(&lite_cmd, scope, &signature, parts.len() - 1);
-
-                error = error.or(err);
-                internal_command.args.external_redirection = if end_of_pipeline {
-                    ExternalRedirection::None
-                } else {
-                    ExternalRedirection::Stdout
-                };
-                return (Some(ClassifiedCommand::Internal(internal_command)), error);
-            }
-            parts.pop();
-        }
-    }
-    // Check if it's an internal command
-    if let Some(signature) = scope.get_signature(&lite_cmd.parts[0].item) {
-        if lite_cmd.parts[0].item == "def" {
-            let err = parse_definition(&lite_cmd, scope);
-            error = error.or(err);
-        }
-        let (mut internal_command, err) = parse_internal_command(&lite_cmd, scope, &signature, 0);
-
-        if internal_command.name == "source" {
-            let err = parse_source_internal(&lite_cmd, &internal_command, scope).err();
-
-            return (Some(ClassifiedCommand::Internal(internal_command)), err);
-        } else if lite_cmd.parts[0].item == "alias" || lite_cmd.parts[0].item == "unalias" {
-            let error = parse_alias(&lite_cmd, scope);
-            if error.is_none() {
-                return (Some(ClassifiedCommand::Internal(internal_command)), None);
-            } else {
-                return (Some(ClassifiedCommand::Internal(internal_command)), error);
-            }
-        }
-
-        error = error.or(err);
-        internal_command.args.external_redirection = if end_of_pipeline {
-            ExternalRedirection::None
-        } else {
-            ExternalRedirection::Stdout
-        };
-        (Some(ClassifiedCommand::Internal(internal_command)), error)
-    } else {
-        parse_external_call(&lite_cmd, end_of_pipeline, scope)
-    }
-}
-
-/// Convert a lite-ly parsed pipeline into a fully classified pipeline, ready to be evaluated.
-/// This conversion does error-recovery, so the result is allowed to be lossy. A lossy unit is designated as garbage.
-/// Errors are returned as part of a side-car error rather than a Result to allow both error and lossy result simultaneously.
-fn parse_pipeline(
-    lite_pipeline: LitePipeline,
-    scope: &dyn ParserScope,
-) -> (Pipeline, Option<ParseError>) {
-    let mut commands = Pipeline::new(lite_pipeline.span());
-    let mut error = None;
-
-    let pipeline_len = lite_pipeline.commands.len();
-    let iter = lite_pipeline.commands.into_iter().peekable();
-    for lite_cmd in iter.enumerate() {
-        let (call, err) = parse_call(lite_cmd.1, lite_cmd.0 == (pipeline_len - 1), scope);
-        if error.is_none() {
-            error = err;
-        }
-        if let Some(call) = call {
-            if call.has_var_usage("$in") && lite_cmd.0 > 0 {
-                let call = wrap_with_collect(call, "$in");
-                commands.push(call);
-            } else {
-                commands.push(call);
-            }
-        }
-    }
-
-    (commands, error)
-}
-
-type SpannedKeyValue = (Spanned<String>, Spanned<String>);
-
-fn wrap_with_collect(call: ClassifiedCommand, var_name: &str) -> ClassifiedCommand {
-    let mut block = Block::basic();
-
-    block.block.push(Group {
-        pipelines: vec![Pipeline {
-            list: vec![call],
-            span: Span::unknown(),
-        }],
-        span: Span::unknown(),
-    });
-
-    block.params.positional = vec![(
-        PositionalType::Mandatory(var_name.into(), SyntaxShape::Any),
-        format!("implied {}", var_name),
-    )];
-
-    ClassifiedCommand::Internal(InternalCommand {
-        name: "collect".into(),
-        name_span: Span::unknown(),
-        args: Call {
-            head: Box::new(SpannedExpression {
-                expr: Expression::Synthetic(Synthetic::String("collect".into())),
-                span: Span::unknown(),
-            }),
-            positional: Some(vec![SpannedExpression {
-                expr: Expression::Block(Arc::new(block)),
-                span: Span::unknown(),
-            }]),
-            named: None,
-            span: Span::unknown(),
-            external_redirection: ExternalRedirection::Stdout,
-        },
-    })
-}
-
-fn expand_shorthand_forms(
-    lite_pipeline: &LitePipeline,
-) -> (LitePipeline, Option<SpannedKeyValue>, Option<ParseError>) {
-    if !lite_pipeline.commands.is_empty() {
-        if lite_pipeline.commands[0].parts[0].contains('=')
-            && !lite_pipeline.commands[0].parts[0].starts_with('$')
-        {
-            let assignment: Vec<_> = lite_pipeline.commands[0].parts[0].splitn(2, '=').collect();
-            if assignment.len() != 2 {
-                (
-                    lite_pipeline.clone(),
-                    None,
-                    Some(ParseError::mismatch(
-                        "environment variable assignment",
-                        lite_pipeline.commands[0].parts[0].clone(),
-                    )),
-                )
-            } else {
-                let original_span = lite_pipeline.commands[0].parts[0].span;
-                let env_value = trim_quotes(assignment[1]);
-
-                let (variable_name, value) = (assignment[0], env_value);
-                let mut lite_pipeline = lite_pipeline.clone();
-
-                if !lite_pipeline.commands[0].parts.len() > 1 {
-                    let mut new_lite_command_parts = lite_pipeline.commands[0].parts.clone();
-                    new_lite_command_parts.remove(0);
-
-                    lite_pipeline.commands[0].parts = new_lite_command_parts;
-
-                    (
-                        lite_pipeline,
-                        Some((
-                            variable_name.to_string().spanned(original_span),
-                            value.spanned(original_span),
-                        )),
-                        None,
-                    )
-                } else {
-                    (
-                        lite_pipeline.clone(),
-                        None,
-                        Some(ParseError::mismatch(
-                            "a command following variable",
-                            lite_pipeline.commands[0].parts[0].clone(),
-                        )),
-                    )
-                }
-            }
-        } else {
-            (lite_pipeline.clone(), None, None)
-        }
-    } else {
-        (lite_pipeline.clone(), None, None)
-    }
-}
-
-fn parse_alias(call: &LiteCommand, scope: &dyn ParserScope) -> Option<ParseError> {
-    if call.parts[0].item == "alias" {
-        if (call.parts.len() == 1)
-            || (call.parts.len() == 2
-                && (call.parts[1].item == "--help" || (call.parts[1].item == "-h")))
-        {
-            return None;
-        }
-
-        if call.parts.get(2).map(|part| part.item.as_str()) != Some("=") {
-            if let Some(equals_span) = [call.parts.get(1), call.parts.get(2)]
-                .iter()
-                .flatten()
-                .filter_map(|part| {
-                    part.find('=')
-                        .map(|offset| Span::for_char(part.span.start() + offset))
-                })
-                .next()
-            {
-                return Some(ParseError::general_error(
-                    "Invalid alias syntax",
-                    "Expected space on both sides of =".spanned(equals_span),
-                ));
-            }
-        }
-
-        if call.parts.len() < 4 {
-            return Some(ParseError::mismatch("alias", call.parts[0].clone()));
-        }
-
-        if call.parts[0].item != "alias" {
-            return Some(ParseError::mismatch("alias", call.parts[0].clone()));
-        }
-
-        if call.parts[2].item != "=" {
-            return Some(ParseError::mismatch("=", call.parts[2].clone()));
-        }
-    } else {
-        // unalias
-        if call.parts.len() != 2 {
-            return Some(ParseError::mismatch("unalias", call.parts[0].clone()));
-        }
-    }
-
-    let name = call.parts[1].item.clone();
-    let args: Vec<_> = call.parts.iter().skip(3).cloned().collect();
-
-    match call.parts[0].item.as_str() {
-        "alias" => scope.add_alias(&name, args),
-        "unalias" => {
-            scope.remove_alias(&name);
-        }
-        _ => unreachable!(),
-    };
-
-    None
-}
-
-pub fn classify_block(
-    lite_block: &LiteBlock,
-    scope: &dyn ParserScope,
-) -> (Arc<Block>, Option<ParseError>) {
-    let mut output = Block::basic();
-    let mut error = None;
-
-    // Check for custom commands first
-    for group in &lite_block.block {
-        for pipeline in &group.pipelines {
-            for call in &pipeline.commands {
-                if let Some(first) = call.parts.first() {
-                    if first.item == "def" {
-                        if pipeline.commands.len() > 1 && error.is_none() {
-                            error = Some(ParseError::mismatch("definition", first.clone()));
-                        }
-                        parse_definition_prototype(call, scope);
-                    }
-                }
-            }
-        }
-    }
-
-    // Then the rest of the code
-    for group in &lite_block.block {
-        let mut out_group = Group::basic();
-        for pipeline in &group.pipelines {
-            let mut env_vars = vec![];
-            let mut pipeline = pipeline.clone();
-            loop {
-                if pipeline.commands.is_empty() || pipeline.commands[0].parts.is_empty() {
-                    break;
-                }
-                let (pl, vars, err) = expand_shorthand_forms(&pipeline);
-                if error.is_none() {
-                    error = err;
-                }
-
-                pipeline = pl;
-                if let Some(vars) = vars {
-                    env_vars.push(vars);
-                } else {
-                    break;
-                }
-            }
-
-            let pipeline_span = pipeline.span();
-            let (mut out_pipe, err) = parse_pipeline(pipeline, scope);
-            if error.is_none() {
-                error = err;
-            }
-
-            while let Some(vars) = env_vars.pop() {
-                let span = pipeline_span;
-                let block = hir::Block::new(
-                    Signature::new("<block>"),
-                    vec![Group::new(vec![out_pipe.clone()], span)],
-                    IndexMap::new(),
-                    span,
-                );
-                let mut call = hir::Call::new(
-                    Box::new(SpannedExpression {
-                        expr: Expression::string("with-env".to_string()),
-                        span,
-                    }),
-                    span,
-                );
-                call.positional = Some(vec![
-                    SpannedExpression {
-                        expr: Expression::List(vec![
-                            SpannedExpression {
-                                expr: Expression::string(vars.0.item),
-                                span: vars.0.span,
-                            },
-                            SpannedExpression {
-                                expr: Expression::string(vars.1.item),
-                                span: vars.1.span,
-                            },
-                        ]),
-                        span: Span::new(vars.0.span.start(), vars.1.span.end()),
-                    },
-                    SpannedExpression {
-                        expr: Expression::Block(Arc::new(block)),
-                        span,
-                    },
-                ]);
-                let classified_with_env = ClassifiedCommand::Internal(InternalCommand {
-                    name: "with-env".to_string(),
-                    name_span: Span::unknown(),
-                    args: call,
-                });
-
-                out_pipe = Pipeline {
-                    list: vec![classified_with_env],
-                    span,
-                };
-            }
-
-            if !out_pipe.list.is_empty() {
-                out_group.push(out_pipe);
-            }
-        }
-        if !out_group.pipelines.is_empty() {
-            output.push(out_group);
-        }
-    }
-
-    let definitions = scope.get_definitions();
-    for definition in definitions {
-        let name = definition.params.name.clone();
-        if !output.definitions.contains_key(&name) {
-            output.definitions.insert(name, definition.clone());
-        }
-    }
-    output.infer_params();
-
-    (Arc::new(output), error)
-}
-
-pub fn parse(
-    input: &str,
-    span_offset: usize,
-    scope: &dyn ParserScope,
-) -> (Arc<Block>, Option<ParseError>) {
-    let mut error = None;
-    let (output, err) = lex(input, span_offset, NewlineMode::Normal);
-    if error.is_none() {
-        error = err;
-    }
-    let (lite_block, err) = parse_block(output);
-    if error.is_none() {
-        error = err;
-    }
-
-    let (block, err) = classify_block(&lite_block, scope);
-    if error.is_none() {
-        error = err;
-    }
-
-    (block, error)
-}
-
-#[test]
-fn unit_parse_byte_units() {
-    struct TestCase {
-        string: String,
-        value: i64,
-        unit: Unit,
-    }
-
-    let cases = [
-        TestCase {
-            string: String::from("108b"),
-            value: 108,
-            unit: Unit::Byte,
-        },
-        TestCase {
-            string: String::from("0B"),
-            value: 0,
-            unit: Unit::Byte,
-        },
-        TestCase {
-            string: String::from("10kb"),
-            value: 10,
-            unit: Unit::Kilobyte,
-        },
-        TestCase {
-            string: String::from("16KB"),
-            value: 16,
-            unit: Unit::Kilobyte,
-        },
-        TestCase {
-            string: String::from("99kB"),
-            value: 99,
-            unit: Unit::Kilobyte,
-        },
-        TestCase {
-            string: String::from("27Kb"),
-            value: 27,
-            unit: Unit::Kilobyte,
-        },
-        TestCase {
-            string: String::from("11Mb"),
-            value: 11,
-            unit: Unit::Megabyte,
-        },
-        TestCase {
-            string: String::from("27mB"),
-            value: 27,
-            unit: Unit::Megabyte,
-        },
-        TestCase {
-            string: String::from("811Gb"),
-            value: 811,
-            unit: Unit::Gigabyte,
-        },
-        TestCase {
-            string: String::from("27gB"),
-            value: 27,
-            unit: Unit::Gigabyte,
-        },
-        TestCase {
-            string: String::from("11Tb"),
-            value: 11,
-            unit: Unit::Terabyte,
-        },
-        TestCase {
-            string: String::from("1027tB"),
-            value: 1027,
-            unit: Unit::Terabyte,
-        },
-        TestCase {
-            string: String::from("11Pb"),
-            value: 11,
-            unit: Unit::Petabyte,
-        },
-        TestCase {
-            string: String::from("27pB"),
-            value: 27,
-            unit: Unit::Petabyte,
-        },
-        TestCase {
-            string: String::from("10kib"),
-            value: 10,
-            unit: Unit::Kibibyte,
-        },
-        TestCase {
-            string: String::from("123KiB"),
-            value: 123,
-            unit: Unit::Kibibyte,
-        },
-        TestCase {
-            string: String::from("24kiB"),
-            value: 24,
-            unit: Unit::Kibibyte,
-        },
-        TestCase {
-            string: String::from("10mib"),
-            value: 10,
-            unit: Unit::Mebibyte,
-        },
-        TestCase {
-            string: String::from("123MiB"),
-            value: 123,
-            unit: Unit::Mebibyte,
-        },
-        TestCase {
-            string: String::from("10gib"),
-            value: 10,
-            unit: Unit::Gibibyte,
-        },
-        TestCase {
-            string: String::from("123GiB"),
-            value: 123,
-            unit: Unit::Gibibyte,
-        },
-        TestCase {
-            string: String::from("10tib"),
-            value: 10,
-            unit: Unit::Tebibyte,
-        },
-        TestCase {
-            string: String::from("123TiB"),
-            value: 123,
-            unit: Unit::Tebibyte,
-        },
-        TestCase {
-            string: String::from("10pib"),
-            value: 10,
-            unit: Unit::Pebibyte,
-        },
-        TestCase {
-            string: String::from("123PiB"),
-            value: 123,
-            unit: Unit::Pebibyte,
-        },
-    ];
-
-    for case in &cases {
-        let input_len = case.string.len();
-        let value_len = case.value.to_string().len();
-        let input = case.string.clone().spanned(Span::new(0, input_len));
-        let result = parse_filesize(&input);
-        assert_eq!(result.1, None);
-        assert_eq!(
-            result.0.expr,
-            Expression::unit(
-                Spanned {
-                    span: Span::new(0, value_len),
-                    item: case.value
-                },
-                Spanned {
-                    span: Span::new(value_len, input_len),
-                    item: case.unit
-                }
-            )
-        );
-    }
-}
-
-#[test]
-fn unit_parse_byte_units_decimal() {
-    struct TestCase {
-        string: String,
-        value: i64,
-        value_str: String,
-        unit: Unit,
-    }
-
-    let cases = [
-        TestCase {
-            string: String::from("0.25KB"),
-            value: 250,
-            value_str: String::from("0.25"),
-            unit: Unit::Byte,
-        },
-        TestCase {
-            string: String::from("2.5Mb"),
-            value: 2500,
-            value_str: String::from("2.5"),
-            unit: Unit::Kilobyte,
-        },
-        TestCase {
-            string: String::from("0.5Gb"),
-            value: 500,
-            value_str: String::from("0.5"),
-            unit: Unit::Megabyte,
-        },
-        TestCase {
-            string: String::from("811.5Gb"),
-            value: 811500,
-            value_str: String::from("811.5"),
-            unit: Unit::Megabyte,
-        },
-        TestCase {
-            string: String::from("11.5Tb"),
-            value: 11500,
-            value_str: String::from("11.5"),
-            unit: Unit::Gigabyte,
-        },
-        TestCase {
-            string: String::from("12.5Pb"),
-            value: 12500,
-            value_str: String::from("12.5"),
-            unit: Unit::Terabyte,
-        },
-        TestCase {
-            string: String::from("10.5kib"),
-            value: 10752,
-            value_str: String::from("10.5"),
-            unit: Unit::Byte,
-        },
-        TestCase {
-            string: String::from("0.5mib"),
-            value: 512,
-            value_str: String::from("0.5"),
-            unit: Unit::Kibibyte,
-        },
-        TestCase {
-            string: String::from("3.25gib"),
-            value: 3328,
-            value_str: String::from("3.25"),
-            unit: Unit::Mebibyte,
-        },
-    ];
-
-    for case in &cases {
-        let input_len = case.string.len();
-        let value_len = case.value_str.to_string().len();
-        let input = case.string.clone().spanned(Span::new(0, input_len));
-        let result = parse_filesize(&input);
-        assert_eq!(result.1, None);
-        assert_eq!(
-            result.0.expr,
-            Expression::unit(
-                Spanned {
-                    span: Span::new(0, value_len),
-                    item: case.value
-                },
-                Spanned {
-                    span: Span::new(value_len, input_len),
-                    item: case.unit
-                }
-            )
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/def.rs b/old_nushell/crates/nu-parser/src/parse/def.rs
deleted file mode 100644
index b868e0c4f..000000000
--- a/old_nushell/crates/nu-parser/src/parse/def.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use std::sync::Arc;
-
-use crate::{
-    lex::{lexer::NewlineMode, tokens::LiteCommand},
-    parse::{classify_block, util::trim_quotes},
-};
-
-use indexmap::IndexMap;
-use nu_errors::ParseError;
-use nu_protocol::hir::Block;
-use nu_source::{HasSpan, Span, SpannedItem};
-
-//use crate::errors::{ParseError, ParseResult};
-use crate::lex::lexer::{lex, parse_block};
-
-use crate::ParserScope;
-
-use self::signature::parse_signature;
-pub use self::signature::{lex_split_baseline_tokens_on, parse_parameter};
-
-mod data_structs;
-mod primitives;
-mod signature;
-mod tests;
-
-pub(crate) fn parse_definition(call: &LiteCommand, scope: &dyn ParserScope) -> Option<ParseError> {
-    // A this point, we've already handled the prototype and put it into scope;
-    // So our main goal here is to parse the block now that the names and
-    // prototypes of adjacent commands are also available
-
-    match call.parts.len() {
-        4 => {
-            if call.parts[0].item != "def" {
-                return Some(ParseError::mismatch("definition", call.parts[0].clone()));
-            }
-
-            let name = trim_quotes(&call.parts[1].item);
-            let (mut signature, err) = parse_signature(&name, &call.parts[2]);
-
-            //Add commands comments to signature usage
-            signature.usage = call.comments_joined();
-
-            if err.is_some() {
-                return err;
-            };
-
-            let mut chars = call.parts[3].chars();
-            match (chars.next(), chars.next_back()) {
-                (Some('{'), Some('}')) => {
-                    // We have a literal block
-                    let string: String = chars.collect();
-
-                    scope.enter_scope();
-
-                    let (tokens, err) =
-                        lex(&string, call.parts[3].span.start() + 1, NewlineMode::Normal);
-                    if err.is_some() {
-                        return err;
-                    };
-                    let (lite_block, err) = parse_block(tokens);
-                    if err.is_some() {
-                        return err;
-                    };
-
-                    let (mut block, err) = classify_block(&lite_block, scope);
-                    scope.exit_scope();
-
-                    if let Some(block) =
-                        std::sync::Arc::<nu_protocol::hir::Block>::get_mut(&mut block)
-                    {
-                        block.params = signature;
-                        block.params.name = name;
-                    }
-
-                    scope.add_definition(block);
-
-                    err
-                }
-                _ => Some(ParseError::mismatch("body", call.parts[3].clone())),
-            }
-        }
-
-        3 => Some(ParseError::general_error(
-            "wrong shape. Expected: def name [signature] {body}",
-            "expected definition body".to_string().spanned(Span::new(
-                call.parts[2].span.end(),
-                call.parts[2].span.end(),
-            )),
-        )),
-        2 => Some(ParseError::general_error(
-            "wrong shape. Expected: def name [signature] {body}",
-            "expected definition parameters"
-                .to_string()
-                .spanned(Span::new(
-                    call.parts[1].span.end(),
-                    call.parts[1].span.end(),
-                )),
-        )),
-        1 => Some(ParseError::general_error(
-            "wrong shape. Expected: def name [signature] {body}",
-            "expected definition name".to_string().spanned(Span::new(
-                call.parts[0].span.end(),
-                call.parts[0].span.end(),
-            )),
-        )),
-        0 => Some(ParseError::general_error(
-            "wrong shape. Expected: def name [signature] {body}",
-            "expected 'def' keyword'".to_string().spanned(call.span()),
-        )),
-
-        x if x < 4 => Some(ParseError::general_error(
-            "wrong shape. Expected: def name [signature] {body}",
-            "expected: def name [signature] {body}"
-                .to_string()
-                .spanned(Span::new(
-                    call.parts[x - 1].span.end(),
-                    call.parts[x - 1].span.end(),
-                )),
-        )),
-        _ => Some(ParseError::general_error(
-            "extra arguments given. Expected: def name [signature] {body}.",
-            "extra argument given"
-                .to_string()
-                .spanned(call.parts[4].span()),
-        )),
-    }
-}
-
-pub(crate) fn parse_definition_prototype(
-    call: &LiteCommand,
-    scope: &dyn ParserScope,
-) -> Option<ParseError> {
-    let mut err = None;
-
-    if call.parts.len() != 4 {
-        return Some(ParseError::mismatch("definition", call.parts[0].clone()));
-    }
-
-    if call.parts[0].item != "def" {
-        return Some(ParseError::mismatch("definition", call.parts[0].clone()));
-    }
-
-    let name = trim_quotes(&call.parts[1].item);
-    let (signature, error) = parse_signature(&name, &call.parts[2]);
-    if err.is_none() {
-        err = error;
-    }
-
-    scope.add_definition(Arc::new(Block::new(
-        signature,
-        vec![],
-        IndexMap::new(),
-        call.span(),
-    )));
-
-    err
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/def/data_structs.rs b/old_nushell/crates/nu-parser/src/parse/def/data_structs.rs
deleted file mode 100644
index 70a915b8e..000000000
--- a/old_nushell/crates/nu-parser/src/parse/def/data_structs.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use nu_protocol::{NamedType, PositionalType, SyntaxShape};
-use nu_source::Span;
-
-pub type Description = String;
-#[derive(Clone, new)]
-pub struct Parameter {
-    pub pos_type: PositionalType,
-    pub desc: Option<Description>,
-    pub span: Span,
-}
-
-impl Parameter {
-    pub fn error() -> Parameter {
-        Parameter::new(
-            PositionalType::optional("Internal Error", SyntaxShape::Any),
-            Some(
-                "Wanted to parse a parameter, but no input present. Please report this error!"
-                    .to_string(),
-            ),
-            Span::unknown(),
-        )
-    }
-}
-
-#[derive(Clone, Debug, new)]
-pub struct Flag {
-    pub long_name: String,
-    pub named_type: NamedType,
-    pub desc: Option<Description>,
-    pub span: Span,
-}
-
-impl Flag {
-    pub fn error() -> Flag {
-        Flag::new(
-            "Internal Error".to_string(),
-            NamedType::Switch(None),
-            Some(
-                "Wanted to parse a flag, but no input present. Please report this error!"
-                    .to_string(),
-            ),
-            Span::unknown(),
-        )
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/def/primitives.rs b/old_nushell/crates/nu-parser/src/parse/def/primitives.rs
deleted file mode 100644
index 2f609e782..000000000
--- a/old_nushell/crates/nu-parser/src/parse/def/primitives.rs
+++ /dev/null
@@ -1,207 +0,0 @@
-///All of the functions in this mod parse only 1 Token per invocation.
-///Therefore they are primitives
-use crate::lex::{lexer::Token, tokens::TokenContents};
-use crate::parse::util::token_to_spanned_string;
-use nu_errors::ParseError;
-use nu_protocol::SyntaxShape;
-use nu_source::{Span, Spanned, SpannedItem};
-
-///Helper function
-pub(crate) fn is_baseline_token_matching(token: &Token, string: &str) -> bool {
-    match &token.contents {
-        TokenContents::Baseline(base) => base == string,
-        _ => false,
-    }
-}
-
-pub(crate) fn parse_comma(tokens: &[Token]) -> (bool, usize) {
-    fn is_comma(token: &Token) -> bool {
-        is_baseline_token_matching(token, ",")
-    }
-    if !tokens.is_empty() && is_comma(&tokens[0]) {
-        (true, 1)
-    } else {
-        (false, 0)
-    }
-}
-
-pub(crate) fn parse_eol(tokens: &[Token]) -> (bool, usize) {
-    if !tokens.is_empty() && tokens[0].contents.is_eol() {
-        (true, 1)
-    } else {
-        (false, 0)
-    }
-}
-
-pub(crate) fn parse_optional_comment(tokens: &[Token]) -> (Option<String>, usize) {
-    let mut comment_text = None;
-    let mut i: usize = 0;
-    if i < tokens.len() {
-        if let TokenContents::Comment(comment) = &tokens[i].contents {
-            comment_text = Some(comment.trim().to_string());
-            i += 1;
-        }
-    }
-    (comment_text, i)
-}
-
-///Returns true if token is optional modifier
-pub(crate) fn parse_optional_parameter_optional_modifier(token: &Token) -> (bool, usize) {
-    if is_baseline_token_matching(token, "?") {
-        (true, 1)
-    } else {
-        (false, 0)
-    }
-}
-
-pub(crate) fn parse_flag_optional_shortform(
-    tokens: &[Token],
-) -> (Option<char>, usize, Option<ParseError>) {
-    if tokens.is_empty() {
-        return (None, 0, None);
-    }
-
-    let token = &tokens[0];
-    return if let TokenContents::Baseline(shortform) = &token.contents {
-        let mut chars = shortform.chars();
-        match (chars.next(), chars.next_back()) {
-            (Some('('), Some(')')) => {
-                let mut err = None;
-
-                let flag_span = Span::new(
-                    token.span.start() + 1, //Skip '('
-                    token.span.end() - 1,   // Skip ')'
-                );
-
-                let c: String = chars.collect();
-                let dash_count = c.chars().take_while(|c| *c == '-').count();
-                err = err
-                    .or_else(|| err_on_too_many_dashes(dash_count, c.clone().spanned(flag_span)));
-                let name = &c[dash_count..];
-                err = err.or_else(|| err_on_name_too_long(name, c.clone().spanned(flag_span)));
-                let c = name.chars().next();
-
-                (c, 1, err)
-            }
-            _ => (None, 0, None),
-        }
-    } else {
-        (None, 0, None)
-    };
-
-    fn err_on_too_many_dashes(dash_count: usize, actual: Spanned<String>) -> Option<ParseError> {
-        match dash_count {
-            0 => {
-                //If no starting -
-                Some(ParseError::mismatch("Shortflag starting with '-'", actual))
-            }
-            1 => None,
-            _ => {
-                //If --
-                Some(ParseError::mismatch(
-                    "Shortflag starting with a single '-'",
-                    actual,
-                ))
-            }
-        }
-    }
-
-    fn err_on_name_too_long(name: &str, actual: Spanned<String>) -> Option<ParseError> {
-        if name.len() != 1 {
-            Some(ParseError::mismatch(
-                "Shortflag of exactly 1 character",
-                actual,
-            ))
-        } else {
-            None
-        }
-    }
-}
-
-pub(crate) fn parse_flag_name(token: &Token) -> (Spanned<String>, Option<ParseError>) {
-    if let TokenContents::Baseline(name) = &token.contents {
-        if !name.starts_with("--") {
-            (
-                name.clone().spanned(token.span),
-                Some(ParseError::mismatch(
-                    "longform of a flag (Starting with --)",
-                    token_to_spanned_string(token),
-                )),
-            )
-        } else {
-            //Discard preceding --
-            let name = name[2..].to_string();
-            (name.spanned(token.span), None)
-        }
-    } else {
-        (
-            "".to_string().spanned_unknown(),
-            Some(ParseError::mismatch(
-                "longform of a flag (Starting with --)",
-                token_to_spanned_string(token),
-            )),
-        )
-    }
-}
-
-pub(crate) fn parse_param_name(token: &Token) -> (Spanned<String>, Option<ParseError>) {
-    if let TokenContents::Baseline(name) = &token.contents {
-        let name = name.clone().spanned(token.span);
-        (name, None)
-    } else {
-        (
-            "InternalError".to_string().spanned(token.span),
-            Some(ParseError::mismatch(
-                "parameter name",
-                token_to_spanned_string(token),
-            )),
-        )
-    }
-}
-
-pub fn parse_type_token(type_: &Token) -> (SyntaxShape, Option<ParseError>) {
-    match &type_.contents {
-        TokenContents::Baseline(type_str) => match type_str.as_str() {
-            "int" => (SyntaxShape::Int, None),
-            "string" => (SyntaxShape::String, None),
-            "path" => (SyntaxShape::FilePath, None),
-            "table" => (SyntaxShape::Table, None),
-            "duration" => (SyntaxShape::Duration, None),
-            "filesize" => (SyntaxShape::Filesize, None),
-            "number" => (SyntaxShape::Number, None),
-            "pattern" => (SyntaxShape::GlobPattern, None),
-            "range" => (SyntaxShape::Range, None),
-            "block" => (SyntaxShape::Block, None),
-            "any" => (SyntaxShape::Any, None),
-            _ => (
-                SyntaxShape::Any,
-                Some(ParseError::mismatch("type", token_to_spanned_string(type_))),
-            ),
-        },
-        _ => (
-            SyntaxShape::Any,
-            Some(ParseError::mismatch("type", token_to_spanned_string(type_))),
-        ),
-    }
-}
-
-pub(crate) fn parse_rest_name(name_token: &Token) -> (Spanned<String>, Option<ParseError>) {
-    return if let TokenContents::Baseline(name) = &name_token.contents {
-        match name.strip_prefix("...") {
-            Some(var_name) => (var_name.to_string().spanned(name_token.span), None),
-            None => (
-                "InternalError".to_string().spanned(name_token.span),
-                Some(parse_rest_name_err(name_token)),
-            ),
-        }
-    } else {
-        (
-            "InternalError".to_string().spanned(name_token.span),
-            Some(parse_rest_name_err(name_token)),
-        )
-    };
-
-    fn parse_rest_name_err(token: &Token) -> ParseError {
-        ParseError::mismatch("...rest", token_to_spanned_string(token))
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/def/signature.rs b/old_nushell/crates/nu-parser/src/parse/def/signature.rs
deleted file mode 100644
index 580515b0d..000000000
--- a/old_nushell/crates/nu-parser/src/parse/def/signature.rs
+++ /dev/null
@@ -1,460 +0,0 @@
-///This module contains functions to parse the parameter and flag list (signature)
-///Such a signature can be of the following format:
-/// [ (parameter | flag | rest_param | <eol>)* ]
-///Where
-///parameter is:
-///    name (<:> type)? (<?>)? item_end
-///flag is:
-///    --name (-shortform)? (<:> type)? item_end
-///rest is:
-///    ...rest (<:> type)? item_end
-///item_end:
-///    (<,>)? (#Comment)? (<eol>)?
-///
-use log::debug;
-
-use nu_errors::ParseError;
-use nu_protocol::{NamedType, PositionalType, Signature, SyntaxShape};
-use nu_source::{Span, Spanned};
-
-use crate::lex::{
-    lexer::{lex, NewlineMode, Token},
-    tokens::TokenContents,
-};
-
-use super::{
-    data_structs::{Description, Flag, Parameter},
-    primitives::{
-        is_baseline_token_matching, parse_comma, parse_eol, parse_flag_name,
-        parse_flag_optional_shortform, parse_optional_comment,
-        parse_optional_parameter_optional_modifier, parse_param_name, parse_rest_name,
-        parse_type_token,
-    },
-};
-
-pub fn parse_signature(
-    name: &str,
-    signature_vec: &Spanned<String>,
-) -> (Signature, Option<ParseError>) {
-    let mut err = None;
-
-    let mut chars = signature_vec.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some('['), Some(']')) => {}
-        _ => {
-            err = err.or_else(|| {
-                Some(ParseError::mismatch(
-                    "definition signature",
-                    signature_vec.clone(),
-                ))
-            });
-        }
-    }
-
-    let string: String = chars.collect();
-
-    debug!(
-        "signature vec span start: {}",
-        signature_vec.span.start() + 1
-    );
-    let (tokens, error) = lex(
-        &string,
-        signature_vec.span.start() + 1,
-        NewlineMode::Whitespace,
-    );
-    err = err.or(error);
-
-    //After normal lexing, tokens also need to be split on ',' and ':'
-    //TODO this could probably be all done in a specialized lexing function
-    let tokens = lex_split_baseline_tokens_on(tokens, &[',', ':', '?']);
-    let tokens = lex_split_shortflag_from_longflag(tokens);
-    debug!("Tokens are {:?}", tokens);
-
-    let mut parameters = vec![];
-    let mut flags = vec![];
-    let mut rest = None;
-    let mut i = 0;
-
-    while i < tokens.len() {
-        if tokens[i].contents.is_eol() {
-            //Skip leading eol
-            i += 1;
-        } else if is_flag(&tokens[i]) {
-            let (flag, advanced_by, error) = parse_flag(&tokens[i..], signature_vec);
-            err = err.or(error);
-            i += advanced_by;
-            flags.push(flag);
-        } else if is_rest(&tokens[i]) {
-            let (rest_, advanced_by, error) = parse_rest(&tokens[i..], signature_vec);
-            err = err.or(error);
-            i += advanced_by;
-            rest = rest_;
-        } else {
-            let (parameter, advanced_by, error) = parse_parameter(&tokens[i..], signature_vec.span);
-            err = err.or(error);
-            i += advanced_by;
-            parameters.push(parameter);
-        }
-    }
-
-    let signature = to_signature(name, parameters, flags, rest);
-    debug!("Signature: {:?}", signature);
-
-    (signature, err)
-}
-
-pub fn parse_parameter(tokens: &[Token], span: Span) -> (Parameter, usize, Option<ParseError>) {
-    if tokens.is_empty() {
-        //TODO fix span
-        return (
-            Parameter::error(),
-            0,
-            Some(ParseError::unexpected_eof("parameter", span)),
-        );
-    }
-
-    let mut err: Option<ParseError> = None;
-    let mut i = 0;
-    let mut type_ = SyntaxShape::Any;
-    let mut comment = None;
-    let mut optional = false;
-
-    let (name, error) = parse_param_name(&tokens[0]);
-    i += 1;
-    err = err.or(error);
-
-    if i < tokens.len() {
-        let (parsed_opt_modifier, advanced_by) =
-            parse_optional_parameter_optional_modifier(&tokens[i]);
-        optional = parsed_opt_modifier;
-        i += advanced_by;
-    }
-
-    if i < tokens.len() {
-        let (parsed_type_, advanced_by, error) = parse_optional_type(&tokens[i..]);
-        type_ = parsed_type_.unwrap_or(SyntaxShape::Any);
-        err = err.or(error);
-        i += advanced_by;
-    }
-
-    if i < tokens.len() {
-        let (comment_text, advanced_by, error) = parse_signature_item_end(&tokens[i..]);
-        comment = comment_text;
-        i += advanced_by;
-        err = err.or(error);
-    }
-
-    let pos_type = if optional {
-        if name.item.starts_with('$') {
-            PositionalType::optional(&name.item, type_)
-        } else {
-            PositionalType::optional(&format!("${}", name.item), type_)
-        }
-    } else if name.item.starts_with('$') {
-        PositionalType::mandatory(&name.item, type_)
-    } else {
-        PositionalType::mandatory(&format!("${}", name.item), type_)
-    };
-
-    let parameter = Parameter::new(pos_type, comment, name.span);
-
-    debug!(
-        "Parsed parameter: {} with shape {:?}",
-        parameter.pos_type.name(),
-        parameter.pos_type.syntax_type()
-    );
-
-    (parameter, i, err)
-}
-
-fn parse_flag(
-    tokens: &[Token],
-    tokens_as_str: &Spanned<String>,
-) -> (Flag, usize, Option<ParseError>) {
-    if tokens.is_empty() {
-        return (
-            Flag::error(),
-            0,
-            Some(ParseError::unexpected_eof("parameter", tokens_as_str.span)),
-        );
-    }
-
-    let mut err: Option<ParseError> = None;
-    let mut i = 0;
-    let mut shortform = None;
-    let mut type_ = None;
-    let mut comment = None;
-
-    let (name, error) = parse_flag_name(&tokens[0]);
-    err = err.or(error);
-    i += 1;
-
-    if i < tokens.len() {
-        let (parsed_shortform, advanced_by, error) = parse_flag_optional_shortform(&tokens[i..]);
-        shortform = parsed_shortform;
-        i += advanced_by;
-        err = err.or(error);
-    }
-
-    if i < tokens.len() {
-        let (parsed_type, advanced_by, error) = parse_optional_type(&tokens[i..]);
-        type_ = parsed_type;
-        i += advanced_by;
-        err = err.or(error);
-    }
-
-    if i < tokens.len() {
-        let (parsed_comment, advanced_by, error) = parse_signature_item_end(&tokens[i..]);
-        comment = parsed_comment;
-        i += advanced_by;
-        err = err.or(error);
-    }
-
-    //If no type is given, the flag is a switch. Otherwise its optional
-    //Example:
-    //--verbose(-v) # Switch
-    //--output(-o): path # Optional flag
-    let named_type = if let Some(shape) = type_ {
-        NamedType::Optional(shortform, shape)
-    } else {
-        NamedType::Switch(shortform)
-    };
-
-    let flag = Flag::new(name.item.clone(), named_type, comment, name.span);
-
-    debug!("Parsed flag: {:?}", flag);
-    (flag, i, err)
-}
-
-fn parse_rest(
-    tokens: &[Token],
-    tokens_as_str: &Spanned<String>,
-) -> (
-    Option<(String, SyntaxShape, Description)>,
-    usize,
-    Option<ParseError>,
-) {
-    if tokens.is_empty() {
-        return (
-            None,
-            0,
-            Some(ParseError::unexpected_eof(
-                "rest argument",
-                tokens_as_str.span,
-            )),
-        );
-    }
-
-    let mut err = None;
-    let mut i = 0;
-    let mut type_ = SyntaxShape::Any;
-    let mut comment = "".to_string();
-
-    let (name, error) = parse_rest_name(&tokens[i]);
-    err = err.or(error);
-    i += 1;
-
-    if i < tokens.len() {
-        let (parsed_type, advanced_by, error) = parse_optional_type(&tokens[i..]);
-        err = err.or(error);
-        i += advanced_by;
-        type_ = parsed_type.unwrap_or(SyntaxShape::Any);
-    }
-
-    if i < tokens.len() {
-        let (parsed_comment, advanced_by) = parse_optional_comment(&tokens[i..]);
-        i += advanced_by;
-        comment = parsed_comment.unwrap_or_else(|| "".to_string());
-    }
-
-    (Some((name.item, type_, comment)), i, err)
-}
-
-fn parse_optional_type(tokens: &[Token]) -> (Option<SyntaxShape>, usize, Option<ParseError>) {
-    fn is_double_point(token: &Token) -> bool {
-        is_baseline_token_matching(token, ":")
-    }
-    let mut err = None;
-    let mut type_ = None;
-    let mut i: usize = 0;
-    //Check if a type has to follow
-    if i < tokens.len() && is_double_point(&tokens[i]) {
-        //Type has to follow
-        if i + 1 == tokens.len() {
-            err = err.or_else(|| Some(ParseError::unexpected_eof("type", tokens[i].span)));
-        } else {
-            //Jump over <:>
-            i += 1;
-            let (shape, error) = parse_type_token(&tokens[i]);
-            err = err.or(error);
-            type_ = Some(shape);
-            i += 1;
-        }
-    }
-    (type_, i, err)
-}
-
-///Parses the end of a flag or a parameter
-///   (<,>)? (#Comment)? (<eol>)?
-fn parse_signature_item_end(tokens: &[Token]) -> (Option<String>, usize, Option<ParseError>) {
-    if tokens.is_empty() {
-        //If no more tokens, parameter/flag doesn't need ',' or comment to be properly finished
-        return (None, 0, None);
-    }
-
-    let mut i = 0;
-    let err = None;
-    let (parsed_comma, advanced_by) = parse_comma(&tokens[i..]);
-    i += advanced_by;
-    let (comment, advanced_by) = parse_optional_comment(&tokens[i..]);
-    i += advanced_by;
-    let (parsed_eol, advanced_by) = parse_eol(&tokens[i..]);
-    i += advanced_by;
-
-    debug!(
-        "Parsed comma {} and parsed eol {}",
-        parsed_comma, parsed_eol
-    );
-    ////Separating flags/parameters is optional.
-    ////If this should change, the below code would raise a warning whenever 2 parameters/flags are
-    ////not delimited by <,> or <eol>
-    //if there is next item, but it's not comma, then it must be Optional(#Comment) + <eof>
-    //let parsed_delimiter = parsed_comma || parsed_eol;
-    //if !parsed_delimiter && i < tokens.len() {
-    //    //If not parsed , or eol but more tokens are coming
-    //    err = err.or(Some(ParseError::mismatch(
-    //        "Newline or ','",
-    //        (token[i-1].to_string() + token[i].to_string()).spanned(token[i-1].span.until(token[i].span))
-    //    )));
-    //}
-
-    (comment, i, err)
-}
-
-///Returns true if token potentially represents rest argument
-fn is_rest(token: &Token) -> bool {
-    match &token.contents {
-        TokenContents::Baseline(item) => item.starts_with("..."),
-        _ => false,
-    }
-}
-
-///True for short or longform flags. False otherwise
-fn is_flag(token: &Token) -> bool {
-    match &token.contents {
-        TokenContents::Baseline(item) => item.starts_with('-'),
-        _ => false,
-    }
-}
-
-fn to_signature(
-    name: &str,
-    params: Vec<Parameter>,
-    flags: Vec<Flag>,
-    rest: Option<(String, SyntaxShape, Description)>,
-) -> Signature {
-    let mut sign = Signature::new(name);
-
-    for param in params {
-        // pub positional: Vec<(PositionalType, Description)>,
-        sign.positional
-            .push((param.pos_type, param.desc.unwrap_or_else(|| "".to_string())));
-    }
-
-    for flag in flags {
-        sign.named.insert(
-            flag.long_name,
-            (flag.named_type, flag.desc.unwrap_or_else(|| "".to_string())),
-        );
-    }
-
-    sign.rest_positional = rest;
-
-    sign
-}
-
-//Currently the lexer does not split off baselines after existing text
-//Example --flag(-f) is lexed as one baseline token.
-//To properly parse the input, it is required that --flag and (-f) are 2 tokens.
-fn lex_split_shortflag_from_longflag(tokens: Vec<Token>) -> Vec<Token> {
-    let mut result = Vec::with_capacity(tokens.capacity());
-    for token in tokens {
-        let mut processed = false;
-        if let TokenContents::Baseline(base) = &token.contents {
-            if let Some(paren_start) = base.find('(') {
-                if paren_start != 0 {
-                    processed = true;
-                    //If token contains '(' and '(' is not the first char,
-                    //we split on '('
-                    //Example: Baseline(--flag(-f)) results in: [Baseline(--flag), Baseline((-f))]
-                    let paren_span_i = token.span.start() + paren_start;
-                    result.push(Token::new(
-                        TokenContents::Baseline(base[..paren_start].to_string()),
-                        Span::new(token.span.start(), paren_span_i),
-                    ));
-                    result.push(Token::new(
-                        TokenContents::Baseline(base[paren_start..].to_string()),
-                        Span::new(paren_span_i, token.span.end()),
-                    ));
-                }
-            }
-        }
-
-        if !processed {
-            result.push(token);
-        }
-    }
-    result
-}
-//Currently the lexer does not split baselines on ',' ':' '?'
-//The parameter list requires this. Therefore here is a hacky method doing this.
-pub fn lex_split_baseline_tokens_on(
-    tokens: Vec<Token>,
-    extra_baseline_terminal_tokens: &[char],
-) -> Vec<Token> {
-    debug!("Before lex fix up {:?}", tokens);
-    let make_new_token =
-        |token_new: String, token_new_end: usize, terminator_char: Option<char>| {
-            let end = token_new_end;
-            let start = end - token_new.len();
-
-            let mut result = vec![];
-            //Only add token if its not empty
-            if !token_new.is_empty() {
-                result.push(Token::new(
-                    TokenContents::Baseline(token_new),
-                    Span::new(start, end),
-                ));
-            }
-            //Insert terminator_char as baseline token
-            if let Some(ch) = terminator_char {
-                result.push(Token::new(
-                    TokenContents::Baseline(ch.to_string()),
-                    Span::new(end, end + 1),
-                ));
-            }
-
-            result
-        };
-    let mut result = Vec::with_capacity(tokens.len());
-    for token in tokens {
-        match token.contents {
-            TokenContents::Baseline(base) => {
-                let token_offset = token.span.start();
-                let mut current = "".to_string();
-                for (i, c) in base.chars().enumerate() {
-                    if extra_baseline_terminal_tokens.contains(&c) {
-                        result.extend(make_new_token(current, i + token_offset, Some(c)));
-                        current = "".to_string();
-                    } else {
-                        current.push(c);
-                    }
-                }
-                result.extend(make_new_token(current, base.len() + token_offset, None));
-            }
-            _ => result.push(token),
-        }
-    }
-    result
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/def/tests.rs b/old_nushell/crates/nu-parser/src/parse/def/tests.rs
deleted file mode 100644
index 6ac1a32d5..000000000
--- a/old_nushell/crates/nu-parser/src/parse/def/tests.rs
+++ /dev/null
@@ -1,409 +0,0 @@
-#[allow(unused_imports)]
-use super::parse_signature;
-#[allow(unused_imports)]
-use nu_errors::ParseError;
-#[allow(unused_imports)]
-use nu_protocol::{NamedType, PositionalType, Signature, SyntaxShape};
-#[allow(unused_imports)]
-use nu_source::{Span, Spanned, SpannedItem};
-#[allow(unused_imports)]
-use nu_test_support::nu;
-
-#[test]
-fn simple_def_with_params() {
-    let name = "my_func";
-    let sign = "[param1?: int, param2: string]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned(Span::new(0, 27)));
-    assert!(err.is_none());
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Optional("$param1".into(), SyntaxShape::Int),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::String),
-                "".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn simple_def_with_optional_param_without_type() {
-    let name = "my_func";
-    let sign = "[param1 ?, param2?]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned(Span::new(0, 27)));
-    assert!(err.is_none());
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Optional("$param1".into(), SyntaxShape::Any),
-                "".into()
-            ),
-            (
-                PositionalType::Optional("$param2".into(), SyntaxShape::Any),
-                "".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn simple_def_with_params_with_comment() {
-    let name = "my_func";
-    let sign = "[
-        param1:path # My first param
-        param2:number # My second param
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned(Span::new(0, 64)));
-    assert!(err.is_none());
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Mandatory("$param1".into(), SyntaxShape::FilePath),
-                "My first param".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::Number),
-                "My second param".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn simple_def_with_params_without_type() {
-    let name = "my_func";
-    let sign = "[
-        param1 # My first param
-        param2:number # My second param
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned(Span::new(0, 0)));
-    assert!(err.is_none());
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Mandatory("$param1".into(), SyntaxShape::Any),
-                "My first param".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::Number),
-                "My second param".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn oddly_but_correct_written_params() {
-    let name = "my_func";
-    let sign = "[
-        param1 :int         #      param1
-
-        param2 : number # My second param
-
-
-        param4, param5:path  ,  param6 # param6
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned(Span::new(0, 0)));
-    assert!(err.is_none());
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Mandatory("$param1".into(), SyntaxShape::Int),
-                "param1".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::Number),
-                "My second param".into()
-            ),
-            (
-                PositionalType::Mandatory("$param4".into(), SyntaxShape::Any),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param5".into(), SyntaxShape::FilePath),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param6".into(), SyntaxShape::Any),
-                "param6".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn err_wrong_dash_count() {
-    let actual = nu!(
-        cwd: ".",
-        "def f [ --flag(--f)] { echo hi }"
-    );
-    assert!(actual.err.contains("single '-'"));
-}
-
-#[test]
-fn err_wrong_dash_count2() {
-    let actual = nu!(
-        cwd: ".",
-        "def f [ --flag(f)] { echo hi }"
-    );
-    assert!(actual.err.contains("'-'"));
-}
-
-#[test]
-fn err_wrong_type() {
-    let actual = nu!(
-        cwd: ".",
-        "def f [ param1:strig ] { echo hi }"
-    );
-    assert!(actual.err.contains("type"));
-}
-
-//For what ever reason, this gets reported as not used
-#[allow(dead_code)]
-fn assert_signature_has_flag(sign: &Signature, name: &str, type_: NamedType, comment: &str) {
-    assert_eq!(
-        Some((type_, comment.to_string())),
-        sign.named.get(name).cloned()
-    );
-}
-
-#[test]
-fn simple_def_with_only_flags() {
-    let name = "my_func";
-    let sign = "[
-        --list (-l) : path  # First flag
-        --verbose : number # Second flag
-        --all(-a) # My switch
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(
-        &sign,
-        "list",
-        NamedType::Optional(Some('l'), SyntaxShape::FilePath),
-        "First flag",
-    );
-    assert_signature_has_flag(
-        &sign,
-        "verbose",
-        NamedType::Optional(None, SyntaxShape::Number),
-        "Second flag",
-    );
-    assert_signature_has_flag(&sign, "all", NamedType::Switch(Some('a')), "My switch");
-}
-
-#[test]
-fn simple_def_with_params_and_flags() {
-    let name = "my_func";
-    let sign = "[
-        --list (-l) : path  # First flag
-        param1, param2:table # Param2 Doc
-        --verbose # Second flag
-        param3 : number,
-        --flag3 # Third flag
-        param4 ?: table # Optional Param
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(
-        &sign,
-        "list",
-        NamedType::Optional(Some('l'), SyntaxShape::FilePath),
-        "First flag",
-    );
-    assert_signature_has_flag(&sign, "verbose", NamedType::Switch(None), "Second flag");
-    assert_signature_has_flag(&sign, "flag3", NamedType::Switch(None), "Third flag");
-    assert_eq!(
-        sign.positional,
-        vec![
-            (
-                PositionalType::Mandatory("$param1".into(), SyntaxShape::Any),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::Table),
-                "Param2 Doc".into()
-            ),
-            (
-                PositionalType::Mandatory("$param3".into(), SyntaxShape::Number),
-                "".into()
-            ),
-            (
-                PositionalType::Optional("$param4".into(), SyntaxShape::Table),
-                "Optional Param".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn simple_def_with_parameters_and_flags_no_delimiter() {
-    let name = "my_func";
-    let sign = "[ param1:int param2
-            --force (-f) param3 # Param3
-            ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(&sign, "force", NamedType::Switch(Some('f')), "");
-    assert_eq!(
-        sign.positional,
-        // --list (-l) : path  # First flag
-        // param1, param2:table # Param2 Doc
-        // --verbose # Second flag
-        // param3 : number,
-        // --flag3 # Third flag
-        vec![
-            (
-                PositionalType::Mandatory("$param1".into(), SyntaxShape::Int),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param2".into(), SyntaxShape::Any),
-                "".into()
-            ),
-            (
-                PositionalType::Mandatory("$param3".into(), SyntaxShape::Any),
-                "Param3".into()
-            ),
-        ]
-    );
-}
-
-#[test]
-fn simple_example_signature() {
-    let name = "my_func";
-    let sign = "[
-        d:int          # The required d parameter
-        --x (-x):string # The all powerful x flag
-        --y (-y):int    # The accompanying y flag
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(
-        &sign,
-        "x",
-        NamedType::Optional(Some('x'), SyntaxShape::String),
-        "The all powerful x flag",
-    );
-    assert_signature_has_flag(
-        &sign,
-        "y",
-        NamedType::Optional(Some('y'), SyntaxShape::Int),
-        "The accompanying y flag",
-    );
-    assert_eq!(
-        sign.positional,
-        vec![(
-            PositionalType::Mandatory("$d".into(), SyntaxShape::Int),
-            "The required d parameter".into()
-        )]
-    );
-}
-
-#[test]
-fn flag_withouth_space_between_longname_shortname() {
-    let name = "my_func";
-    let sign = "[
-        --xxx(-x):string # The all powerful x flag
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(
-        &sign,
-        "xxx",
-        NamedType::Optional(Some('x'), SyntaxShape::String),
-        "The all powerful x flag",
-    );
-}
-
-#[test]
-fn simple_def_with_rest_arg() {
-    let name = "my_func";
-    let sign = "[ ...rest]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_eq!(
-        sign.rest_positional,
-        Some(("rest".to_string(), SyntaxShape::Any, "".to_string()))
-    );
-}
-
-#[test]
-fn simple_def_with_rest_arg_other_name() {
-    let name = "my_func";
-    let sign = "[ ...paths:path # A pathological test]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_eq!(
-        sign.rest_positional,
-        Some((
-            "paths".to_string(),
-            SyntaxShape::FilePath,
-            "A pathological test".to_string()
-        ))
-    );
-}
-
-#[test]
-fn simple_def_with_rest_arg_with_type_and_comment() {
-    let name = "my_func";
-    let sign = "[ ...rest:path # My super cool rest arg]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_eq!(
-        sign.rest_positional,
-        Some((
-            "rest".to_string(),
-            SyntaxShape::FilePath,
-            "My super cool rest arg".to_string()
-        ))
-    );
-}
-
-#[test]
-fn simple_def_with_param_flag_and_rest() {
-    let name = "my_func";
-    let sign = "[
-        d:string          # The required d parameter
-        --xxx(-x)         # The all powerful x flag
-        --yyy (-y):int    #    The accompanying y flag
-        ...rest:table # Another rest
-        ]";
-    let (sign, err) = parse_signature(name, &sign.to_string().spanned_unknown());
-    assert!(err.is_none());
-    assert_signature_has_flag(
-        &sign,
-        "xxx",
-        NamedType::Switch(Some('x')),
-        "The all powerful x flag",
-    );
-    assert_signature_has_flag(
-        &sign,
-        "yyy",
-        NamedType::Optional(Some('y'), SyntaxShape::Int),
-        "The accompanying y flag",
-    );
-    assert_eq!(
-        sign.positional,
-        vec![(
-            PositionalType::Mandatory("$d".into(), SyntaxShape::String),
-            "The required d parameter".into()
-        )]
-    );
-    assert_eq!(
-        sign.rest_positional,
-        Some((
-            "rest".to_string(),
-            SyntaxShape::Table,
-            "Another rest".to_string()
-        ))
-    );
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/source.rs b/old_nushell/crates/nu-parser/src/parse/source.rs
deleted file mode 100644
index c39960a0c..000000000
--- a/old_nushell/crates/nu-parser/src/parse/source.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use crate::{lex::tokens::LiteCommand, ParserScope};
-use nu_errors::{ArgumentError, ParseError};
-use nu_path::{canonicalize, canonicalize_with};
-use nu_protocol::hir::{Expression, InternalCommand};
-
-use std::path::Path;
-
-use nu_source::SpannedItem;
-
-pub fn parse_source_internal(
-    lite_cmd: &LiteCommand,
-    command: &InternalCommand,
-    scope: &dyn ParserScope,
-) -> Result<(), ParseError> {
-    if lite_cmd.parts.len() != 2 {
-        return Err(ParseError::argument_error(
-            lite_cmd.parts[0].clone(),
-            ArgumentError::MissingMandatoryPositional("a path for sourcing".into()),
-        ));
-    }
-
-    if lite_cmd.parts[1].item.starts_with('$') {
-        return Err(ParseError::mismatch(
-            "a filepath constant",
-            lite_cmd.parts[1].clone(),
-        ));
-    }
-
-    // look for source files in lib dirs first
-    // if not files are found, try the current path
-    // first file found wins.
-    find_source_file(lite_cmd, command, scope)
-}
-
-fn find_source_file(
-    lite_cmd: &LiteCommand,
-    command: &InternalCommand,
-    scope: &dyn ParserScope,
-) -> Result<(), ParseError> {
-    let (file, file_span) = if let Some(ref positional_args) = command.args.positional {
-        if let Expression::FilePath(ref p) = positional_args[0].expr {
-            (p.as_path(), &positional_args[0].span)
-        } else {
-            (Path::new(&lite_cmd.parts[1].item), &lite_cmd.parts[1].span)
-        }
-    } else {
-        (Path::new(&lite_cmd.parts[1].item), &lite_cmd.parts[1].span)
-    };
-
-    let lib_dirs = nu_data::config::config(nu_source::Tag::unknown())
-        .ok()
-        .as_ref()
-        .map(|configuration| match configuration.get("lib_dirs") {
-            Some(paths) => paths
-                .table_entries()
-                .cloned()
-                .map(|path| path.as_string())
-                .collect(),
-            None => vec![],
-        });
-
-    if let Some(dir) = lib_dirs {
-        for lib_path in dir.into_iter().flatten() {
-            let path = if let Ok(p) = canonicalize_with(&file, lib_path) {
-                p
-            } else {
-                continue;
-            };
-
-            if let Ok(contents) = std::fs::read_to_string(&path) {
-                return parse(&contents, 0, scope);
-            }
-        }
-    }
-
-    let path = canonicalize(&file).map_err(|e| {
-        ParseError::general_error(
-            format!("Can't load source file. Reason: {}", e),
-            "Can't load this file".spanned(file_span),
-        )
-    })?;
-
-    let contents = std::fs::read_to_string(&path);
-
-    match contents {
-        Ok(contents) => parse(&contents, 0, scope),
-        Err(e) => Err(ParseError::general_error(
-            format!("Can't load source file. Reason: {}", e),
-            "Can't load this file".spanned(file_span),
-        )),
-    }
-}
-
-pub fn parse(input: &str, span_offset: usize, scope: &dyn ParserScope) -> Result<(), ParseError> {
-    if let (_, Some(parse_error)) = super::parse(input, span_offset, scope) {
-        Err(parse_error)
-    } else {
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/parse/util.rs b/old_nushell/crates/nu-parser/src/parse/util.rs
deleted file mode 100644
index b2c1a2d0d..000000000
--- a/old_nushell/crates/nu-parser/src/parse/util.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use nu_errors::ParseError;
-use nu_protocol::hir::{Expression, SpannedExpression};
-use nu_source::{Span, Spanned, SpannedItem};
-
-use crate::lex::lexer::Token;
-
-pub(crate) fn token_to_spanned_string(token: &Token) -> Spanned<String> {
-    token.contents.to_string().spanned(token.span)
-}
-
-/// Easy shorthand function to create a garbage expression at the given span
-pub fn garbage(span: Span) -> SpannedExpression {
-    SpannedExpression::new(Expression::Garbage, span)
-}
-
-pub(crate) fn trim_quotes(input: &str) -> String {
-    let mut chars = input.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some('\''), Some('\'')) => chars.collect(),
-        (Some('"'), Some('"')) => chars.collect(),
-        _ => input.to_string(),
-    }
-}
-
-pub(crate) fn verify_and_strip(
-    contents: &Spanned<String>,
-    left: char,
-    right: char,
-) -> (String, Option<ParseError>) {
-    let mut chars = contents.item.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some(l), Some(r)) if l == left && r == right => {
-            let output: String = chars.collect();
-            (output, None)
-        }
-        _ => (
-            String::new(),
-            Some(ParseError::mismatch(
-                format!("value in {} {}", left, right),
-                contents.clone(),
-            )),
-        ),
-    }
-}
diff --git a/old_nushell/crates/nu-parser/src/scope.rs b/old_nushell/crates/nu-parser/src/scope.rs
deleted file mode 100644
index 4ea4c5a89..000000000
--- a/old_nushell/crates/nu-parser/src/scope.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use nu_protocol::hir::Block;
-use nu_source::Spanned;
-use std::{fmt::Debug, sync::Arc};
-
-pub trait ParserScope: Debug {
-    fn get_signature(&self, name: &str) -> Option<nu_protocol::Signature>;
-
-    fn has_signature(&self, name: &str) -> bool;
-
-    fn add_definition(&self, block: Arc<Block>);
-
-    fn get_definitions(&self) -> Vec<Arc<Block>>;
-
-    fn get_alias(&self, name: &str) -> Option<Vec<Spanned<String>>>;
-
-    fn remove_alias(&self, name: &str);
-
-    fn add_alias(&self, name: &str, replacement: Vec<Spanned<String>>);
-
-    fn enter_scope(&self);
-
-    fn exit_scope(&self);
-}
diff --git a/old_nushell/crates/nu-parser/src/shapes.rs b/old_nushell/crates/nu-parser/src/shapes.rs
deleted file mode 100644
index 4a638b3a0..000000000
--- a/old_nushell/crates/nu-parser/src/shapes.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use nu_protocol::hir::*;
-use nu_protocol::UnspannedPathMember;
-use nu_source::{Spanned, SpannedItem};
-
-/// Converts a SpannedExpression into a spanned shape(s) ready for color-highlighting
-pub fn expression_to_flat_shape(e: &SpannedExpression) -> Vec<Spanned<FlatShape>> {
-    match &e.expr {
-        Expression::Block(exprs) => shapes(exprs),
-        Expression::Subexpression(exprs) => shapes(exprs),
-        Expression::FilePath(_) => vec![FlatShape::Path.spanned(e.span)],
-        Expression::Garbage => vec![FlatShape::Garbage.spanned(e.span)],
-        Expression::List(exprs) => {
-            let mut output = vec![];
-            for expr in exprs {
-                output.append(&mut expression_to_flat_shape(expr));
-            }
-            output
-        }
-        Expression::Table(headers, cells) => {
-            let mut output = vec![];
-            for header in headers {
-                output.append(&mut expression_to_flat_shape(header));
-            }
-            for row in cells {
-                for cell in row {
-                    output.append(&mut expression_to_flat_shape(cell));
-                }
-            }
-            output
-        }
-        Expression::FullColumnPath(exprs) => {
-            let mut output = vec![];
-            output.append(&mut expression_to_flat_shape(&exprs.head));
-            for member in &exprs.tail {
-                if let UnspannedPathMember::String(_) = &member.unspanned {
-                    output.push(FlatShape::StringMember.spanned(member.span));
-                }
-            }
-            output
-        }
-        Expression::Command => vec![FlatShape::InternalCommand.spanned(e.span)],
-        Expression::Literal(Literal::Bare(_)) => vec![FlatShape::BareMember.spanned(e.span)],
-        Expression::Literal(Literal::ColumnPath(_)) => vec![FlatShape::Path.spanned(e.span)],
-        Expression::Literal(Literal::GlobPattern(_)) => {
-            vec![FlatShape::GlobPattern.spanned(e.span)]
-        }
-        Expression::Literal(Literal::Number(_)) => vec![FlatShape::Int.spanned(e.span)],
-        Expression::Literal(Literal::Operator(_)) => vec![FlatShape::Operator.spanned(e.span)],
-        Expression::Literal(Literal::Size(number, unit)) => vec![FlatShape::Size {
-            number: number.span,
-            unit: unit.span,
-        }
-        .spanned(e.span)],
-        Expression::Literal(Literal::String(_)) => vec![FlatShape::String.spanned(e.span)],
-        Expression::ExternalWord => vec![FlatShape::ExternalWord.spanned(e.span)],
-        Expression::ExternalCommand(_) => vec![FlatShape::ExternalCommand.spanned(e.span)],
-        Expression::Synthetic(_) => vec![FlatShape::BareMember.spanned(e.span)],
-        Expression::Variable(_, _) => vec![FlatShape::Variable.spanned(e.span)],
-        Expression::Binary(binary) => {
-            let mut output = vec![];
-            output.append(&mut expression_to_flat_shape(&binary.left));
-            output.append(&mut expression_to_flat_shape(&binary.op));
-            output.append(&mut expression_to_flat_shape(&binary.right));
-            output
-        }
-        Expression::Range(range) => {
-            let mut output = vec![];
-            if let Some(left) = &range.left {
-                output.append(&mut expression_to_flat_shape(left));
-            }
-            output.push(
-                match &range.operator.item {
-                    RangeOperator::Inclusive => FlatShape::DotDot,
-                    RangeOperator::RightExclusive => FlatShape::DotDotLeftAngleBracket,
-                }
-                .spanned(&range.operator.span),
-            );
-            if let Some(right) = &range.right {
-                output.append(&mut expression_to_flat_shape(right));
-            }
-            output
-        }
-        Expression::Boolean(_) => vec![FlatShape::Keyword.spanned(e.span)],
-    }
-}
-
-/// Converts a series of commands into a vec of spanned shapes ready for color-highlighting
-pub fn shapes(commands: &Block) -> Vec<Spanned<FlatShape>> {
-    let mut output = vec![];
-
-    for group in &commands.block {
-        for pipeline in &group.pipelines {
-            for command in &pipeline.list {
-                match command {
-                    ClassifiedCommand::Internal(internal) => {
-                        output.append(&mut expression_to_flat_shape(&internal.args.head));
-
-                        if let Some(positionals) = &internal.args.positional {
-                            for positional_arg in positionals {
-                                output.append(&mut expression_to_flat_shape(positional_arg));
-                            }
-                        }
-
-                        if let Some(named) = &internal.args.named {
-                            for (_, named_arg) in named {
-                                match named_arg {
-                                    NamedValue::PresentSwitch(span) => {
-                                        output.push(FlatShape::Flag.spanned(*span));
-                                    }
-                                    NamedValue::Value(span, expr) => {
-                                        output.push(FlatShape::Flag.spanned(*span));
-                                        output.append(&mut expression_to_flat_shape(expr));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                        }
-                    }
-                    ClassifiedCommand::Expr(expr) => {
-                        output.append(&mut expression_to_flat_shape(expr))
-                    }
-                    ClassifiedCommand::Dynamic(call) => {
-                        output.append(&mut expression_to_flat_shape(&call.head));
-
-                        if let Some(positionals) = &call.positional {
-                            for positional_arg in positionals {
-                                output.append(&mut expression_to_flat_shape(positional_arg));
-                            }
-                        }
-
-                        if let Some(named) = &call.named {
-                            for (_, named_arg) in named {
-                                match named_arg {
-                                    NamedValue::PresentSwitch(span) => {
-                                        output.push(FlatShape::Flag.spanned(*span));
-                                    }
-                                    NamedValue::Value(span, expr) => {
-                                        output.push(FlatShape::Flag.spanned(*span));
-                                        output.append(&mut expression_to_flat_shape(expr));
-                                    }
-                                    _ => {}
-                                }
-                            }
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    output
-}
diff --git a/old_nushell/crates/nu-parser/tests/main.rs b/old_nushell/crates/nu-parser/tests/main.rs
deleted file mode 100644
index d2737ce19..000000000
--- a/old_nushell/crates/nu-parser/tests/main.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn defs_contain_comment_in_help() {
-    Playground::setup("comment_test", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "my_def.nu",
-            r#"
-                # I comment and test. I am a good boy.
-                def comment_philosphy [] {
-                    echo It’s not a bug – it’s an undocumented feature. (Anonymous)
-                }
-                "#,
-        )]);
-
-        let actual = nu!(cwd: dirs.test(), r#"
-            source my_def.nu
-            help comment_philosphy
-            "#);
-
-        assert!(actual.out.contains("I comment and test. I am a good boy."));
-    });
-}
-
-#[test]
-fn defs_contain_multiple_comments_in_help() {
-    Playground::setup("comment_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "my_def.nu",
-            r#"
-                # I comment and test. I am a good boy.
-                def comment_philosphy [] {
-                    echo It’s not a bug – it’s an undocumented feature. (Anonymous)
-                }
-
-                # I comment and test all my functions. I am a very good boy.
-                def comment_philosphy_2 [] {
-                    echo It’s not a bug – it’s an undocumented feature. (Anonymous)
-                }
-
-
-                # I comment and test all my functions. I am the best boy.
-                def comment_philosphy_3 [] {
-                    echo It’s not a bug – it’s an undocumented feature. (Anonymous)
-                }
-                "#,
-        )]);
-
-        let actual = nu!(cwd: dirs.test(), r#"
-            source my_def.nu
-            help comment_philosphy
-            help comment_philosphy_2
-            help comment_philosphy_3
-            "#);
-
-        assert!(actual.out.contains("I comment and test. I am a good boy."));
-        assert!(actual
-            .out
-            .contains("I comment and test all my functions. I am a very good boy."));
-        assert!(actual
-            .out
-            .contains("I comment and test all my functions. I am the best boy."));
-    });
-}
diff --git a/old_nushell/crates/nu-path/Cargo.toml b/old_nushell/crates/nu-path/Cargo.toml
deleted file mode 100644
index df7b77163..000000000
--- a/old_nushell/crates/nu-path/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Path handling library for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-path"
-version = "0.43.0"
-
-[dependencies]
-dirs-next = "2.0.0"
-dunce = "1.0.1"
-
diff --git a/old_nushell/crates/nu-path/README.md b/old_nushell/crates/nu-path/README.md
deleted file mode 100644
index 382fd687b..000000000
--- a/old_nushell/crates/nu-path/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nu-path
-
-This crate takes care of path handling in Nushell, such as canonicalization and component expansion, as well as other path-related utilities.
diff --git a/old_nushell/crates/nu-path/src/dots.rs b/old_nushell/crates/nu-path/src/dots.rs
deleted file mode 100644
index 0439b36d9..000000000
--- a/old_nushell/crates/nu-path/src/dots.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-use std::path::{is_separator, Component, Path, PathBuf};
-
-const EXPAND_STR: &str = if cfg!(windows) { r"..\" } else { "../" };
-
-fn handle_dots_push(string: &mut String, count: u8) {
-    if count < 1 {
-        return;
-    }
-
-    if count == 1 {
-        string.push('.');
-        return;
-    }
-
-    for _ in 0..(count - 1) {
-        string.push_str(EXPAND_STR);
-    }
-
-    string.pop(); // remove last '/'
-}
-
-/// Expands any occurrence of more than two dots into a sequence of ../ (or ..\ on windows), e.g.,
-/// "..." into "../..", "...." into "../../../", etc.
-pub fn expand_ndots(path: impl AsRef<Path>) -> PathBuf {
-    // Check if path is valid UTF-8 and if not, return it as it is to avoid breaking it via string
-    // conversion.
-    let path_str = match path.as_ref().to_str() {
-        Some(s) => s,
-        None => return path.as_ref().into(),
-    };
-
-    // find if we need to expand any >2 dot paths and early exit if not
-    let mut dots_count = 0u8;
-    let ndots_present = {
-        for chr in path_str.chars() {
-            if chr == '.' {
-                dots_count += 1;
-            } else {
-                if is_separator(chr) && (dots_count > 2) {
-                    // this path component had >2 dots
-                    break;
-                }
-
-                dots_count = 0;
-            }
-        }
-
-        dots_count > 2
-    };
-
-    if !ndots_present {
-        return path.as_ref().into();
-    }
-
-    let mut dots_count = 0u8;
-    let mut expanded = String::new();
-    for chr in path_str.chars() {
-        if chr == '.' {
-            dots_count += 1;
-        } else {
-            if is_separator(chr) {
-                // check for dots expansion only at path component boundaries
-                handle_dots_push(&mut expanded, dots_count);
-                dots_count = 0;
-            } else {
-                // got non-dot within path component => do not expand any dots
-                while dots_count > 0 {
-                    expanded.push('.');
-                    dots_count -= 1;
-                }
-            }
-            expanded.push(chr);
-        }
-    }
-
-    handle_dots_push(&mut expanded, dots_count);
-
-    expanded.into()
-}
-
-/// Expand "." and ".." into nothing and parent directory, respectively.
-pub fn expand_dots(path: impl AsRef<Path>) -> PathBuf {
-    let path = path.as_ref();
-
-    // Early-exit if path does not contain '.' or '..'
-    if !path
-        .components()
-        .any(|c| std::matches!(c, Component::CurDir | Component::ParentDir))
-    {
-        return path.into();
-    }
-
-    let mut result = PathBuf::with_capacity(path.as_os_str().len());
-
-    // Only pop/skip path elements if the previous one was an actual path element
-    let prev_is_normal = |p: &Path| -> bool {
-        p.components()
-            .next_back()
-            .map(|c| std::matches!(c, Component::Normal(_)))
-            .unwrap_or(false)
-    };
-
-    path.components().for_each(|component| match component {
-        Component::ParentDir if prev_is_normal(&result) => {
-            result.pop();
-        }
-        Component::CurDir if prev_is_normal(&result) => {}
-        _ => result.push(component),
-    });
-
-    dunce::simplified(&result).to_path_buf()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn expand_two_dots() {
-        let path = Path::new("/foo/bar/..");
-
-        assert_eq!(
-            PathBuf::from("/foo"), // missing path
-            expand_dots(path)
-        );
-    }
-
-    #[test]
-    fn expand_dots_with_curdir() {
-        let path = Path::new("/foo/./bar/./baz");
-
-        assert_eq!(PathBuf::from("/foo/bar/baz"), expand_dots(path));
-    }
-
-    fn check_ndots_expansion(expected: &str, s: &str) {
-        let expanded = expand_ndots(Path::new(s));
-        assert_eq!(Path::new(expected), &expanded);
-    }
-
-    // common tests
-    #[test]
-    fn string_without_ndots() {
-        check_ndots_expansion("../hola", "../hola");
-    }
-
-    #[test]
-    fn string_with_three_ndots_and_chars() {
-        check_ndots_expansion("a...b", "a...b");
-    }
-
-    #[test]
-    fn string_with_two_ndots_and_chars() {
-        check_ndots_expansion("a..b", "a..b");
-    }
-
-    #[test]
-    fn string_with_one_dot_and_chars() {
-        check_ndots_expansion("a.b", "a.b");
-    }
-
-    #[test]
-    fn expand_dots_double_dots_no_change() {
-        // Can't resolve this as we don't know our parent dir
-        assert_eq!(Path::new(".."), expand_dots(Path::new("..")));
-    }
-
-    #[test]
-    fn expand_dots_single_dot_no_change() {
-        // Can't resolve this as we don't know our current dir
-        assert_eq!(Path::new("."), expand_dots(Path::new(".")));
-    }
-
-    #[test]
-    fn expand_dots_multi_single_dots_no_change() {
-        assert_eq!(Path::new("././."), expand_dots(Path::new("././.")));
-    }
-
-    #[test]
-    fn expand_multi_double_dots_no_change() {
-        assert_eq!(Path::new("../../../"), expand_dots(Path::new("../../../")));
-    }
-
-    #[test]
-    fn expand_dots_no_change_with_dirs() {
-        // Can't resolve this as we don't know our parent dir
-        assert_eq!(
-            Path::new("../../../dir1/dir2/"),
-            expand_dots(Path::new("../../../dir1/dir2"))
-        );
-    }
-
-    #[test]
-    fn expand_dots_simple() {
-        assert_eq!(Path::new("/foo"), expand_dots(Path::new("/foo/bar/..")));
-    }
-
-    #[test]
-    fn expand_dots_complex() {
-        assert_eq!(
-            Path::new("/test"),
-            expand_dots(Path::new("/foo/./bar/../../test/././test2/../"))
-        );
-    }
-
-    #[cfg(windows)]
-    mod windows {
-        use super::*;
-
-        #[test]
-        fn string_with_three_ndots() {
-            check_ndots_expansion(r"..\..", "...");
-        }
-
-        #[test]
-        fn string_with_mixed_ndots_and_chars() {
-            check_ndots_expansion(
-                r"a...b/./c..d/../e.f/..\..\..//.",
-                "a...b/./c..d/../e.f/....//.",
-            );
-        }
-
-        #[test]
-        fn string_with_three_ndots_and_final_slash() {
-            check_ndots_expansion(r"..\../", ".../");
-        }
-
-        #[test]
-        fn string_with_three_ndots_and_garbage() {
-            check_ndots_expansion(r"ls ..\../ garbage.*[", "ls .../ garbage.*[");
-        }
-    }
-
-    #[cfg(not(windows))]
-    mod non_windows {
-        use super::*;
-        #[test]
-        fn string_with_three_ndots() {
-            check_ndots_expansion(r"../..", "...");
-        }
-
-        #[test]
-        fn string_with_mixed_ndots_and_chars() {
-            check_ndots_expansion(
-                "a...b/./c..d/../e.f/../../..//.",
-                "a...b/./c..d/../e.f/....//.",
-            );
-        }
-
-        #[test]
-        fn string_with_three_ndots_and_final_slash() {
-            check_ndots_expansion("../../", ".../");
-        }
-
-        #[test]
-        fn string_with_three_ndots_and_garbage() {
-            check_ndots_expansion("ls ../../ garbage.*[", "ls .../ garbage.*[");
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-path/src/expansions.rs b/old_nushell/crates/nu-path/src/expansions.rs
deleted file mode 100644
index 3393a5793..000000000
--- a/old_nushell/crates/nu-path/src/expansions.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::io;
-use std::path::{Path, PathBuf};
-
-use super::dots::{expand_dots, expand_ndots};
-use super::tilde::expand_tilde;
-
-// Join a path relative to another path. Paths starting with tilde are considered as absolute.
-fn join_path_relative<P, Q>(path: P, relative_to: Q) -> PathBuf
-where
-    P: AsRef<Path>,
-    Q: AsRef<Path>,
-{
-    let path = path.as_ref();
-    let relative_to = relative_to.as_ref();
-
-    if path == Path::new(".") {
-        // Joining a Path with '.' appends a '.' at the end, making the prompt
-        // more ugly - so we don't do anything, which should result in an equal
-        // path on all supported systems.
-        relative_to.into()
-    } else if path.starts_with("~") {
-        // do not end up with "/some/path/~"
-        path.into()
-    } else {
-        relative_to.join(path)
-    }
-}
-
-/// Resolve all symbolic links and all components (tilde, ., .., ...+) and return the path in its
-/// absolute form.
-///
-/// Fails under the same conditions as
-/// [std::fs::canonicalize](https://doc.rust-lang.org/std/fs/fn.canonicalize.html).
-pub fn canonicalize(path: impl AsRef<Path>) -> io::Result<PathBuf> {
-    let path = expand_tilde(path);
-    let path = expand_ndots(path);
-
-    dunce::canonicalize(path)
-}
-
-/// Same as canonicalize() but the input path is specified relative to another path
-pub fn canonicalize_with<P, Q>(path: P, relative_to: Q) -> io::Result<PathBuf>
-where
-    P: AsRef<Path>,
-    Q: AsRef<Path>,
-{
-    let path = join_path_relative(path, relative_to);
-
-    canonicalize(path)
-}
-
-/// Resolve only path components (tilde, ., .., ...+), if possible.
-///
-/// The function works in a "best effort" mode: It does not fail but rather returns the unexpanded
-/// version if the expansion is not possible.
-///
-/// Furthermore, unlike canonicalize(), it does not use sys calls (such as readlink).
-///
-/// Does not convert to absolute form nor does it resolve symlinks.
-pub fn expand_path(path: impl AsRef<Path>) -> PathBuf {
-    let path = expand_tilde(path);
-    let path = expand_ndots(path);
-    expand_dots(path)
-}
-
-/// Same as expand_path() but the input path is specified relative to another path
-pub fn expand_path_with<P, Q>(path: P, relative_to: Q) -> PathBuf
-where
-    P: AsRef<Path>,
-    Q: AsRef<Path>,
-{
-    let path = join_path_relative(path, relative_to);
-
-    expand_path(path)
-}
diff --git a/old_nushell/crates/nu-path/src/lib.rs b/old_nushell/crates/nu-path/src/lib.rs
deleted file mode 100644
index 9606bc15c..000000000
--- a/old_nushell/crates/nu-path/src/lib.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-mod dots;
-mod expansions;
-mod tilde;
-mod util;
-
-pub use expansions::{canonicalize, canonicalize_with, expand_path, expand_path_with};
-pub use tilde::expand_tilde;
-pub use util::trim_trailing_slash;
diff --git a/old_nushell/crates/nu-path/src/tilde.rs b/old_nushell/crates/nu-path/src/tilde.rs
deleted file mode 100644
index e1c7ec56a..000000000
--- a/old_nushell/crates/nu-path/src/tilde.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use std::path::{Path, PathBuf};
-
-fn expand_tilde_with(path: impl AsRef<Path>, home: Option<PathBuf>) -> PathBuf {
-    let path = path.as_ref();
-
-    if !path.starts_with("~") {
-        return path.into();
-    }
-
-    match home {
-        None => path.into(),
-        Some(mut h) => {
-            if h == Path::new("/") {
-                // Corner case: `h` is a root directory;
-                // don't prepend extra `/`, just drop the tilde.
-                path.strip_prefix("~").unwrap_or(path).into()
-            } else {
-                if let Ok(p) = path.strip_prefix("~/") {
-                    h.push(p)
-                }
-                h
-            }
-        }
-    }
-}
-
-/// Expand tilde ("~") into a home directory if it is the first path component
-pub fn expand_tilde(path: impl AsRef<Path>) -> PathBuf {
-    // TODO: Extend this to work with "~user" style of home paths
-    expand_tilde_with(path, dirs_next::home_dir())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn check_expanded(s: &str) {
-        let home = Path::new("/home");
-        let buf = Some(PathBuf::from(home));
-        assert!(expand_tilde_with(Path::new(s), buf).starts_with(&home));
-
-        // Tests the special case in expand_tilde for "/" as home
-        let home = Path::new("/");
-        let buf = Some(PathBuf::from(home));
-        assert!(!expand_tilde_with(Path::new(s), buf).starts_with("//"));
-    }
-
-    fn check_not_expanded(s: &str) {
-        let home = PathBuf::from("/home");
-        let expanded = expand_tilde_with(Path::new(s), Some(home));
-        assert!(expanded == Path::new(s));
-    }
-
-    #[test]
-    fn string_with_tilde() {
-        check_expanded("~");
-    }
-
-    #[test]
-    fn string_with_tilde_forward_slash() {
-        check_expanded("~/test/");
-    }
-
-    #[test]
-    fn string_with_tilde_double_forward_slash() {
-        check_expanded("~//test/");
-    }
-
-    #[test]
-    fn does_not_expand_tilde_if_tilde_is_not_first_character() {
-        check_not_expanded("1~1");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn string_with_tilde_backslash() {
-        check_expanded("~\\test/test2/test3");
-    }
-
-    #[cfg(windows)]
-    #[test]
-    fn string_with_double_tilde_backslash() {
-        check_expanded("~\\\\test\\test2/test3");
-    }
-}
diff --git a/old_nushell/crates/nu-path/src/util.rs b/old_nushell/crates/nu-path/src/util.rs
deleted file mode 100644
index 63351e6ae..000000000
--- a/old_nushell/crates/nu-path/src/util.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-/// Trim trailing path separator from a string
-pub fn trim_trailing_slash(s: &str) -> &str {
-    s.trim_end_matches(std::path::is_separator)
-}
diff --git a/old_nushell/crates/nu-path/tests/mod.rs b/old_nushell/crates/nu-path/tests/mod.rs
deleted file mode 100644
index 83c8c0aa0..000000000
--- a/old_nushell/crates/nu-path/tests/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod util;
diff --git a/old_nushell/crates/nu-path/tests/util.rs b/old_nushell/crates/nu-path/tests/util.rs
deleted file mode 100644
index 601d9dd43..000000000
--- a/old_nushell/crates/nu-path/tests/util.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use nu_path::trim_trailing_slash;
-use std::path::MAIN_SEPARATOR;
-
-/// Helper function that joins string literals with '/' or '\', based on the host OS
-fn join_path_sep(pieces: &[&str]) -> String {
-    let sep_string = String::from(MAIN_SEPARATOR);
-    pieces.join(&sep_string)
-}
-
-#[test]
-fn trims_trailing_slash_without_trailing_slash() {
-    let path = join_path_sep(&["some", "path"]);
-
-    let actual = trim_trailing_slash(&path);
-
-    assert_eq!(actual, &path)
-}
-
-#[test]
-fn trims_trailing_slash() {
-    let path = join_path_sep(&["some", "path", ""]);
-
-    let actual = trim_trailing_slash(&path);
-    let expected = join_path_sep(&["some", "path"]);
-
-    assert_eq!(actual, &expected)
-}
-
-#[test]
-fn trims_many_trailing_slashes() {
-    let path = join_path_sep(&["some", "path", "", "", "", ""]);
-
-    let actual = trim_trailing_slash(&path);
-    let expected = join_path_sep(&["some", "path"]);
-
-    assert_eq!(actual, &expected)
-}
-
-#[test]
-fn trims_trailing_slash_empty() {
-    let path = String::from(MAIN_SEPARATOR);
-    let actual = trim_trailing_slash(&path);
-
-    assert_eq!(actual, "")
-}
diff --git a/old_nushell/crates/nu-plugin/Cargo.toml b/old_nushell/crates/nu-plugin/Cargo.toml
deleted file mode 100644
index 87c640d5b..000000000
--- a/old_nushell/crates/nu-plugin/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Nushell Plugin"
-edition = "2018"
-license = "MIT"
-name = "nu-plugin"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-nu-test-support = { path="../nu-test-support", version = "0.43.0" }
-nu-value-ext = { path="../nu-value-ext", version = "0.43.0" }
-indexmap = { version="1.6.1", features=["serde-1"] }
-serde = { version="1.0", features=["derive"] }
-serde_json = "1.0"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu-plugin/src/jsonrpc.rs b/old_nushell/crates/nu-plugin/src/jsonrpc.rs
deleted file mode 100644
index 93b000e95..000000000
--- a/old_nushell/crates/nu-plugin/src/jsonrpc.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use nu_protocol::{CallInfo, Value};
-use serde::{Deserialize, Serialize};
-use std::io::Write;
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct JsonRpc<T> {
-    jsonrpc: String,
-    pub method: String,
-    pub params: T,
-}
-
-impl<T> JsonRpc<T> {
-    pub fn new<U: Into<String>>(method: U, params: T) -> Self {
-        JsonRpc {
-            jsonrpc: "2.0".into(),
-            method: method.into(),
-            params,
-        }
-    }
-}
-
-pub fn send_response<T: Serialize>(result: T) {
-    let response = JsonRpc::new("response", result);
-    let response_raw = serde_json::to_string(&response);
-
-    let mut stdout = std::io::stdout();
-
-    match response_raw {
-        Ok(response) => {
-            let _ = writeln!(stdout, "{}", response);
-        }
-        Err(err) => {
-            let _ = writeln!(stdout, "{}", err);
-        }
-    };
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "method")]
-#[allow(non_camel_case_types)]
-pub enum NuCommand {
-    config,
-    begin_filter { params: CallInfo },
-    filter { params: Value },
-    end_filter,
-    sink { params: (CallInfo, Vec<Value>) },
-    quit,
-}
diff --git a/old_nushell/crates/nu-plugin/src/lib.rs b/old_nushell/crates/nu-plugin/src/lib.rs
deleted file mode 100644
index 8b6d5122a..000000000
--- a/old_nushell/crates/nu-plugin/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod jsonrpc;
-mod plugin;
-
-pub mod test_helpers;
-
-pub use crate::plugin::{serve_plugin, Plugin};
diff --git a/old_nushell/crates/nu-plugin/src/plugin.rs b/old_nushell/crates/nu-plugin/src/plugin.rs
deleted file mode 100644
index e764dbf72..000000000
--- a/old_nushell/crates/nu-plugin/src/plugin.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use crate::jsonrpc::{send_response, NuCommand};
-use nu_errors::ShellError;
-use nu_protocol::{CallInfo, ReturnValue, Signature, Value};
-use std::io;
-
-/// The `Plugin` trait defines the API which plugins may use to "hook" into nushell.
-pub trait Plugin {
-    /// The `config` method is used to configure a plugin's user interface / signature.
-    ///
-    /// This is where the "name" of the plugin (ex `fetch`), description, any required/optional fields, and flags
-    /// can be defined. This information will displayed in nushell when running help <plugin name>
-    fn config(&mut self) -> Result<Signature, ShellError>;
-
-    /// `begin_filter` is the first method to be called if the `Signature` of the plugin is configured to be filterable.
-    /// Any setup required for the plugin such as parsing arguments from `CallInfo` or initializing data structures
-    /// can be done here. The `CallInfo` parameter will contain data configured in the `config` method of the Plugin trait.
-    fn begin_filter(&mut self, _call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        Ok(vec![])
-    }
-
-    /// `filter` is called for every `Value` that is processed by the plugin.
-    /// This method requires the plugin `Signature` to be configured as filterable.
-    fn filter(&mut self, _input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        Ok(vec![])
-    }
-
-    /// `end_filter` is the last method to be called by the plugin after all `Value`s are processed by the plugin.
-    /// This method requires the plugin `Signature` to be configured as filterable.
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        Ok(vec![])
-    }
-
-    /// `sink` consumes the `Value`s that are passed in, preventing further processing.
-    /// This method requires the plugin `Signature` to be configured without filtering.
-    fn sink(&mut self, _call_info: CallInfo, _input: Vec<Value>) {}
-
-    fn quit(&mut self) {}
-}
-
-pub fn serve_plugin(plugin: &mut dyn Plugin) {
-    let mut args = std::env::args();
-    if args.len() > 1 {
-        let input = args.nth(1);
-
-        let input = match input {
-            Some(arg) => std::fs::read_to_string(arg),
-            None => {
-                send_response(ShellError::untagged_runtime_error("No input given."));
-                return;
-            }
-        };
-
-        if let Ok(input) = input {
-            let command = serde_json::from_str::<NuCommand>(&input);
-            match command {
-                Ok(NuCommand::config) => {
-                    send_response(plugin.config());
-                }
-                Ok(NuCommand::begin_filter { params }) => {
-                    send_response(plugin.begin_filter(params));
-                }
-                Ok(NuCommand::filter { params }) => {
-                    send_response(plugin.filter(params));
-                }
-                Ok(NuCommand::end_filter) => {
-                    send_response(plugin.end_filter());
-                }
-
-                Ok(NuCommand::sink { params }) => {
-                    plugin.sink(params.0, params.1);
-                }
-                Ok(NuCommand::quit) => {
-                    plugin.quit();
-                }
-                e => {
-                    send_response(ShellError::untagged_runtime_error(format!(
-                        "Could not handle plugin message: {} {:?}",
-                        input, e
-                    )));
-                }
-            }
-        }
-    } else {
-        loop {
-            let mut input = String::new();
-            match io::stdin().read_line(&mut input) {
-                Ok(_) => {
-                    let command = serde_json::from_str::<NuCommand>(&input);
-                    match command {
-                        Ok(NuCommand::config) => {
-                            send_response(plugin.config());
-                            break;
-                        }
-                        Ok(NuCommand::begin_filter { params }) => {
-                            send_response(plugin.begin_filter(params));
-                        }
-                        Ok(NuCommand::filter { params }) => {
-                            send_response(plugin.filter(params));
-                        }
-                        Ok(NuCommand::end_filter) => {
-                            send_response(plugin.end_filter());
-                            break;
-                        }
-                        Ok(NuCommand::sink { params }) => {
-                            plugin.sink(params.0, params.1);
-                            break;
-                        }
-                        Ok(NuCommand::quit) => {
-                            plugin.quit();
-                            break;
-                        }
-                        e => {
-                            send_response(ShellError::untagged_runtime_error(format!(
-                                "Could not handle plugin message: {} {:?}",
-                                input, e
-                            )));
-                            break;
-                        }
-                    }
-                }
-                e => {
-                    send_response(ShellError::untagged_runtime_error(format!(
-                        "Could not handle plugin message: {:?}",
-                        e,
-                    )));
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-plugin/src/test_helpers.rs b/old_nushell/crates/nu-plugin/src/test_helpers.rs
deleted file mode 100644
index 423ca00a1..000000000
--- a/old_nushell/crates/nu-plugin/src/test_helpers.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use crate::Plugin;
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{
-    CallInfo, EvaluatedArgs, Primitive, ReturnSuccess, ReturnValue, UntaggedValue, Value,
-};
-use nu_source::Tag;
-use nu_test_support::value::column_path;
-use nu_value_ext::ValueExt;
-
-pub struct PluginTest<'a, T: Plugin> {
-    plugin: &'a mut T,
-    call_info: CallInfo,
-    input: Value,
-}
-
-impl<'a, T: Plugin> PluginTest<'a, T> {
-    pub fn for_plugin(plugin: &'a mut T) -> Self {
-        PluginTest {
-            plugin,
-            call_info: CallStub::new().create(),
-            input: UntaggedValue::nothing().into_value(Tag::unknown()),
-        }
-    }
-
-    pub fn args(&mut self, call_info: CallInfo) -> &mut PluginTest<'a, T> {
-        self.call_info = call_info;
-        self
-    }
-
-    pub fn configure(&mut self, callback: impl FnOnce(Vec<String>)) -> &mut PluginTest<'a, T> {
-        let signature = self
-            .plugin
-            .config()
-            .expect("There was a problem configuring the plugin.");
-        callback(signature.named.keys().map(String::from).collect());
-        self
-    }
-
-    pub fn input(&mut self, value: Value) -> &mut PluginTest<'a, T> {
-        self.input = value;
-        self
-    }
-
-    pub fn test(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        let return_values = self.plugin.filter(self.input.clone());
-        let mut return_values = return_values?;
-        let end = self.plugin.end_filter();
-
-        return_values.extend(end?);
-
-        self.plugin.quit();
-        Ok(return_values)
-    }
-
-    pub fn setup(
-        &mut self,
-        callback: impl FnOnce(&mut T, Result<Vec<ReturnValue>, ShellError>),
-    ) -> &mut PluginTest<'a, T> {
-        let call_stub = self.call_info.clone();
-
-        self.configure(|flags_configured| {
-            let flags_registered = &call_stub.args.named;
-
-            let flag_passed = flags_registered
-                .as_ref()
-                .map(|names| names.keys().map(String::from).collect::<Vec<String>>());
-
-            if let Some(flags) = flag_passed {
-                for flag in flags {
-                    assert!(
-                        flags_configured.iter().any(|f| *f == flag),
-                        "The flag you passed is not configured in the plugin.",
-                    );
-                }
-            }
-        });
-
-        let return_values = self.plugin.begin_filter(call_stub);
-
-        callback(self.plugin, return_values);
-        self
-    }
-}
-
-pub fn plugin<T: Plugin>(plugin: &mut T) -> PluginTest<T> {
-    PluginTest::for_plugin(plugin)
-}
-
-#[derive(Default)]
-pub struct CallStub {
-    positionals: Vec<Value>,
-    flags: IndexMap<String, Value>,
-}
-
-impl CallStub {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    pub fn with_named_parameter(&mut self, name: &str, value: Value) -> &mut Self {
-        self.flags.insert(name.to_string(), value);
-        self
-    }
-
-    pub fn with_long_flag(&mut self, name: &str) -> &mut Self {
-        self.flags.insert(
-            name.to_string(),
-            UntaggedValue::boolean(true).into_value(Tag::unknown()),
-        );
-        self
-    }
-
-    pub fn with_parameter(&mut self, name: &str) -> Result<&mut Self, ShellError> {
-        let cp = column_path(name)
-            .as_column_path()
-            .expect("Failed! Expected valid column path.");
-        let cp = UntaggedValue::Primitive(Primitive::ColumnPath(cp.item)).into_value(cp.tag);
-
-        self.positionals.push(cp);
-        Ok(self)
-    }
-
-    pub fn create(&self) -> CallInfo {
-        CallInfo {
-            args: EvaluatedArgs::new(Some(self.positionals.clone()), Some(self.flags.clone())),
-            name_tag: Tag::unknown(),
-        }
-    }
-}
-
-pub fn expect_return_value_at(
-    for_results: Result<Vec<Result<ReturnSuccess, ShellError>>, ShellError>,
-    at: usize,
-) -> Value {
-    let return_values = for_results
-        .expect("Failed! This seems to be an error getting back the results from the plugin.");
-
-    for (idx, item) in return_values.iter().enumerate() {
-        let item = match item {
-            Ok(return_value) => return_value,
-            Err(_) => panic!("Unexpected value"),
-        };
-
-        if idx == at {
-            if let Some(value) = item.raw_value() {
-                return value;
-            } else {
-                panic!("Internal error: could not get raw value in expect_return_value_at")
-            }
-        }
-    }
-
-    panic!("Couldn't get return value from stream.")
-}
diff --git a/old_nushell/crates/nu-pretty-hex/Cargo.lock b/old_nushell/crates/nu-pretty-hex/Cargo.lock
deleted file mode 100644
index 1bfc1820e..000000000
--- a/old_nushell/crates/nu-pretty-hex/Cargo.lock
+++ /dev/null
@@ -1,201 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "as-slice"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
-dependencies = [
- "generic-array 0.12.4",
- "generic-array 0.13.3",
- "generic-array 0.14.4",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hash32"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "heapless"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634bd4d29cbf24424d0a4bfcbf80c6960129dc24424752a7d1d1390607023422"
-dependencies = [
- "as-slice",
- "generic-array 0.14.4",
- "hash32",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd69a141e8fdfa5ac882d8b816db2b9ad138ef7e3baa7cb753a9b3789aa8c7e"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "nu-pretty-hex"
-version = "0.2.1"
-dependencies = [
- "heapless",
- "nu-ansi-term",
- "rand",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
-
-[[package]]
-name = "rand"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "typenum"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
-
-[[package]]
-name = "version_check"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/old_nushell/crates/nu-pretty-hex/Cargo.toml b/old_nushell/crates/nu-pretty-hex/Cargo.toml
deleted file mode 100644
index cff77a5bc..000000000
--- a/old_nushell/crates/nu-pretty-hex/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-authors = ["Andrei Volnin <wolandr@gmail.com>", "The Nu Project Contributors"]
-description = "Pretty hex dump of bytes slice in the common style."
-edition = "2018"
-license = "MIT"
-name = "nu-pretty-hex"
-version = "0.43.0"
-
-[lib]
-doctest = false
-name = "nu_pretty_hex"
-path = "src/lib.rs"
-
-[[bin]]
-name = "nu_pretty_hex"
-path = "src/main.rs"
-
-[dependencies]
-nu-ansi-term = { path="../nu-ansi-term", version = "0.43.0" }
-rand = "0.8.3"
-
-[dev-dependencies]
-heapless = { version = "0.7.8", default-features = false }
-
-# [features]
-# default = ["alloc"]
-# alloc = []
diff --git a/old_nushell/crates/nu-pretty-hex/LICENSE b/old_nushell/crates/nu-pretty-hex/LICENSE
deleted file mode 100644
index f70169fa2..000000000
--- a/old_nushell/crates/nu-pretty-hex/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Andrei Volnin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/old_nushell/crates/nu-pretty-hex/README.md b/old_nushell/crates/nu-pretty-hex/README.md
deleted file mode 100644
index 7c640cc28..000000000
--- a/old_nushell/crates/nu-pretty-hex/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# nu-pretty-hex
-
-An update of prett-hex to make it prettier
-
-[![crates.io](https://img.shields.io/crates/v/pretty-hex.svg)](https://crates.io/crates/pretty-hex)
-[![docs.rs](https://docs.rs/pretty-hex/badge.svg)](https://docs.rs/pretty-hex)
-
-A Rust library providing pretty hex dump.
-
-A `simple_hex()` way renders one-line hex dump, a `pretty_hex()` way renders
-columned multi-line hex dump with addressing and ASCII representation.
-A `config_hex()` way renders hex dump in specified format.
-
-## Inspiration
-
-[Hexed](https://github.com/adolfohw/hexed) \
-[Hexyl](https://github.com/sharkdp/hexyl) \
-[Pretty-hex](https://github.com/wolandr/pretty-hex)
-
-## Example of `simple_hex()`
-
-```rust
-use pretty_hex::*;
-
-let v = vec![222, 173, 190, 239, 202, 254, 32, 24];
-assert_eq!(simple_hex(&v), format!("{}", v.hex_dump()));
-
-println!("{}", v.hex_dump());
-
-```
-
-Output:
-
-```text
-de ad be ef  ca fe 20 18
-```
-
-## Example of `pretty_hex()`
-
-```rust
-use pretty_hex::*;
-
-let v: &[u8] = &random::<[u8;30]>();
-assert_eq!(pretty_hex(&v), format!("{:?}", v.hex_dump()));
-
-println!("{:?}", v.hex_dump());
-```
-
-Output:
-
-```text
-Length: 30 (0x1e) bytes
-0000:   6b 4e 1a c3  af 03 d2 1e  7e 73 ba c8  bd 84 0f 83   kN......~s......
-0010:   89 d5 cf 90  23 67 4b 48  db b1 bc 35  bf ee         ....#gKH...5..
-```
-
-## Example of `config_hex()`
-
-```rust
-use pretty_hex::*;
-
-let cfg = HexConfig {title: false, width: 8, group: 0, ..HexConfig::default() };
-
-let v = &include_bytes!("data");
-assert_eq!(config_hex(&v, cfg), format!("{:?}", v.hex_conf(cfg)));
-
-println!("{:?}", v.hex_conf(cfg));
-```
-
-Output:
-
-```text
-0000:   6b 4e 1a c3 af 03 d2 1e   kN......
-0008:   7e 73 ba c8 bd 84 0f 83   ~s......
-0010:   89 d5 cf 90 23 67 4b 48   ....#gKH
-0018:   db b1 bc 35 bf ee         ...5..
-```
-
----
-
-Inspired by [haskell's pretty-hex](https://hackage.haskell.org/package/pretty-hex-1.0).
diff --git a/old_nushell/crates/nu-pretty-hex/src/lib.rs b/old_nushell/crates/nu-pretty-hex/src/lib.rs
deleted file mode 100644
index d34542a7e..000000000
--- a/old_nushell/crates/nu-pretty-hex/src/lib.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-// #![no_std]
-
-//! A Rust library providing pretty hex dump.
-//!
-//! A `simple_hex()` way renders one-line hex dump, and a `pretty_hex()` way renders
-//! columned multi-line hex dump with addressing and ASCII representation.
-//! A `config_hex()` way renders hex dump in specified format.
-//!
-//! ## Example of `simple_hex()`
-//! ```
-//! use pretty_hex::*;
-//!
-//! let v = vec![222, 173, 190, 239, 202, 254, 32, 24];
-//! # #[cfg(feature = "alloc")]
-//! assert_eq!(simple_hex(&v), format!("{}", v.hex_dump()));
-//!
-//! println!("{}", v.hex_dump());
-//! ```
-//! Output:
-//!
-//! ```text
-//! de ad be ef  ca fe 20 18
-//! ```
-//! ## Example of `pretty_hex()`
-//! ```
-//! use pretty_hex::*;
-//!
-//! let v = &include_bytes!("../tests/data");
-//! # #[cfg(feature = "alloc")]
-//! assert_eq!(pretty_hex(&v), format!("{:?}", v.hex_dump()));
-//!
-//! println!("{:?}", v.hex_dump());
-//! ```
-//! Output:
-//!
-//! ```text
-//! Length: 30 (0x1e) bytes
-//! 0000:   6b 4e 1a c3  af 03 d2 1e  7e 73 ba c8  bd 84 0f 83   kN......~s......
-//! 0010:   89 d5 cf 90  23 67 4b 48  db b1 bc 35  bf ee         ....#gKH...5..
-//! ```
-//! ## Example of `config_hex()`
-//! ```
-//! use pretty_hex::*;
-//!
-//! let cfg = HexConfig {title: false, width: 8, group: 0, ..HexConfig::default() };
-//!
-//! let v = &include_bytes!("../tests/data");
-//! # #[cfg(feature = "alloc")]
-//! assert_eq!(config_hex(&v, cfg), format!("{:?}", v.hex_conf(cfg)));
-//!
-//! println!("{:?}", v.hex_conf(cfg));
-//! ```
-//! Output:
-//!
-//! ```text
-//! 0000:   6b 4e 1a c3 af 03 d2 1e   kN......
-//! 0008:   7e 73 ba c8 bd 84 0f 83   ~s......
-//! 0010:   89 d5 cf 90 23 67 4b 48   ....#gKH
-//! 0018:   db b1 bc 35 bf ee         ...5..
-//! ```
-
-#[cfg(feature = "alloc")]
-extern crate alloc;
-
-mod pretty_hex;
-pub use pretty_hex::*;
diff --git a/old_nushell/crates/nu-pretty-hex/src/main.rs b/old_nushell/crates/nu-pretty-hex/src/main.rs
deleted file mode 100644
index 4156cb5c2..000000000
--- a/old_nushell/crates/nu-pretty-hex/src/main.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use nu_pretty_hex::*;
-
-fn main() {
-    let config = HexConfig {
-        title: true,
-        ascii: true,
-        width: 16,
-        group: 4,
-        chunk: 1,
-        skip: Some(10),
-        // length: Some(5),
-        // length: None,
-        length: Some(50),
-    };
-
-    let my_string = "Darren Schroeder 😉";
-    println!("ConfigHex\n{}\n", config_hex(&my_string, config));
-    println!("SimpleHex\n{}\n", simple_hex(&my_string));
-    println!("PrettyHex\n{}\n", pretty_hex(&my_string));
-    println!("ConfigHex\n{}\n", config_hex(&my_string, config));
-
-    // let mut my_str = String::new();
-    // for x in 0..256 {
-    //     my_str.push(x as u8);
-    // }
-    let mut v: Vec<u8> = vec![];
-    for x in 0..=127 {
-        v.push(x);
-    }
-    let my_str = String::from_utf8_lossy(&v[..]);
-
-    println!("First128\n{}\n", pretty_hex(&my_str.as_bytes()));
-    println!(
-        "First128-Param\n{}\n",
-        config_hex(&my_str.as_bytes(), config)
-    );
-
-    let mut r_str = String::new();
-    for _ in 0..=127 {
-        r_str.push(rand::random::<u8>() as char);
-    }
-
-    println!("Random127\n{}\n", pretty_hex(&r_str));
-}
-
-//chunk 0 44617272656e20536368726f65646572   Darren Schroeder
-//chunk 1 44 61 72 72  65 6e 20 53  63 68 72 6f  65 64 65 72   Darren Schroeder
-//chunk 2 461 7272 656e 2053  6368 726f 6564 6572   Darren Schroeder
-//chunk 3 46172 72656e 205363 68726f  656465 72   Darren Schroeder
-//chunk 4 44617272 656e2053 6368726f 65646572   Darren Schroeder
diff --git a/old_nushell/crates/nu-pretty-hex/src/pretty_hex.rs b/old_nushell/crates/nu-pretty-hex/src/pretty_hex.rs
deleted file mode 100644
index 99ebaf022..000000000
--- a/old_nushell/crates/nu-pretty-hex/src/pretty_hex.rs
+++ /dev/null
@@ -1,299 +0,0 @@
-use core::primitive::str;
-use core::{default::Default, fmt};
-use nu_ansi_term::{Color, Style};
-
-/// Returns a one-line hexdump of `source` grouped in default format without header
-/// and ASCII column.
-pub fn simple_hex<T: AsRef<[u8]>>(source: &T) -> String {
-    let mut writer = String::new();
-    hex_write(&mut writer, source, HexConfig::simple(), None).unwrap_or(());
-    writer
-}
-
-/// Dump `source` as hex octets in default format without header and ASCII column to the `writer`.
-pub fn simple_hex_write<T, W>(writer: &mut W, source: &T) -> fmt::Result
-where
-    T: AsRef<[u8]>,
-    W: fmt::Write,
-{
-    hex_write(writer, source, HexConfig::simple(), None)
-}
-
-/// Return a multi-line hexdump in default format complete with addressing, hex digits,
-/// and ASCII representation.
-pub fn pretty_hex<T: AsRef<[u8]>>(source: &T) -> String {
-    let mut writer = String::new();
-    hex_write(&mut writer, source, HexConfig::default(), Some(true)).unwrap_or(());
-    writer
-}
-
-/// Write multi-line hexdump in default format complete with addressing, hex digits,
-/// and ASCII representation to the writer.
-pub fn pretty_hex_write<T, W>(writer: &mut W, source: &T) -> fmt::Result
-where
-    T: AsRef<[u8]>,
-    W: fmt::Write,
-{
-    hex_write(writer, source, HexConfig::default(), Some(true))
-}
-
-/// Return a hexdump of `source` in specified format.
-pub fn config_hex<T: AsRef<[u8]>>(source: &T, cfg: HexConfig) -> String {
-    let mut writer = String::new();
-    hex_write(&mut writer, source, cfg, Some(true)).unwrap_or(());
-    writer
-}
-
-/// Configuration parameters for hexdump.
-#[derive(Clone, Copy, Debug)]
-pub struct HexConfig {
-    /// Write first line header with data length.
-    pub title: bool,
-    /// Append ASCII representation column.
-    pub ascii: bool,
-    /// Source bytes per row. 0 for single row without address prefix.
-    pub width: usize,
-    /// Chunks count per group. 0 for single group (column).
-    pub group: usize,
-    /// Source bytes per chunk (word). 0 for single word.
-    pub chunk: usize,
-    /// Bytes from 0 to skip
-    pub skip: Option<usize>,
-    /// Length to return
-    pub length: Option<usize>,
-}
-
-/// Default configuration with `title`, `ascii`, 16 source bytes `width` grouped to 4 separate
-/// hex bytes. Using in `pretty_hex`, `pretty_hex_write` and `fmt::Debug` implementation.
-impl Default for HexConfig {
-    fn default() -> HexConfig {
-        HexConfig {
-            title: true,
-            ascii: true,
-            width: 16,
-            group: 4,
-            chunk: 1,
-            skip: None,
-            length: None,
-        }
-    }
-}
-
-impl HexConfig {
-    /// Returns configuration for `simple_hex`, `simple_hex_write` and `fmt::Display` implementation.
-    pub fn simple() -> Self {
-        HexConfig::default().to_simple()
-    }
-
-    fn delimiter(&self, i: usize) -> &'static str {
-        if i > 0 && self.chunk > 0 && i % self.chunk == 0 {
-            if self.group > 0 && i % (self.group * self.chunk) == 0 {
-                "  "
-            } else {
-                " "
-            }
-        } else {
-            ""
-        }
-    }
-
-    fn to_simple(self) -> Self {
-        HexConfig {
-            title: false,
-            ascii: false,
-            width: 0,
-            ..self
-        }
-    }
-}
-
-fn categorize_byte(byte: &u8) -> (Style, Option<char>) {
-    // This section is here so later we can configure these items
-    let null_char_style = Style::default().fg(Color::Fixed(242));
-    let null_char = Some('0');
-    let ascii_printable_style = Style::default().fg(Color::Cyan).bold();
-    let ascii_printable = None;
-    let ascii_space_style = Style::default().fg(Color::Green).bold();
-    let ascii_space = Some(' ');
-    let ascii_white_space_style = Style::default().fg(Color::Green).bold();
-    let ascii_white_space = Some('_');
-    let ascii_other_style = Style::default().fg(Color::Purple).bold();
-    let ascii_other = Some('•');
-    let non_ascii_style = Style::default().fg(Color::Yellow).bold();
-    let non_ascii = Some('×'); // or Some('.')
-
-    if byte == &0 {
-        (null_char_style, null_char)
-    } else if byte.is_ascii_graphic() {
-        (ascii_printable_style, ascii_printable)
-    } else if byte.is_ascii_whitespace() {
-        // 0x20 == 32 decimal - replace with a real space
-        if byte == &32 {
-            (ascii_space_style, ascii_space)
-        } else {
-            (ascii_white_space_style, ascii_white_space)
-        }
-    } else if byte.is_ascii() {
-        (ascii_other_style, ascii_other)
-    } else {
-        (non_ascii_style, non_ascii)
-    }
-}
-
-/// Write hex dump in specified format.
-pub fn hex_write<T, W>(
-    writer: &mut W,
-    source: &T,
-    cfg: HexConfig,
-    with_color: Option<bool>,
-) -> fmt::Result
-where
-    T: AsRef<[u8]>,
-    W: fmt::Write,
-{
-    let use_color = with_color.unwrap_or(false);
-
-    if source.as_ref().is_empty() {
-        return Ok(());
-    }
-
-    let amount = match cfg.length {
-        Some(len) => len,
-        None => source.as_ref().len(),
-    };
-
-    let skip = cfg.skip.unwrap_or(0);
-
-    let source_part_vec: Vec<u8> = source
-        .as_ref()
-        .iter()
-        .skip(skip)
-        .take(amount)
-        .map(|&x| x as u8)
-        .collect();
-
-    if cfg.title {
-        if use_color {
-            writeln!(
-                writer,
-                "Length: {0} (0x{0:x}) bytes | {1}printable {2}whitespace {3}ascii_other {4}non_ascii{5}",
-                source_part_vec.len(),
-                Style::default().fg(Color::Cyan).bold().prefix(),
-                Style::default().fg(Color::Green).bold().prefix(),
-                Style::default().fg(Color::Purple).bold().prefix(),
-                Style::default().fg(Color::Yellow).bold().prefix(),
-                Style::default().fg(Color::Yellow).suffix()
-            )?;
-        } else {
-            writeln!(writer, "Length: {0} (0x{0:x}) bytes", source_part_vec.len(),)?;
-        }
-    }
-
-    let lines = source_part_vec.chunks(if cfg.width > 0 {
-        cfg.width
-    } else {
-        source_part_vec.len()
-    });
-
-    let lines_len = lines.len();
-
-    for (i, row) in lines.enumerate() {
-        if cfg.width > 0 {
-            let style = Style::default().fg(Color::Cyan);
-            if use_color {
-                write!(
-                    writer,
-                    "{}{:08x}{}:   ",
-                    style.prefix(),
-                    i * cfg.width + skip,
-                    style.suffix()
-                )?;
-            } else {
-                write!(writer, "{:08x}:   ", i * cfg.width + skip,)?;
-            }
-        }
-        for (i, x) in row.as_ref().iter().enumerate() {
-            if use_color {
-                let (style, _char) = categorize_byte(x);
-                write!(
-                    writer,
-                    "{}{}{:02x}{}",
-                    cfg.delimiter(i),
-                    style.prefix(),
-                    x,
-                    style.suffix()
-                )?;
-            } else {
-                write!(writer, "{}{:02x}", cfg.delimiter(i), x,)?;
-            }
-        }
-        if cfg.ascii {
-            for j in row.len()..cfg.width {
-                write!(writer, "{}  ", cfg.delimiter(j))?;
-            }
-            write!(writer, "   ")?;
-            for x in row {
-                let (style, a_char) = categorize_byte(x);
-                let replacement_char = match a_char {
-                    Some(c) => c,
-                    None => *x as char,
-                };
-                if use_color {
-                    write!(
-                        writer,
-                        "{}{}{}",
-                        style.prefix(),
-                        replacement_char,
-                        style.suffix()
-                    )?;
-                } else {
-                    write!(writer, "{}", replacement_char,)?;
-                }
-            }
-        }
-        if i + 1 < lines_len {
-            writeln!(writer)?;
-        }
-    }
-    Ok(())
-}
-
-/// Reference wrapper for use in arguments formatting.
-pub struct Hex<'a, T: 'a>(&'a T, HexConfig);
-
-impl<'a, T: 'a + AsRef<[u8]>> fmt::Display for Hex<'a, T> {
-    /// Formats the value by `simple_hex_write` using the given formatter.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        hex_write(f, self.0, self.1.to_simple(), None)
-    }
-}
-
-impl<'a, T: 'a + AsRef<[u8]>> fmt::Debug for Hex<'a, T> {
-    /// Formats the value by `pretty_hex_write` using the given formatter.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        hex_write(f, self.0, self.1, None)
-    }
-}
-
-/// Allows generates hex dumps to a formatter.
-pub trait PrettyHex: Sized {
-    /// Wrap self reference for use in `std::fmt::Display` and `std::fmt::Debug`
-    /// formatting as hex dumps.
-    fn hex_dump(&self) -> Hex<Self>;
-
-    /// Wrap self reference for use in `std::fmt::Display` and `std::fmt::Debug`
-    /// formatting as hex dumps in specified format.
-    fn hex_conf(&self, cfg: HexConfig) -> Hex<Self>;
-}
-
-impl<T> PrettyHex for T
-where
-    T: AsRef<[u8]>,
-{
-    fn hex_dump(&self) -> Hex<Self> {
-        Hex(self, HexConfig::default())
-    }
-    fn hex_conf(&self, cfg: HexConfig) -> Hex<Self> {
-        Hex(self, cfg)
-    }
-}
diff --git a/old_nushell/crates/nu-pretty-hex/tests/256.txt b/old_nushell/crates/nu-pretty-hex/tests/256.txt
deleted file mode 100644
index 0e08e874f..000000000
--- a/old_nushell/crates/nu-pretty-hex/tests/256.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Length: 256 (0x100) bytes
-0000:   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
-0010:   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
-0020:   20 21 22 23  24 25 26 27  28 29 2a 2b  2c 2d 2e 2f    !"#$%&'()*+,-./
-0030:   30 31 32 33  34 35 36 37  38 39 3a 3b  3c 3d 3e 3f   0123456789:;<=>?
-0040:   40 41 42 43  44 45 46 47  48 49 4a 4b  4c 4d 4e 4f   @ABCDEFGHIJKLMNO
-0050:   50 51 52 53  54 55 56 57  58 59 5a 5b  5c 5d 5e 5f   PQRSTUVWXYZ[\]^_
-0060:   60 61 62 63  64 65 66 67  68 69 6a 6b  6c 6d 6e 6f   `abcdefghijklmno
-0070:   70 71 72 73  74 75 76 77  78 79 7a 7b  7c 7d 7e 7f   pqrstuvwxyz{|}~.
-0080:   80 81 82 83  84 85 86 87  88 89 8a 8b  8c 8d 8e 8f   ................
-0090:   90 91 92 93  94 95 96 97  98 99 9a 9b  9c 9d 9e 9f   ................
-00a0:   a0 a1 a2 a3  a4 a5 a6 a7  a8 a9 aa ab  ac ad ae af   ................
-00b0:   b0 b1 b2 b3  b4 b5 b6 b7  b8 b9 ba bb  bc bd be bf   ................
-00c0:   c0 c1 c2 c3  c4 c5 c6 c7  c8 c9 ca cb  cc cd ce cf   ................
-00d0:   d0 d1 d2 d3  d4 d5 d6 d7  d8 d9 da db  dc dd de df   ................
-00e0:   e0 e1 e2 e3  e4 e5 e6 e7  e8 e9 ea eb  ec ed ee ef   ................
-00f0:   f0 f1 f2 f3  f4 f5 f6 f7  f8 f9 fa fb  fc fd fe ff   ................
\ No newline at end of file
diff --git a/old_nushell/crates/nu-pretty-hex/tests/data b/old_nushell/crates/nu-pretty-hex/tests/data
deleted file mode 100644
index 998d80f71..000000000
--- a/old_nushell/crates/nu-pretty-hex/tests/data
+++ /dev/null
@@ -1 +0,0 @@
-kNï�~s�Ƚ����ϐ#gKH۱�5��
\ No newline at end of file
diff --git a/old_nushell/crates/nu-pretty-hex/tests/tests.rs b/old_nushell/crates/nu-pretty-hex/tests/tests.rs
deleted file mode 100644
index a147c496c..000000000
--- a/old_nushell/crates/nu-pretty-hex/tests/tests.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-// #![no_std]
-
-#[cfg(feature = "alloc")]
-extern crate alloc;
-extern crate nu_pretty_hex;
-
-#[cfg(feature = "alloc")]
-use alloc::{format, string::String, vec, vec::Vec};
-use nu_pretty_hex::*;
-
-#[cfg(feature = "alloc")]
-#[test]
-fn test_simple() {
-    let bytes: Vec<u8> = (0..16).collect();
-    let expected = "00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f";
-    assert_eq!(expected, simple_hex(&bytes));
-    assert_eq!(expected, bytes.hex_dump().to_string());
-    assert_eq!(simple_hex(&bytes), config_hex(&bytes, HexConfig::simple()));
-
-    let mut have = String::new();
-    simple_hex_write(&mut have, &bytes).unwrap();
-    assert_eq!(expected, have);
-
-    let str = "string";
-    let string: String = String::from("string");
-    let slice: &[u8] = &[0x73, 0x74, 0x72, 0x69, 0x6e, 0x67];
-    assert_eq!(simple_hex(&str), "73 74 72 69  6e 67");
-    assert_eq!(simple_hex(&str), simple_hex(&string));
-    assert_eq!(simple_hex(&str), simple_hex(&slice));
-
-    assert!(simple_hex(&vec![]).is_empty());
-}
-
-#[cfg(feature = "alloc")]
-#[test]
-fn test_pretty() {
-    let bytes: Vec<u8> = (0..256).map(|x| x as u8).collect();
-    let want = include_str!("256.txt");
-
-    let mut hex = String::new();
-    pretty_hex_write(&mut hex, &bytes).unwrap();
-    assert_eq!(want, hex);
-    assert_eq!(want, format!("{:?}", bytes.hex_dump()));
-    assert_eq!(want, pretty_hex(&bytes));
-    assert_eq!(want, config_hex(&bytes, HexConfig::default()));
-
-    assert_eq!("Length: 0 (0x0) bytes\n", pretty_hex(&vec![]));
-}
-
-#[cfg(feature = "alloc")]
-#[test]
-fn test_config() {
-    let cfg = HexConfig {
-        title: false,
-        ascii: false,
-        width: 0,
-        group: 0,
-        chunk: 0,
-    };
-    assert!(config_hex(&vec![], cfg).is_empty());
-    assert_eq!("2425262728", config_hex(&"$%&'(", cfg));
-
-    let v = include_bytes!("data");
-    let cfg = HexConfig {
-        title: false,
-        group: 8,
-        ..HexConfig::default()
-    };
-    let hex = "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83   kN......~s......\n\
-         0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee         ....#gKH...5..";
-    assert_eq!(hex, config_hex(&v, cfg));
-    assert_eq!(hex, format!("{:?}", v.hex_conf(cfg)));
-    let mut str = String::new();
-    hex_write(&mut str, v, cfg).unwrap();
-    assert_eq!(hex, str);
-
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                ascii: false,
-                ..cfg
-            }
-        ),
-        "0000:   6b 4e 1a c3 af 03 d2 1e  7e 73 ba c8 bd 84 0f 83\n\
-         0010:   89 d5 cf 90 23 67 4b 48  db b1 bc 35 bf ee"
-    );
-
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                ascii: false,
-                group: 4,
-                chunk: 2,
-                ..cfg
-            }
-        ),
-        "0000:   6b4e 1ac3 af03 d21e  7e73 bac8 bd84 0f83\n\
-         0010:   89d5 cf90 2367 4b48  dbb1 bc35 bfee"
-    );
-
-    let v: Vec<u8> = (0..21).collect();
-    let want = r##"Length: 21 (0x15) bytes
-0000:   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
-0010:   10 11 12 13  14                                      ....."##;
-    assert_eq!(want, pretty_hex(&v));
-
-    let v: Vec<u8> = (0..13).collect();
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                title: false,
-                ascii: true,
-                width: 11,
-                group: 2,
-                chunk: 3
-            }
-        ),
-        "0000:   000102 030405  060708 090a   ...........\n\
-         000b:   0b0c                         .."
-    );
-
-    let v: Vec<u8> = (0..19).collect();
-    assert_eq!(
-        config_hex(
-            &v,
-            HexConfig {
-                title: false,
-                ascii: true,
-                width: 16,
-                group: 3,
-                chunk: 3
-            }
-        ),
-        "0000:   000102 030405 060708  090a0b 0c0d0e 0f   ................\n\
-         0010:   101112                                   ..."
-    );
-
-    let cfg = HexConfig {
-        title: false,
-        group: 0,
-        ..HexConfig::default()
-    };
-    assert_eq!(
-        format!("{:?}", v.hex_conf(cfg)),
-        "0000:   00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f   ................\n\
-         0010:   10 11 12                                          ..."
-    );
-    assert_eq!(
-        v.hex_conf(cfg).to_string(),
-        "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12"
-    );
-}
-
-// This test case checks that hex_write works even without the alloc crate.
-// Decorators to this function like simple_hex_write or PrettyHex::hex_dump()
-// will be tested when the alloc feature is selected because it feels quite
-// cumbersome to set up these tests without the comodity from `alloc`.
-#[test]
-fn test_hex_write_with_simple_config() {
-    let config = HexConfig::simple();
-    let bytes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
-    let expected =
-        core::str::from_utf8(b"00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f").unwrap();
-    // let expected =
-    //     "\u{1b}[38;5;242m00\u{1b}[0m \u{1b}[1;35m01\u{1b}[0m \u{1b}[1;35m02\u{1b}[0m \u{1b}[1;";
-    let mut buffer = heapless::Vec::<u8, 50>::new();
-
-    hex_write(&mut buffer, &bytes, config, None).unwrap();
-
-    let have = core::str::from_utf8(&buffer).unwrap();
-    assert_eq!(expected, have);
-}
diff --git a/old_nushell/crates/nu-protocol/Cargo.toml b/old_nushell/crates/nu-protocol/Cargo.toml
deleted file mode 100644
index bb1583260..000000000
--- a/old_nushell/crates/nu-protocol/Cargo.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Core values and protocols for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-protocol"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-byte-unit = "4.0.9"
-chrono = { version="0.4.19", features=["serde"] }
-chrono-humanize = "0.2.1"
-derive-new = "0.5.8"
-getset = "0.1.1"
-indexmap = { version="1.6.1", features=["serde-1"] }
-log = "0.4.14"
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-num-bigint = { version = "0.4.3", features = ["serde"] }
-num-integer = "0.1.44"
-num-traits = "0.2.14"
-serde = { version="1.0", features=["derive"] }
-serde_bytes = "0.11.5"
-
-[dependencies.polars]
-version = "0.17.0"
-optional = true
-default-features = false
-features = ["docs", "zip_with", "csv-file", "temporal", "performant", "pretty_fmt", "dtype-slim", "serde", "rows", "strings", "checked_arithmetic", "object", "dtype-date", "dtype-datetime", "dtype-time"]
-
-[features]
-dataframe = ["polars"]
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu-protocol/src/call_info.rs b/old_nushell/crates/nu-protocol/src/call_info.rs
deleted file mode 100644
index 81e2831a6..000000000
--- a/old_nushell/crates/nu-protocol/src/call_info.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use crate::value::Value;
-use derive_new::new;
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_source::Tag;
-use serde::{Deserialize, Serialize};
-
-/// Associated information for the call of a command, including the args passed to the command and a tag that spans the name of the command being called
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct CallInfo {
-    /// The arguments associated with this call
-    pub args: EvaluatedArgs,
-    /// The tag (underline-able position) of the name of the call itself
-    pub name_tag: Tag,
-}
-
-/// The set of positional and named arguments, after their values have been evaluated.
-///
-/// * Positional arguments are those who are given as values, without any associated flag. For example, in `foo arg1 arg2`, both `arg1` and `arg2` are positional arguments.
-/// * Named arguments are those associated with a flag. For example, `foo --given bar` the named argument would be name `given` and the value `bar`.
-#[derive(Debug, Default, new, Serialize, Deserialize, Clone)]
-pub struct EvaluatedArgs {
-    pub positional: Option<Vec<Value>>,
-    pub named: Option<IndexMap<String, Value>>,
-}
-
-impl EvaluatedArgs {
-    /// Retrieve a subset of positional arguments starting at a given position
-    pub fn slice_from(&self, from: usize) -> Vec<Value> {
-        let positional = &self.positional;
-
-        match positional {
-            None => vec![],
-            Some(list) => list[from..].to_vec(),
-        }
-    }
-
-    /// Get the nth positional argument, if possible
-    pub fn nth(&self, pos: usize) -> Option<&Value> {
-        match &self.positional {
-            None => None,
-            Some(array) => array.get(pos),
-        }
-    }
-
-    /// Get the nth positional argument, error if not possible
-    pub fn expect_nth(&self, pos: usize) -> Result<&Value, ShellError> {
-        match &self.positional {
-            None => Err(ShellError::unimplemented("Better error: expect_nth")),
-            Some(array) => match array.get(pos) {
-                None => Err(ShellError::unimplemented("Better error: expect_nth")),
-                Some(item) => Ok(item),
-            },
-        }
-    }
-
-    /// Get the number of positional arguments available
-    pub fn len(&self) -> usize {
-        match &self.positional {
-            None => 0,
-            Some(array) => array.len(),
-        }
-    }
-
-    /// Return if there are no positional arguments
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    /// Return true if the set of named arguments contains the name provided
-    pub fn has(&self, name: &str) -> bool {
-        matches!(&self.named, Some(named) if named.contains_key(name))
-    }
-
-    /// Gets the corresponding Value for the named argument given, if possible
-    pub fn get(&self, name: &str) -> Option<&Value> {
-        match &self.named {
-            None => None,
-            Some(named) => named.get(name),
-        }
-    }
-
-    /// Gets the corresponding Value for the named argument given, error if not possible
-    pub fn expect_get(&self, name: &str) -> Result<&Value, ShellError> {
-        match &self.named {
-            None => Err(ShellError::unimplemented("Better error: expect_get")),
-            Some(named) => named
-                .get(name)
-                .ok_or_else(|| ShellError::unimplemented("Better error: expect_get")),
-        }
-    }
-
-    /// Iterates over the positional arguments
-    pub fn positional_iter(&self) -> PositionalIter<'_> {
-        match &self.positional {
-            None => PositionalIter::Empty,
-            Some(v) => {
-                let iter = v.iter();
-                PositionalIter::Array(iter)
-            }
-        }
-    }
-}
-
-/// An iterator to help iterate over positional arguments
-pub enum PositionalIter<'a> {
-    Empty,
-    Array(std::slice::Iter<'a, Value>),
-}
-
-impl<'a> Iterator for PositionalIter<'a> {
-    type Item = &'a Value;
-
-    /// The required `next` function to implement the Iterator trait
-    fn next(&mut self) -> Option<Self::Item> {
-        match self {
-            PositionalIter::Empty => None,
-            PositionalIter::Array(iter) => iter.next(),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/config_path.rs b/old_nushell/crates/nu-protocol/src/config_path.rs
deleted file mode 100644
index 6d3600ec1..000000000
--- a/old_nushell/crates/nu-protocol/src/config_path.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-/// Specifies a path to a configuration file and its type
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
-pub enum ConfigPath {
-    /// Path to the global configuration file
-    Global(PathBuf),
-    /// Path to a local configuration file
-    Local(PathBuf),
-}
-
-impl ConfigPath {
-    pub fn get_path(&self) -> &PathBuf {
-        match self {
-            ConfigPath::Global(p) | ConfigPath::Local(p) => p,
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/compute_between.rs b/old_nushell/crates/nu-protocol/src/dataframe/compute_between.rs
deleted file mode 100644
index 5a0c43b52..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/compute_between.rs
+++ /dev/null
@@ -1,880 +0,0 @@
-use bigdecimal::BigDecimal;
-use nu_errors::ShellError;
-use nu_source::Span;
-use num_traits::ToPrimitive;
-
-use super::{Axis, NuDataFrame};
-use crate::hir::Operator;
-use crate::{Primitive, ShellTypeName, UntaggedValue, Value};
-
-use polars::prelude::{
-    BooleanType, ChunkCompare, ChunkedArray, DataType, Float64Type, Int64Type, IntoSeries,
-    NumOpsDispatchChecked, PolarsError, Series,
-};
-use std::ops::{Add, BitAnd, BitOr, Div, Mul, Sub};
-
-pub fn compute_between_dataframes(
-    operator: Operator,
-    left: &Value,
-    right: &Value,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    if let (UntaggedValue::DataFrame(lhs), UntaggedValue::DataFrame(rhs)) =
-        (&left.value, &right.value)
-    {
-        let operation_span = right.tag.span.merge(left.tag.span);
-        match (lhs.is_series(), rhs.is_series()) {
-            (true, true) => {
-                let lhs = &lhs
-                    .as_series(&left.tag.span)
-                    .expect("Already checked that is a series");
-                let rhs = &rhs
-                    .as_series(&right.tag.span)
-                    .expect("Already checked that is a series");
-
-                if lhs.dtype() != rhs.dtype() {
-                    return Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Mixed datatypes",
-                            "this datatype does not match the right hand side datatype",
-                            &left.tag.span,
-                            format!(
-                                "Perhaps you want to change this datatype to '{}'",
-                                lhs.as_ref().dtype()
-                            ),
-                            &right.tag.span,
-                        ),
-                    ));
-                }
-
-                if lhs.len() != rhs.len() {
-                    return Ok(UntaggedValue::Error(ShellError::labeled_error(
-                        "Different length",
-                        "this column length does not match the right hand column length",
-                        &left.tag.span,
-                    )));
-                }
-
-                compute_between_series(operator, lhs, rhs, &operation_span)
-            }
-            _ => {
-                if lhs.as_ref().height() != rhs.as_ref().height() {
-                    return Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Mixed datatypes",
-                            "this datatype size does not match the right hand side datatype",
-                            &left.tag.span,
-                            "Perhaps you want to select another dataframe with same number of rows",
-                            &right.tag.span,
-                        ),
-                    ));
-                }
-
-                between_dataframes(operator, lhs, rhs, &operation_span)
-            }
-        }
-    } else {
-        Err((left.type_name(), right.type_name()))
-    }
-}
-
-pub fn between_dataframes(
-    operator: Operator,
-    lhs: &NuDataFrame,
-    rhs: &NuDataFrame,
-    operation_span: &Span,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    match operator {
-        Operator::Plus => match lhs.append_df(rhs, Axis::Row, operation_span) {
-            Ok(df) => Ok(df.into_untagged()),
-            Err(e) => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                "Appending error",
-                e.to_string(),
-                operation_span,
-            ))),
-        },
-        _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-            "Incorrect datatype",
-            "unable to use this datatype for this operation",
-            operation_span,
-        ))),
-    }
-}
-
-pub fn compute_between_series(
-    operator: Operator,
-    lhs: &Series,
-    rhs: &Series,
-    operation_span: &Span,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    match operator {
-        Operator::Plus => {
-            let mut res = lhs + rhs;
-            let name = format!("sum_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::Minus => {
-            let mut res = lhs - rhs;
-            let name = format!("sub_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::Multiply => {
-            let mut res = lhs * rhs;
-            let name = format!("mul_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::Divide => {
-            let res = lhs.checked_div(rhs);
-            match res {
-                Ok(mut res) => {
-                    let name = format!("div_{}_{}", lhs.name(), rhs.name());
-                    res.rename(&name);
-                    Ok(NuDataFrame::series_to_untagged(res, operation_span))
-                }
-                Err(e) => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                    "Division error",
-                    e.to_string(),
-                    operation_span,
-                ))),
-            }
-        }
-        Operator::Equal => {
-            let mut res = Series::eq(lhs, rhs).into_series();
-            let name = format!("eq_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::NotEqual => {
-            let mut res = Series::neq(lhs, rhs).into_series();
-            let name = format!("neq_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::LessThan => {
-            let mut res = Series::lt(lhs, rhs).into_series();
-            let name = format!("lt_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::LessThanOrEqual => {
-            let mut res = Series::lt_eq(lhs, rhs).into_series();
-            let name = format!("lte_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::GreaterThan => {
-            let mut res = Series::gt(lhs, rhs).into_series();
-            let name = format!("gt_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::GreaterThanOrEqual => {
-            let mut res = Series::gt_eq(lhs, rhs).into_series();
-            let name = format!("gte_{}_{}", lhs.name(), rhs.name());
-            res.rename(&name);
-            Ok(NuDataFrame::series_to_untagged(res, operation_span))
-        }
-        Operator::And => match lhs.dtype() {
-            DataType::Boolean => {
-                let lhs_cast = lhs.bool();
-                let rhs_cast = rhs.bool();
-
-                match (lhs_cast, rhs_cast) {
-                    (Ok(l), Ok(r)) => {
-                        let mut res = l.bitand(r).into_series();
-                        let name = format!("and_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
-                        Ok(NuDataFrame::series_to_untagged(res, operation_span))
-                    }
-                    _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                        "Casting error",
-                        "unable to cast to boolean",
-                        operation_span,
-                    ))),
-                }
-            }
-            _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                "Incorrect datatype",
-                "And operation can only be done with boolean values",
-                operation_span,
-            ))),
-        },
-        Operator::Or => match lhs.dtype() {
-            DataType::Boolean => {
-                let lhs_cast = lhs.bool();
-                let rhs_cast = rhs.bool();
-
-                match (lhs_cast, rhs_cast) {
-                    (Ok(l), Ok(r)) => {
-                        let mut res = l.bitor(r).into_series();
-                        let name = format!("or_{}_{}", lhs.name(), rhs.name());
-                        res.rename(&name);
-                        Ok(NuDataFrame::series_to_untagged(res, operation_span))
-                    }
-                    _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                        "Casting error",
-                        "unable to cast to boolean",
-                        operation_span,
-                    ))),
-                }
-            }
-            _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                "Incorrect datatype",
-                "And operation can only be done with boolean values",
-                operation_span,
-            ))),
-        },
-        _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-            "Incorrect datatype",
-            "unable to use this datatype for this operation",
-            operation_span,
-        ))),
-    }
-}
-
-pub fn compute_series_single_value(
-    operator: Operator,
-    left: &Value,
-    right: &Value,
-) -> Result<UntaggedValue, (&'static str, &'static str)> {
-    if let (UntaggedValue::DataFrame(lhs), UntaggedValue::Primitive(_)) =
-        (&left.value, &right.value)
-    {
-        let lhs = match lhs.as_series(&left.tag.span) {
-            Ok(series) => series,
-            Err(e) => return Ok(UntaggedValue::Error(e)),
-        };
-
-        match operator {
-            Operator::Plus => match &right.value {
-                UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Int64Type>>::add,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    &val.to_i64()
-                        .expect("Internal error: protocol did not use compatible decimal"),
-                    <ChunkedArray<Int64Type>>::add,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(compute_series_decimal(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Float64Type>>::add,
-                    &left.tag.span,
-                )),
-                _ => Ok(UntaggedValue::Error(
-                    ShellError::labeled_error_with_secondary(
-                        "Operation unavailable",
-                        "unable to sum this value to the series",
-                        &right.tag.span,
-                        "Only int, bigInt or decimal values are allowed",
-                        &right.tag.span,
-                    ),
-                )),
-            },
-            Operator::Minus => match &right.value {
-                UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Int64Type>>::sub,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    &val.to_i64()
-                        .expect("Internal error: protocol did not use compatible decimal"),
-                    <ChunkedArray<Int64Type>>::sub,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(compute_series_decimal(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Float64Type>>::sub,
-                    &left.tag.span,
-                )),
-                _ => Ok(UntaggedValue::Error(
-                    ShellError::labeled_error_with_secondary(
-                        "Operation unavailable",
-                        "unable to subtract this value to the series",
-                        &right.tag.span,
-                        "Only int, bigInt or decimal values are allowed",
-                        &right.tag.span,
-                    ),
-                )),
-            },
-            Operator::Multiply => match &right.value {
-                UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Int64Type>>::mul,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compute_series_i64(
-                    &lhs,
-                    &val.to_i64()
-                        .expect("Internal error: protocol did not use compatible decimal"),
-                    <ChunkedArray<Int64Type>>::mul,
-                    &left.tag.span,
-                )),
-                UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(compute_series_decimal(
-                    &lhs,
-                    val,
-                    <ChunkedArray<Float64Type>>::mul,
-                    &left.tag.span,
-                )),
-                _ => Ok(UntaggedValue::Error(
-                    ShellError::labeled_error_with_secondary(
-                        "Operation unavailable",
-                        "unable to multiply this value to the series",
-                        &right.tag.span,
-                        "Only int, bigInt or decimal values are allowed",
-                        &right.tag.span,
-                    ),
-                )),
-            },
-            Operator::Divide => match &right.value {
-                UntaggedValue::Primitive(Primitive::Int(val)) => {
-                    if *val == 0 {
-                        Ok(UntaggedValue::Error(ShellError::labeled_error(
-                            "Division by zero",
-                            "Zero value found",
-                            &right.tag.span,
-                        )))
-                    } else {
-                        Ok(compute_series_i64(
-                            &lhs,
-                            val,
-                            <ChunkedArray<Int64Type>>::div,
-                            &left.tag.span,
-                        ))
-                    }
-                }
-                UntaggedValue::Primitive(Primitive::BigInt(val)) => {
-                    if val.eq(&0.into()) {
-                        Ok(UntaggedValue::Error(ShellError::labeled_error(
-                            "Division by zero",
-                            "Zero value found",
-                            &right.tag.span,
-                        )))
-                    } else {
-                        Ok(compute_series_i64(
-                            &lhs,
-                            &val.to_i64()
-                                .expect("Internal error: protocol did not use compatible decimal"),
-                            <ChunkedArray<Int64Type>>::div,
-                            &left.tag.span,
-                        ))
-                    }
-                }
-                UntaggedValue::Primitive(Primitive::Decimal(val)) => {
-                    if val.eq(&0.into()) {
-                        Ok(UntaggedValue::Error(ShellError::labeled_error(
-                            "Division by zero",
-                            "Zero value found",
-                            &right.tag.span,
-                        )))
-                    } else {
-                        Ok(compute_series_decimal(
-                            &lhs,
-                            val,
-                            <ChunkedArray<Float64Type>>::div,
-                            &left.tag.span,
-                        ))
-                    }
-                }
-                _ => Ok(UntaggedValue::Error(
-                    ShellError::labeled_error_with_secondary(
-                        "Operation unavailable",
-                        "unable to divide this value to the series",
-                        &right.tag.span,
-                        "Only primary values are allowed",
-                        &right.tag.span,
-                    ),
-                )),
-            },
-            Operator::Equal => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::eq, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::NotEqual => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::neq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::neq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::neq, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::LessThan => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::lt,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::lt,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::lt, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::LessThanOrEqual => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::lt_eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::lt_eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::lt_eq, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::GreaterThan => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::gt,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::gt,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::gt, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::GreaterThanOrEqual => {
-                match &right.value {
-                    UntaggedValue::Primitive(Primitive::Int(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        val,
-                        ChunkedArray::gt_eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::BigInt(val)) => Ok(compare_series_i64(
-                        &lhs,
-                        &val.to_i64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        ChunkedArray::gt_eq,
-                        &left.tag.span,
-                    )),
-                    UntaggedValue::Primitive(Primitive::Decimal(val)) => Ok(
-                        compare_series_decimal(&lhs, val, ChunkedArray::gt_eq, &left.tag.span),
-                    ),
-                    _ => Ok(UntaggedValue::Error(
-                        ShellError::labeled_error_with_secondary(
-                            "Operation unavailable",
-                            "unable to compare this value to the series",
-                            &right.tag.span,
-                            "Only primary values are allowed",
-                            &right.tag.span,
-                        ),
-                    )),
-                }
-            }
-            Operator::Contains => match &right.value {
-                UntaggedValue::Primitive(Primitive::String(val)) => {
-                    Ok(contains_series_pat(&lhs, val, &left.tag.span))
-                }
-                _ => Ok(UntaggedValue::Error(
-                    ShellError::labeled_error_with_secondary(
-                        "Operation unavailable",
-                        "unable to perform this value to the series",
-                        &right.tag.span,
-                        "Only primary values are allowed",
-                        &right.tag.span,
-                    ),
-                )),
-            },
-            _ => Ok(UntaggedValue::Error(ShellError::labeled_error(
-                "Incorrect datatype",
-                "unable to use this value for this operation",
-                &left.tag.span,
-            ))),
-        }
-    } else {
-        Err((left.type_name(), right.type_name()))
-    }
-}
-
-fn compute_series_i64<F>(series: &Series, val: &i64, f: F, span: &Span) -> UntaggedValue
-where
-    F: Fn(ChunkedArray<Int64Type>, i64) -> ChunkedArray<Int64Type>,
-{
-    match series.dtype() {
-        DataType::UInt32 | DataType::Int32 | DataType::UInt64 => {
-            let to_i64 = series.cast(&DataType::Int64);
-
-            match to_i64 {
-                Ok(series) => {
-                    let casted = series.i64();
-                    compute_casted_i64(casted, *val, f, span)
-                }
-                Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                    "Casting error",
-                    e.to_string(),
-                    span,
-                )),
-            }
-        }
-        DataType::Int64 => {
-            let casted = series.i64();
-            compute_casted_i64(casted, *val, f, span)
-        }
-        _ => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            format!(
-                "Series of type {} can not be used for operations with an i64 value",
-                series.dtype()
-            ),
-            span,
-        )),
-    }
-}
-
-fn compute_casted_i64<F>(
-    casted: Result<&ChunkedArray<Int64Type>, PolarsError>,
-    val: i64,
-    f: F,
-    span: &Span,
-) -> UntaggedValue
-where
-    F: Fn(ChunkedArray<Int64Type>, i64) -> ChunkedArray<Int64Type>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted.clone(), val);
-            let res = res.into_series();
-            NuDataFrame::series_to_untagged(res, span)
-        }
-        Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            e.to_string(),
-            span,
-        )),
-    }
-}
-
-fn compute_series_decimal<F>(series: &Series, val: &BigDecimal, f: F, span: &Span) -> UntaggedValue
-where
-    F: Fn(ChunkedArray<Float64Type>, f64) -> ChunkedArray<Float64Type>,
-{
-    match series.dtype() {
-        DataType::Float32 => {
-            let to_f64 = series.cast(&DataType::Float64);
-
-            match to_f64 {
-                Ok(series) => {
-                    let casted = series.f64();
-                    compute_casted_f64(
-                        casted,
-                        val.to_f64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        f,
-                        span,
-                    )
-                }
-                Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                    "Casting error",
-                    e.to_string(),
-                    span,
-                )),
-            }
-        }
-        DataType::Float64 => {
-            let casted = series.f64();
-            compute_casted_f64(
-                casted,
-                val.to_f64()
-                    .expect("Internal error: protocol did not use compatible decimal"),
-                f,
-                span,
-            )
-        }
-        _ => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            format!(
-                "Series of type {} can not be used for operations with a decimal value",
-                series.dtype()
-            ),
-            span,
-        )),
-    }
-}
-
-fn compute_casted_f64<F>(
-    casted: Result<&ChunkedArray<Float64Type>, PolarsError>,
-    val: f64,
-    f: F,
-    span: &Span,
-) -> UntaggedValue
-where
-    F: Fn(ChunkedArray<Float64Type>, f64) -> ChunkedArray<Float64Type>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted.clone(), val);
-            let res = res.into_series();
-            NuDataFrame::series_to_untagged(res, span)
-        }
-        Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            e.to_string(),
-            span,
-        )),
-    }
-}
-
-fn compare_series_i64<F>(series: &Series, val: &i64, f: F, span: &Span) -> UntaggedValue
-where
-    F: Fn(&ChunkedArray<Int64Type>, i64) -> ChunkedArray<BooleanType>,
-{
-    match series.dtype() {
-        DataType::UInt32 | DataType::Int32 | DataType::UInt64 => {
-            let to_i64 = series.cast(&DataType::Int64);
-
-            match to_i64 {
-                Ok(series) => {
-                    let casted = series.i64();
-                    compare_casted_i64(casted, *val, f, span)
-                }
-                Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                    "Casting error",
-                    e.to_string(),
-                    span,
-                )),
-            }
-        }
-        DataType::Int64 => {
-            let casted = series.i64();
-            compare_casted_i64(casted, *val, f, span)
-        }
-        _ => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            format!(
-                "Series of type {} can not be used for operations with an i64 value",
-                series.dtype()
-            ),
-            span,
-        )),
-    }
-}
-
-fn compare_casted_i64<F>(
-    casted: Result<&ChunkedArray<Int64Type>, PolarsError>,
-    val: i64,
-    f: F,
-    span: &Span,
-) -> UntaggedValue
-where
-    F: Fn(&ChunkedArray<Int64Type>, i64) -> ChunkedArray<BooleanType>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted, val);
-            let res = res.into_series();
-            NuDataFrame::series_to_untagged(res, span)
-        }
-        Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            e.to_string(),
-            span,
-        )),
-    }
-}
-
-fn compare_series_decimal<F>(series: &Series, val: &BigDecimal, f: F, span: &Span) -> UntaggedValue
-where
-    F: Fn(&ChunkedArray<Float64Type>, f64) -> ChunkedArray<BooleanType>,
-{
-    match series.dtype() {
-        DataType::Float32 => {
-            let to_f64 = series.cast(&DataType::Float64);
-
-            match to_f64 {
-                Ok(series) => {
-                    let casted = series.f64();
-                    compare_casted_f64(
-                        casted,
-                        val.to_f64()
-                            .expect("Internal error: protocol did not use compatible decimal"),
-                        f,
-                        span,
-                    )
-                }
-                Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                    "Casting error",
-                    e.to_string(),
-                    span,
-                )),
-            }
-        }
-        DataType::Float64 => {
-            let casted = series.f64();
-            compare_casted_f64(
-                casted,
-                val.to_f64()
-                    .expect("Internal error: protocol did not use compatible decimal"),
-                f,
-                span,
-            )
-        }
-        _ => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            format!(
-                "Series of type {} can not be used for operations with a decimal value",
-                series.dtype()
-            ),
-            span,
-        )),
-    }
-}
-
-fn compare_casted_f64<F>(
-    casted: Result<&ChunkedArray<Float64Type>, PolarsError>,
-    val: f64,
-    f: F,
-    span: &Span,
-) -> UntaggedValue
-where
-    F: Fn(&ChunkedArray<Float64Type>, f64) -> ChunkedArray<BooleanType>,
-{
-    match casted {
-        Ok(casted) => {
-            let res = f(casted, val);
-            let res = res.into_series();
-            NuDataFrame::series_to_untagged(res, span)
-        }
-        Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            e.to_string(),
-            span,
-        )),
-    }
-}
-
-fn contains_series_pat(series: &Series, pat: &str, span: &Span) -> UntaggedValue {
-    let casted = series.utf8();
-    match casted {
-        Ok(casted) => {
-            let res = casted.contains(pat);
-
-            match res {
-                Ok(res) => {
-                    let res = res.into_series();
-                    NuDataFrame::series_to_untagged(res, span)
-                }
-                Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                    "Search error",
-                    e.to_string(),
-                    span,
-                )),
-            }
-        }
-        Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-            "Casting error",
-            e.to_string(),
-            span,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/conversion.rs b/old_nushell/crates/nu-protocol/src/dataframe/conversion.rs
deleted file mode 100644
index 6212c4ffa..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/conversion.rs
+++ /dev/null
@@ -1,661 +0,0 @@
-use indexmap::map::{Entry, IndexMap};
-use polars::chunked_array::object::builder::ObjectChunkedBuilder;
-use polars::chunked_array::ChunkedArray;
-
-use bigdecimal::{FromPrimitive, ToPrimitive};
-use chrono::{DateTime, FixedOffset, NaiveDateTime};
-use nu_errors::ShellError;
-use nu_source::{Span, Tag};
-use num_bigint::BigInt;
-use polars::prelude::{
-    DataFrame, DataType, DatetimeChunked, Int64Type, IntoSeries, NamedFrom, NewChunkedArray,
-    ObjectType, PolarsNumericType, Series,
-};
-use std::ops::{Deref, DerefMut};
-
-use super::NuDataFrame;
-use crate::{Dictionary, Primitive, UntaggedValue, Value};
-
-const SECS_PER_DAY: i64 = 86_400;
-
-#[derive(Debug)]
-pub struct Column {
-    name: String,
-    values: Vec<Value>,
-}
-
-impl Column {
-    pub fn new(name: String, values: Vec<Value>) -> Self {
-        Self { name, values }
-    }
-
-    pub fn new_empty(name: String) -> Self {
-        Self {
-            name,
-            values: Vec::new(),
-        }
-    }
-
-    pub fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &Value> {
-        self.values.iter()
-    }
-}
-
-impl IntoIterator for Column {
-    type Item = Value;
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.values.into_iter()
-    }
-}
-
-impl Deref for Column {
-    type Target = Vec<Value>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.values
-    }
-}
-
-impl DerefMut for Column {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.values
-    }
-}
-
-#[derive(Debug)]
-pub enum InputType {
-    Integer,
-    Decimal,
-    String,
-    Boolean,
-    Object,
-    Date,
-    Duration,
-}
-
-#[derive(Debug)]
-pub struct TypedColumn {
-    column: Column,
-    column_type: Option<InputType>,
-}
-
-impl TypedColumn {
-    fn new_empty(name: String) -> Self {
-        Self {
-            column: Column::new_empty(name),
-            column_type: None,
-        }
-    }
-}
-
-impl Deref for TypedColumn {
-    type Target = Column;
-
-    fn deref(&self) -> &Self::Target {
-        &self.column
-    }
-}
-
-impl DerefMut for TypedColumn {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.column
-    }
-}
-
-pub type ColumnMap = IndexMap<String, TypedColumn>;
-
-pub fn create_column(
-    series: &Series,
-    from_row: usize,
-    to_row: usize,
-) -> Result<Column, ShellError> {
-    let size = to_row - from_row;
-    match series.dtype() {
-        DataType::Null => {
-            let values = std::iter::repeat(Value {
-                value: UntaggedValue::Primitive(Primitive::Nothing),
-                tag: Tag::default(),
-            })
-            .take(size)
-            .collect::<Vec<Value>>();
-
-            Ok(Column::new(series.name().into(), values))
-        }
-        DataType::UInt8 => {
-            let casted = series.u8().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::UInt16 => {
-            let casted = series.u16().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::UInt32 => {
-            let casted = series.u32().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::UInt64 => {
-            let casted = series.u64().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Int8 => {
-            let casted = series.i8().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Int16 => {
-            let casted = series.i16().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Int32 => {
-            let casted = series.i32().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Int64 => {
-            let casted = series.i64().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Float32 => {
-            let casted = series.f32().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Float64 => {
-            let casted = series.f64().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-            Ok(column_from_casted(casted, from_row, size))
-        }
-        DataType::Boolean => {
-            let casted = series.bool().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-
-            let values = casted
-                .into_iter()
-                .skip(from_row)
-                .take(size)
-                .map(|v| match v {
-                    Some(a) => Value {
-                        value: UntaggedValue::Primitive((a).into()),
-                        tag: Tag::default(),
-                    },
-                    None => Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        tag: Tag::default(),
-                    },
-                })
-                .collect::<Vec<Value>>();
-
-            Ok(Column::new(casted.name().into(), values))
-        }
-        DataType::Utf8 => {
-            let casted = series.utf8().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-
-            let values = casted
-                .into_iter()
-                .skip(from_row)
-                .take(size)
-                .map(|v| match v {
-                    Some(a) => Value {
-                        value: UntaggedValue::Primitive((a).into()),
-                        tag: Tag::default(),
-                    },
-                    None => Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        tag: Tag::default(),
-                    },
-                })
-                .collect::<Vec<Value>>();
-
-            Ok(Column::new(casted.name().into(), values))
-        }
-        DataType::Object(_) => {
-            let casted = series
-                .as_any()
-                .downcast_ref::<ChunkedArray<ObjectType<Value>>>();
-
-            match casted {
-                None => Err(ShellError::labeled_error(
-                    "Format not supported",
-                    "Value not supported for conversion",
-                    Tag::unknown(),
-                )),
-                Some(ca) => {
-                    let values = ca
-                        .into_iter()
-                        .skip(from_row)
-                        .take(size)
-                        .map(|v| match v {
-                            Some(a) => a.clone(),
-                            None => Value {
-                                value: UntaggedValue::Primitive(Primitive::Nothing),
-                                tag: Tag::default(),
-                            },
-                        })
-                        .collect::<Vec<Value>>();
-
-                    Ok(Column::new(ca.name().into(), values))
-                }
-            }
-        }
-        DataType::Date => {
-            let casted = series.date().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-
-            let values = casted
-                .into_iter()
-                .skip(from_row)
-                .take(size)
-                .map(|v| match v {
-                    Some(a) => {
-                        // elapsed time in day since 1970-01-01
-                        let seconds = a as i64 * SECS_PER_DAY;
-                        let naive_datetime = NaiveDateTime::from_timestamp(seconds, 0);
-
-                        // Zero length offset
-                        let offset = FixedOffset::east(0);
-                        let datetime = DateTime::<FixedOffset>::from_utc(naive_datetime, offset);
-
-                        Value {
-                            value: UntaggedValue::Primitive(Primitive::Date(datetime)),
-                            tag: Tag::default(),
-                        }
-                    }
-                    None => Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        tag: Tag::default(),
-                    },
-                })
-                .collect::<Vec<Value>>();
-
-            Ok(Column::new(casted.name().into(), values))
-        }
-        DataType::Datetime => {
-            let casted = series.datetime().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-
-            let values = casted
-                .into_iter()
-                .skip(from_row)
-                .take(size)
-                .map(|v| match v {
-                    Some(a) => {
-                        // elapsed time in milliseconds since 1970-01-01
-                        let seconds = a / 1000;
-                        let naive_datetime = NaiveDateTime::from_timestamp(seconds, 0);
-
-                        // Zero length offset
-                        let offset = FixedOffset::east(0);
-                        let datetime = DateTime::<FixedOffset>::from_utc(naive_datetime, offset);
-
-                        Value {
-                            value: UntaggedValue::Primitive(Primitive::Date(datetime)),
-                            tag: Tag::default(),
-                        }
-                    }
-                    None => Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        tag: Tag::default(),
-                    },
-                })
-                .collect::<Vec<Value>>();
-
-            Ok(Column::new(casted.name().into(), values))
-        }
-        DataType::Time => {
-            let casted = series.time().map_err(|e| {
-                ShellError::labeled_error(
-                    "Casting error",
-                    format!("casting error: {}", e),
-                    Span::default(),
-                )
-            })?;
-
-            let values = casted
-                .into_iter()
-                .skip(from_row)
-                .take(size)
-                .map(|v| match v {
-                    Some(nanoseconds) => {
-                        let untagged = if let Some(bigint) = BigInt::from_i64(nanoseconds) {
-                            UntaggedValue::Primitive(Primitive::Duration(bigint))
-                        } else {
-                            unreachable!("Internal error: protocol did not use compatible decimal")
-                        };
-
-                        Value {
-                            value: untagged,
-                            tag: Tag::default(),
-                        }
-                    }
-                    None => Value {
-                        value: UntaggedValue::Primitive(Primitive::Nothing),
-                        tag: Tag::default(),
-                    },
-                })
-                .collect::<Vec<Value>>();
-
-            Ok(Column::new(casted.name().into(), values))
-        }
-        e => Err(ShellError::labeled_error(
-            "Format not supported",
-            format!("Value not supported for conversion: {}", e),
-            Tag::unknown(),
-        )),
-    }
-}
-
-fn column_from_casted<T>(casted: &ChunkedArray<T>, from_row: usize, size: usize) -> Column
-where
-    T: PolarsNumericType,
-    T::Native: Into<Primitive>,
-{
-    let values = casted
-        .into_iter()
-        .skip(from_row)
-        .take(size)
-        .map(|v| match v {
-            Some(a) => Value {
-                value: UntaggedValue::Primitive((a).into()),
-                tag: Tag::default(),
-            },
-            None => Value {
-                value: UntaggedValue::Primitive(Primitive::Nothing),
-                tag: Tag::default(),
-            },
-        })
-        .collect::<Vec<Value>>();
-
-    Column::new(casted.name().into(), values)
-}
-
-// Adds a separator to the vector of values using the column names from the
-// dataframe to create the Values Row
-pub fn add_separator(values: &mut Vec<Value>, df: &DataFrame) {
-    let column_names = df.get_column_names();
-
-    let mut dictionary = Dictionary::default();
-    for name in column_names {
-        let indicator = Value {
-            value: UntaggedValue::Primitive(Primitive::String("...".to_string())),
-            tag: Tag::unknown(),
-        };
-
-        dictionary.insert(name.to_string(), indicator);
-    }
-
-    let extra_column = Value {
-        value: UntaggedValue::Row(dictionary),
-        tag: Tag::unknown(),
-    };
-
-    values.push(extra_column);
-}
-
-// Inserting the values found in a UntaggedValue::Row
-// All the entries for the dictionary are checked in order to check if
-// the column values have the same type value.
-pub fn insert_row(column_values: &mut ColumnMap, dictionary: Dictionary) -> Result<(), ShellError> {
-    for (key, value) in dictionary.entries {
-        insert_value(value, key, column_values)?;
-    }
-
-    Ok(())
-}
-
-// Inserting the values found in a UntaggedValue::Table
-// All the entries for the table are checked in order to check if
-// the column values have the same type value.
-// The names for the columns are the enumerated numbers from the values
-pub fn insert_table(column_values: &mut ColumnMap, table: Vec<Value>) -> Result<(), ShellError> {
-    for (index, value) in table.into_iter().enumerate() {
-        let key = index.to_string();
-        insert_value(value, key, column_values)?;
-    }
-
-    Ok(())
-}
-
-pub fn insert_value(
-    value: Value,
-    key: String,
-    column_values: &mut ColumnMap,
-) -> Result<(), ShellError> {
-    let col_val = match column_values.entry(key.clone()) {
-        Entry::Vacant(entry) => entry.insert(TypedColumn::new_empty(key)),
-        Entry::Occupied(entry) => entry.into_mut(),
-    };
-
-    // Checking that the type for the value is the same
-    // for the previous value in the column
-    if col_val.values.is_empty() {
-        match &value.value {
-            UntaggedValue::Primitive(Primitive::Int(_)) => {
-                col_val.column_type = Some(InputType::Integer);
-            }
-            UntaggedValue::Primitive(Primitive::Decimal(_)) => {
-                col_val.column_type = Some(InputType::Decimal);
-            }
-            UntaggedValue::Primitive(Primitive::String(_)) => {
-                col_val.column_type = Some(InputType::String);
-            }
-            UntaggedValue::Primitive(Primitive::Boolean(_)) => {
-                col_val.column_type = Some(InputType::Boolean);
-            }
-            UntaggedValue::Primitive(Primitive::Date(_)) => {
-                col_val.column_type = Some(InputType::Date);
-            }
-            UntaggedValue::Primitive(Primitive::Duration(_)) => {
-                col_val.column_type = Some(InputType::Duration);
-            }
-            _ => col_val.column_type = Some(InputType::Object),
-        }
-        col_val.values.push(value);
-    } else {
-        let prev_value = &col_val.values[col_val.values.len() - 1];
-
-        match (&prev_value.value, &value.value) {
-            (
-                UntaggedValue::Primitive(Primitive::Int(_)),
-                UntaggedValue::Primitive(Primitive::Int(_)),
-            )
-            | (
-                UntaggedValue::Primitive(Primitive::Decimal(_)),
-                UntaggedValue::Primitive(Primitive::Decimal(_)),
-            )
-            | (
-                UntaggedValue::Primitive(Primitive::String(_)),
-                UntaggedValue::Primitive(Primitive::String(_)),
-            )
-            | (
-                UntaggedValue::Primitive(Primitive::Boolean(_)),
-                UntaggedValue::Primitive(Primitive::Boolean(_)),
-            )
-            | (
-                UntaggedValue::Primitive(Primitive::Date(_)),
-                UntaggedValue::Primitive(Primitive::Date(_)),
-            )
-            | (
-                UntaggedValue::Primitive(Primitive::Duration(_)),
-                UntaggedValue::Primitive(Primitive::Duration(_)),
-            ) => col_val.values.push(value),
-            _ => {
-                col_val.column_type = Some(InputType::Object);
-                col_val.values.push(value);
-            }
-        }
-    }
-
-    Ok(())
-}
-
-// The ColumnMap has the parsed data from the StreamInput
-// This data can be used to create a Series object that can initialize
-// the dataframe based on the type of data that is found
-pub fn from_parsed_columns(
-    column_values: ColumnMap,
-    span: &Span,
-) -> Result<NuDataFrame, ShellError> {
-    let mut df_series: Vec<Series> = Vec::new();
-    for (name, column) in column_values {
-        if let Some(column_type) = &column.column_type {
-            match column_type {
-                InputType::Decimal => {
-                    let series_values: Result<Vec<_>, _> =
-                        column.values.iter().map(|v| v.as_f64()).collect();
-                    let series = Series::new(&name, series_values?);
-                    df_series.push(series)
-                }
-                InputType::Integer => {
-                    let series_values: Result<Vec<_>, _> =
-                        column.values.iter().map(|v| v.as_i64()).collect();
-                    let series = Series::new(&name, series_values?);
-                    df_series.push(series)
-                }
-                InputType::String => {
-                    let series_values: Result<Vec<_>, _> =
-                        column.values.iter().map(|v| v.as_string()).collect();
-                    let series = Series::new(&name, series_values?);
-                    df_series.push(series)
-                }
-                InputType::Boolean => {
-                    let series_values: Result<Vec<_>, _> =
-                        column.values.iter().map(|v| v.as_bool()).collect();
-                    let series = Series::new(&name, series_values?);
-                    df_series.push(series)
-                }
-                InputType::Object => {
-                    let mut builder =
-                        ObjectChunkedBuilder::<Value>::new(&name, column.values.len());
-
-                    for v in &column.values {
-                        builder.append_value(v.clone());
-                    }
-
-                    let res = builder.finish();
-                    df_series.push(res.into_series())
-                }
-                InputType::Date => {
-                    let it = column.values.iter().map(|v| {
-                        if let UntaggedValue::Primitive(Primitive::Date(date)) = &v.value {
-                            Some(date.timestamp_millis())
-                        } else {
-                            None
-                        }
-                    });
-
-                    let res: DatetimeChunked =
-                        ChunkedArray::<Int64Type>::new_from_opt_iter(&name, it).into();
-
-                    df_series.push(res.into_series())
-                }
-                InputType::Duration => {
-                    let it = column.values.iter().map(|v| {
-                        if let UntaggedValue::Primitive(Primitive::Duration(duration)) = &v.value {
-                            Some(duration.to_i64().expect("Not expecting NAN in duration"))
-                        } else {
-                            None
-                        }
-                    });
-
-                    let res = ChunkedArray::<Int64Type>::new_from_opt_iter(&name, it);
-
-                    df_series.push(res.into_series())
-                }
-            }
-        }
-    }
-
-    let df = DataFrame::new(df_series);
-
-    match df {
-        Ok(df) => Ok(NuDataFrame::new(df)),
-        Err(e) => Err(ShellError::labeled_error(
-            "Error while creating dataframe",
-            e.to_string(),
-            span,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/mod.rs b/old_nushell/crates/nu-protocol/src/dataframe/mod.rs
deleted file mode 100644
index 35efa4c0d..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-pub mod compute_between;
-pub mod conversion;
-pub mod nu_dataframe;
-pub mod nu_groupby;
-pub mod operations;
-
-pub use compute_between::{compute_between_dataframes, compute_series_single_value};
-pub use conversion::Column;
-pub use nu_dataframe::NuDataFrame;
-pub use nu_groupby::NuGroupBy;
-pub use operations::Axis;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum FrameStruct {
-    GroupBy(NuGroupBy),
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/nu_dataframe.rs b/old_nushell/crates/nu-protocol/src/dataframe/nu_dataframe.rs
deleted file mode 100644
index d5fcf4181..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/nu_dataframe.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-use indexmap::IndexMap;
-use std::cmp::Ordering;
-use std::fmt::Display;
-use std::hash::{Hash, Hasher};
-
-use nu_errors::ShellError;
-use nu_source::{Span, Tag};
-use polars::prelude::{DataFrame, DataType, PolarsObject, Series};
-use serde::{Deserialize, Serialize};
-
-use super::conversion::{
-    add_separator, create_column, from_parsed_columns, insert_row, insert_table, insert_value,
-    Column, ColumnMap,
-};
-use crate::{Dictionary, Primitive, ShellTypeName, UntaggedValue, Value};
-
-impl Display for Value {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.type_name())
-    }
-}
-
-impl Default for Value {
-    fn default() -> Self {
-        Self {
-            value: UntaggedValue::Primitive(Primitive::Nothing),
-            tag: Tag::default(),
-        }
-    }
-}
-
-impl PolarsObject for Value {
-    fn type_name() -> &'static str {
-        "object"
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct NuDataFrame {
-    dataframe: DataFrame,
-}
-
-// Dataframes are considered equal if they have the same shape, column name
-// and values
-impl PartialEq for NuDataFrame {
-    fn eq(&self, other: &Self) -> bool {
-        if self.as_ref().width() == 0 {
-            // checking for empty dataframe
-            return false;
-        }
-
-        if self.as_ref().get_column_names() != other.as_ref().get_column_names() {
-            // checking both dataframes share the same names
-            return false;
-        }
-
-        if self.as_ref().height() != other.as_ref().height() {
-            // checking both dataframes have the same row size
-            return false;
-        }
-
-        // sorting dataframe by the first column
-        let column_names = self.as_ref().get_column_names();
-        let first_col = column_names
-            .get(0)
-            .expect("already checked that dataframe is different than 0");
-
-        // if unable to sort, then unable to compare
-        let lhs = match self.as_ref().sort(*first_col, false) {
-            Ok(df) => df,
-            Err(_) => return false,
-        };
-
-        let rhs = match other.as_ref().sort(*first_col, false) {
-            Ok(df) => df,
-            Err(_) => return false,
-        };
-
-        for name in self.as_ref().get_column_names() {
-            let self_series = lhs.column(name).expect("name from dataframe names");
-
-            let other_series = rhs
-                .column(name)
-                .expect("already checked that name in other");
-
-            let self_series = match self_series.dtype() {
-                // Casting needed to compare other numeric types with nushell numeric type.
-                // In nushell we only have i64 integer numeric types and any array created
-                // with nushell untagged primitives will be of type i64
-                DataType::UInt32 => match self_series.cast(&DataType::Int64) {
-                    Ok(series) => series,
-                    Err(_) => return false,
-                },
-                _ => self_series.clone(),
-            };
-
-            if !self_series.series_equal(other_series) {
-                return false;
-            }
-        }
-
-        true
-    }
-}
-
-impl Eq for NuDataFrame {}
-
-impl PartialOrd for NuDataFrame {
-    fn partial_cmp(&self, _: &Self) -> Option<Ordering> {
-        Some(Ordering::Equal)
-    }
-}
-
-impl Ord for NuDataFrame {
-    fn cmp(&self, _: &Self) -> Ordering {
-        Ordering::Equal
-    }
-}
-
-impl Hash for NuDataFrame {
-    fn hash<H: Hasher>(&self, _: &mut H) {}
-}
-
-impl AsRef<DataFrame> for NuDataFrame {
-    fn as_ref(&self) -> &polars::prelude::DataFrame {
-        &self.dataframe
-    }
-}
-
-impl AsMut<DataFrame> for NuDataFrame {
-    fn as_mut(&mut self) -> &mut polars::prelude::DataFrame {
-        &mut self.dataframe
-    }
-}
-
-impl NuDataFrame {
-    pub fn new(dataframe: polars::prelude::DataFrame) -> Self {
-        NuDataFrame { dataframe }
-    }
-
-    pub fn try_from_stream<T>(input: &mut T, span: &Span) -> Result<(Self, Tag), ShellError>
-    where
-        T: Iterator<Item = Value>,
-    {
-        input
-            .next()
-            .and_then(|value| match value.value {
-                UntaggedValue::DataFrame(df) => Some((df, value.tag)),
-                _ => None,
-            })
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "No dataframe in stream",
-                    "no dataframe found in input stream",
-                    span,
-                )
-            })
-    }
-
-    pub fn try_from_iter<T>(iter: T, tag: &Tag) -> Result<Self, ShellError>
-    where
-        T: Iterator<Item = Value>,
-    {
-        // Dictionary to store the columnar data extracted from
-        // the input. During the iteration we check if the values
-        // have different type
-        let mut column_values: ColumnMap = IndexMap::new();
-
-        for value in iter {
-            match value.value {
-                UntaggedValue::Row(dictionary) => insert_row(&mut column_values, dictionary)?,
-                UntaggedValue::Table(table) => insert_table(&mut column_values, table)?,
-                UntaggedValue::Primitive(Primitive::Int(_))
-                | UntaggedValue::Primitive(Primitive::Decimal(_))
-                | UntaggedValue::Primitive(Primitive::String(_))
-                | UntaggedValue::Primitive(Primitive::Boolean(_))
-                | UntaggedValue::Primitive(Primitive::Date(_))
-                | UntaggedValue::DataFrame(_) => {
-                    let key = "0".to_string();
-                    insert_value(value, key, &mut column_values)?
-                }
-                _ => {
-                    return Err(ShellError::labeled_error_with_secondary(
-                        "Format not supported",
-                        "Value not supported for conversion",
-                        &value.tag,
-                        "Perhaps you want to use a List, a List of Tables or a Dictionary",
-                        &value.tag,
-                    ));
-                }
-            }
-        }
-
-        from_parsed_columns(column_values, &tag.span)
-    }
-
-    pub fn try_from_series(columns: Vec<Series>, span: &Span) -> Result<Self, ShellError> {
-        let dataframe = DataFrame::new(columns).map_err(|e| {
-            ShellError::labeled_error(
-                "DataFrame Creation",
-                format!("Unable to create DataFrame: {}", e),
-                span,
-            )
-        })?;
-
-        Ok(Self { dataframe })
-    }
-
-    pub fn try_from_columns(columns: Vec<Column>, span: &Span) -> Result<Self, ShellError> {
-        let mut column_values: ColumnMap = IndexMap::new();
-
-        for column in columns {
-            let name = column.name().to_string();
-            for value in column {
-                insert_value(value, name.clone(), &mut column_values)?;
-            }
-        }
-
-        from_parsed_columns(column_values, span)
-    }
-
-    pub fn into_value(self, tag: Tag) -> Value {
-        Value {
-            value: Self::into_untagged(self),
-            tag,
-        }
-    }
-
-    pub fn into_untagged(self) -> UntaggedValue {
-        UntaggedValue::DataFrame(self)
-    }
-
-    pub fn dataframe_to_value(df: DataFrame, tag: Tag) -> Value {
-        Value {
-            value: Self::dataframe_to_untagged(df),
-            tag,
-        }
-    }
-
-    pub fn dataframe_to_untagged(df: DataFrame) -> UntaggedValue {
-        UntaggedValue::DataFrame(Self::new(df))
-    }
-
-    pub fn series_to_untagged(series: Series, span: &Span) -> UntaggedValue {
-        match DataFrame::new(vec![series]) {
-            Ok(dataframe) => UntaggedValue::DataFrame(Self { dataframe }),
-            Err(e) => UntaggedValue::Error(ShellError::labeled_error(
-                "DataFrame Creation",
-                format!("Unable to create DataFrame: {}", e),
-                span,
-            )),
-        }
-    }
-
-    pub fn column(&self, column: &str, tag: &Tag) -> Result<Self, ShellError> {
-        let s = self
-            .as_ref()
-            .column(column)
-            .map_err(|e| ShellError::labeled_error("Column not found", e.to_string(), tag.span))?;
-
-        let dataframe = DataFrame::new(vec![s.clone()])
-            .map_err(|e| ShellError::labeled_error("DataFrame error", e.to_string(), tag.span))?;
-
-        Ok(Self { dataframe })
-    }
-
-    pub fn is_series(&self) -> bool {
-        self.as_ref().width() == 1
-    }
-
-    pub fn as_series(&self, span: &Span) -> Result<Series, ShellError> {
-        if !self.is_series() {
-            return Err(ShellError::labeled_error_with_secondary(
-                "Not a Series",
-                "DataFrame cannot be used as Series",
-                span,
-                "Note that a Series is a DataFrame with one column",
-                span,
-            ));
-        }
-
-        let series = self
-            .as_ref()
-            .get_columns()
-            .get(0)
-            .expect("We have already checked that the width is 1");
-
-        Ok(series.clone())
-    }
-
-    pub fn get_value(&self, row: usize, span: Span) -> Result<Value, ShellError> {
-        let series = self.as_series(&Span::default())?;
-        let column = create_column(&series, row, row + 1)?;
-
-        if column.len() == 0 {
-            Err(ShellError::labeled_error_with_secondary(
-                "Not a valid row",
-                format!("No value found for index {}", row),
-                span,
-                format!("Note that the column size is {}", series.len()),
-                span,
-            ))
-        } else {
-            let value = column
-                .into_iter()
-                .next()
-                .expect("already checked there is a value");
-            Ok(value)
-        }
-    }
-
-    // Print is made out a head and if the dataframe is too large, then a tail
-    pub fn print(&self) -> Result<Vec<Value>, ShellError> {
-        let df = &self.as_ref();
-        let size: usize = 20;
-
-        if df.height() > size {
-            let sample_size = size / 2;
-            let mut values = self.head(Some(sample_size))?;
-            add_separator(&mut values, df);
-            let remaining = df.height() - sample_size;
-            let tail_size = remaining.min(sample_size);
-            let mut tail_values = self.tail(Some(tail_size))?;
-            values.append(&mut tail_values);
-
-            Ok(values)
-        } else {
-            Ok(self.head(Some(size))?)
-        }
-    }
-
-    pub fn head(&self, rows: Option<usize>) -> Result<Vec<Value>, ShellError> {
-        let to_row = rows.unwrap_or(5);
-        let values = self.to_rows(0, to_row)?;
-
-        Ok(values)
-    }
-
-    pub fn tail(&self, rows: Option<usize>) -> Result<Vec<Value>, ShellError> {
-        let df = &self.as_ref();
-        let to_row = df.height();
-        let size = rows.unwrap_or(5);
-        let from_row = to_row.saturating_sub(size);
-
-        let values = self.to_rows(from_row, to_row)?;
-
-        Ok(values)
-    }
-
-    pub fn to_rows(&self, from_row: usize, to_row: usize) -> Result<Vec<Value>, ShellError> {
-        let df = self.as_ref();
-        let upper_row = to_row.min(df.height());
-
-        let mut size: usize = 0;
-        let columns = self
-            .as_ref()
-            .get_columns()
-            .iter()
-            .map(|col| match create_column(col, from_row, upper_row) {
-                Ok(col) => {
-                    size = col.len();
-                    Ok(col)
-                }
-                Err(e) => Err(e),
-            })
-            .collect::<Result<Vec<Column>, ShellError>>()?;
-
-        let mut iterators = columns
-            .into_iter()
-            .map(|col| (col.name().to_string(), col.into_iter()))
-            .collect::<Vec<(String, std::vec::IntoIter<Value>)>>();
-
-        let values = (0..size)
-            .into_iter()
-            .map(|i| {
-                let mut dictionary_row = Dictionary::default();
-
-                for (name, col) in &mut iterators {
-                    let dict_val = match col.next() {
-                        Some(v) => v,
-                        None => {
-                            println!("index: {}", i);
-                            Value {
-                                value: UntaggedValue::Primitive(Primitive::Nothing),
-                                tag: Tag::default(),
-                            }
-                        }
-                    };
-                    dictionary_row.insert(name.clone(), dict_val);
-                }
-
-                Value {
-                    value: UntaggedValue::Row(dictionary_row),
-                    tag: Tag::unknown(),
-                }
-            })
-            .collect::<Vec<Value>>();
-
-        Ok(values)
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/nu_groupby.rs b/old_nushell/crates/nu-protocol/src/dataframe/nu_groupby.rs
deleted file mode 100644
index 4f47295f9..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/nu_groupby.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use nu_source::{Span, Tag};
-use polars::frame::groupby::{GroupBy, GroupTuples};
-use serde::{Deserialize, Serialize};
-
-use super::{FrameStruct, NuDataFrame};
-use nu_errors::ShellError;
-
-use crate::{TaggedDictBuilder, UntaggedValue, Value};
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct NuGroupBy {
-    dataframe: NuDataFrame,
-    by: Vec<String>,
-    groups: GroupTuples,
-}
-
-impl NuGroupBy {
-    pub fn new(dataframe: NuDataFrame, by: Vec<String>, groups: GroupTuples) -> Self {
-        NuGroupBy {
-            dataframe,
-            by,
-            groups,
-        }
-    }
-
-    pub fn by(&self) -> &[String] {
-        &self.by
-    }
-
-    pub fn try_from_stream<T>(input: &mut T, span: &Span) -> Result<NuGroupBy, ShellError>
-    where
-        T: Iterator<Item = Value>,
-    {
-        input
-            .next()
-            .and_then(|value| match value.value {
-                UntaggedValue::FrameStruct(FrameStruct::GroupBy(group)) => Some(group),
-                _ => None,
-            })
-            .ok_or_else(|| {
-                ShellError::labeled_error(
-                    "No groupby object in stream",
-                    "no groupby object found in input stream",
-                    span,
-                )
-            })
-    }
-
-    pub fn to_groupby(&self) -> Result<GroupBy, ShellError> {
-        let df = self.dataframe.as_ref();
-
-        let by = df.select_series(&self.by).map_err(|e| {
-            ShellError::labeled_error("Error creating groupby", e.to_string(), Tag::unknown())
-        })?;
-
-        Ok(GroupBy::new(df, by, self.groups.clone(), None))
-    }
-
-    pub fn print(&self) -> Result<Vec<Value>, ShellError> {
-        let mut values: Vec<Value> = Vec::new();
-
-        let mut data = TaggedDictBuilder::new(Tag::unknown());
-        data.insert_value("property", "group by");
-        data.insert_value("value", self.by.join(", "));
-        values.push(data.into_value());
-
-        Ok(values)
-    }
-}
-
-impl AsRef<polars::prelude::DataFrame> for NuGroupBy {
-    fn as_ref(&self) -> &polars::prelude::DataFrame {
-        self.dataframe.as_ref()
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/dataframe/operations.rs b/old_nushell/crates/nu-protocol/src/dataframe/operations.rs
deleted file mode 100644
index 8426f1464..000000000
--- a/old_nushell/crates/nu-protocol/src/dataframe/operations.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use nu_errors::ShellError;
-use nu_source::Span;
-use polars::prelude::{DataFrame, Series};
-
-use super::NuDataFrame;
-
-pub enum Axis {
-    Row,
-    Column,
-}
-
-impl Axis {
-    pub fn try_from_str(axis: &str, span: &Span) -> Result<Axis, ShellError> {
-        match axis {
-            "row" => Ok(Axis::Row),
-            "col" => Ok(Axis::Column),
-            _ => Err(ShellError::labeled_error_with_secondary(
-                "Wrong axis",
-                "The selected axis does not exist",
-                span,
-                "The only axis options are 'row' or 'col'",
-                span,
-            )),
-        }
-    }
-}
-
-impl NuDataFrame {
-    pub fn append_df(
-        &self,
-        other: &NuDataFrame,
-        axis: Axis,
-        span: &Span,
-    ) -> Result<Self, ShellError> {
-        match axis {
-            Axis::Row => {
-                let mut columns: Vec<&str> = Vec::new();
-
-                let new_cols = self
-                    .as_ref()
-                    .get_columns()
-                    .iter()
-                    .chain(other.as_ref().get_columns())
-                    .map(|s| {
-                        let name = if columns.contains(&s.name()) {
-                            format!("{}_{}", s.name(), "x")
-                        } else {
-                            columns.push(s.name());
-                            s.name().to_string()
-                        };
-
-                        let mut series = s.clone();
-                        series.rename(&name);
-                        series
-                    })
-                    .collect::<Vec<Series>>();
-
-                let df_new = DataFrame::new(new_cols).map_err(|e| {
-                    ShellError::labeled_error("Appending error", e.to_string(), span)
-                })?;
-
-                Ok(NuDataFrame::new(df_new))
-            }
-            Axis::Column => {
-                if self.as_ref().width() != other.as_ref().width() {
-                    return Err(ShellError::labeled_error(
-                        "Appending error",
-                        "Dataframes with different number of columns",
-                        span,
-                    ));
-                }
-
-                if !self
-                    .as_ref()
-                    .get_column_names()
-                    .iter()
-                    .all(|col| other.as_ref().get_column_names().contains(col))
-                {
-                    return Err(ShellError::labeled_error(
-                        "Appending error",
-                        "Dataframes with different columns names",
-                        span,
-                    ));
-                }
-
-                let new_cols = self
-                    .as_ref()
-                    .get_columns()
-                    .iter()
-                    .map(|s| {
-                        let other_col = other
-                            .as_ref()
-                            .column(s.name())
-                            .expect("Already checked that dataframes have same columns");
-
-                        let mut tmp = s.clone();
-                        let res = tmp.append(other_col);
-
-                        match res {
-                            Ok(s) => Ok(s.clone()),
-                            Err(e) => Err({
-                                ShellError::labeled_error(
-                                    "Appending error",
-                                    format!("Unable to append dataframes: {}", e),
-                                    span,
-                                )
-                            }),
-                        }
-                    })
-                    .collect::<Result<Vec<Series>, ShellError>>()?;
-
-                let df_new = DataFrame::new(new_cols).map_err(|e| {
-                    ShellError::labeled_error("Appending error", e.to_string(), span)
-                })?;
-
-                Ok(NuDataFrame::new(df_new))
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/hir.rs b/old_nushell/crates/nu-protocol/src/hir.rs
deleted file mode 100644
index 485a187db..000000000
--- a/old_nushell/crates/nu-protocol/src/hir.rs
+++ /dev/null
@@ -1,1686 +0,0 @@
-use std::cmp::{Ord, Ordering, PartialOrd};
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::{convert::From, sync::Arc};
-
-use indexmap::map::Iter;
-use serde::{Deserialize, Serialize};
-
-use crate::Signature;
-use crate::{hir, Dictionary, PositionalType, Primitive, SyntaxShape, UntaggedValue};
-use crate::{PathMember, ShellTypeName};
-use derive_new::new;
-
-use nu_errors::{ParseError, ShellError};
-use nu_source::{
-    DbgDocBldr, DebugDocBuilder, HasSpan, PrettyDebug, PrettyDebugRefineKind, PrettyDebugWithSource,
-};
-use nu_source::{IntoSpanned, Span, Spanned, SpannedItem, Tag};
-
-use bigdecimal::{BigDecimal, ToPrimitive};
-use indexmap::IndexMap;
-use log::trace;
-use num_bigint::{BigInt, ToBigInt};
-use num_traits::identities::Zero;
-use num_traits::FromPrimitive;
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct InternalCommand {
-    pub name: String,
-    pub name_span: Span,
-    pub args: crate::hir::Call,
-}
-
-impl InternalCommand {
-    pub fn new(name: String, name_span: Span, full_span: Span) -> InternalCommand {
-        InternalCommand {
-            name,
-            name_span,
-            args: crate::hir::Call::new(
-                Box::new(SpannedExpression::new(Expression::Command, name_span)),
-                full_span,
-            ),
-        }
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.args.has_var_usage(var_name)
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        self.args.get_free_variables(known_variables)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct ClassifiedBlock {
-    pub block: Arc<Block>,
-    // this is not a Result to make it crystal clear that these shapes
-    // aren't intended to be used directly with `?`
-    pub failed: Option<ParseError>,
-}
-
-impl ClassifiedBlock {
-    pub fn new(block: Arc<Block>, failed: Option<ParseError>) -> ClassifiedBlock {
-        ClassifiedBlock { block, failed }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct ClassifiedPipeline {
-    pub commands: Pipeline,
-}
-
-impl ClassifiedPipeline {
-    pub fn new(commands: Pipeline) -> ClassifiedPipeline {
-        ClassifiedPipeline { commands }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum ClassifiedCommand {
-    Expr(Box<SpannedExpression>),
-    Dynamic(crate::hir::Call),
-    Internal(InternalCommand),
-    Error(ParseError),
-}
-
-impl ClassifiedCommand {
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        match self {
-            ClassifiedCommand::Expr(expr) => expr.has_var_usage(var_name),
-            ClassifiedCommand::Dynamic(call) => call.has_var_usage(var_name),
-            ClassifiedCommand::Internal(internal) => internal.has_var_usage(var_name),
-            ClassifiedCommand::Error(_) => false,
-        }
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        match self {
-            ClassifiedCommand::Expr(expr) => expr.get_free_variables(known_variables),
-            ClassifiedCommand::Dynamic(call) => call.get_free_variables(known_variables),
-            ClassifiedCommand::Internal(internal) => internal.get_free_variables(known_variables),
-            _ => vec![],
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct Pipeline {
-    pub list: Vec<ClassifiedCommand>,
-    pub span: Span,
-}
-
-impl Pipeline {
-    pub fn new(span: Span) -> Pipeline {
-        Pipeline { list: vec![], span }
-    }
-
-    pub fn basic() -> Pipeline {
-        Pipeline {
-            list: vec![],
-            span: Span::unknown(),
-        }
-    }
-
-    pub fn push(&mut self, command: ClassifiedCommand) {
-        self.list.push(command);
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.list.iter().any(|cc| cc.has_var_usage(var_name))
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct Group {
-    pub pipelines: Vec<Pipeline>,
-    pub span: Span,
-}
-impl Group {
-    pub fn new(pipelines: Vec<Pipeline>, span: Span) -> Group {
-        Group { pipelines, span }
-    }
-
-    pub fn basic() -> Group {
-        Group {
-            pipelines: vec![],
-            span: Span::unknown(),
-        }
-    }
-
-    pub fn push(&mut self, pipeline: Pipeline) {
-        self.pipelines.push(pipeline);
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.pipelines.iter().any(|cc| cc.has_var_usage(var_name))
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct CapturedBlock {
-    pub block: Arc<Block>,
-    pub captured: Dictionary,
-}
-
-impl CapturedBlock {
-    pub fn new(block: Arc<Block>, captured: Dictionary) -> Self {
-        Self { block, captured }
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
-pub struct Block {
-    pub params: Signature,
-    pub block: Vec<Group>,
-    pub definitions: IndexMap<String, Arc<Block>>,
-    pub span: Span,
-}
-
-impl Block {
-    pub fn new(
-        params: Signature,
-        block: Vec<Group>,
-        definitions: IndexMap<String, Arc<Block>>,
-        span: Span,
-    ) -> Block {
-        Block {
-            params,
-            block,
-            definitions,
-            span,
-        }
-    }
-
-    pub fn basic() -> Block {
-        Block {
-            params: Signature::new("<basic>"),
-            block: vec![],
-            definitions: IndexMap::new(),
-            span: Span::unknown(),
-        }
-    }
-
-    pub fn push(&mut self, group: Group) {
-        self.block.push(group);
-        self.infer_params();
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.block.iter().any(|x| x.has_var_usage(var_name))
-    }
-
-    pub fn infer_params(&mut self) {
-        // FIXME: re-enable inference later
-        if self.params.positional.is_empty() && self.has_var_usage("$it") {
-            self.params.positional = vec![(
-                PositionalType::Mandatory("$it".to_string(), SyntaxShape::Any),
-                "implied $it".to_string(),
-            )];
-        }
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        let mut known_variables = known_variables.clone();
-        let positional_params: Vec<_> = self
-            .params
-            .positional
-            .iter()
-            .map(|(_, name)| name.clone())
-            .collect();
-        known_variables.extend_from_slice(&positional_params);
-
-        let mut free_variables = vec![];
-        for group in &self.block {
-            for pipeline in &group.pipelines {
-                for elem in &pipeline.list {
-                    free_variables
-                        .extend_from_slice(&elem.get_free_variables(&mut known_variables));
-                }
-            }
-        }
-
-        free_variables
-    }
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl Hash for Block {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let mut entries = self.definitions.clone();
-        entries.sort_keys();
-
-        // FIXME: this is incomplete
-        entries.keys().collect::<Vec<&String>>().hash(state);
-    }
-}
-
-impl PartialOrd for Block {
-    /// Compare two dictionaries for sort ordering
-    fn partial_cmp(&self, other: &Block) -> Option<Ordering> {
-        let this: Vec<&String> = self.definitions.keys().collect();
-        let that: Vec<&String> = other.definitions.keys().collect();
-
-        // FIXME: this is incomplete
-        this.partial_cmp(&that)
-    }
-}
-
-impl Ord for Block {
-    /// Compare two dictionaries for ordering
-    fn cmp(&self, other: &Block) -> Ordering {
-        let this: Vec<&String> = self.definitions.keys().collect();
-        let that: Vec<&String> = other.definitions.keys().collect();
-
-        // FIXME: this is incomplete
-        this.cmp(&that)
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub struct ExternalStringCommand {
-    pub name: Spanned<String>,
-    pub args: Vec<Spanned<String>>,
-}
-
-impl ExternalArgs {
-    pub fn iter(&self) -> impl Iterator<Item = &SpannedExpression> {
-        self.list.iter()
-    }
-}
-
-impl std::ops::Deref for ExternalArgs {
-    type Target = [SpannedExpression];
-
-    fn deref(&self) -> &[SpannedExpression] {
-        &self.list
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct ExternalArgs {
-    pub list: Vec<SpannedExpression>,
-    pub span: Span,
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct ExternalCommand {
-    pub name: String,
-
-    pub name_tag: Tag,
-    pub args: ExternalArgs,
-}
-
-impl ExternalCommand {
-    pub fn has_it_usage(&self) -> bool {
-        self.args.iter().any(|arg| match arg {
-            SpannedExpression {
-                expr: Expression::FullColumnPath(path),
-                ..
-            } => {
-                let FullColumnPath { head, .. } = &**path;
-                matches!(head, SpannedExpression{expr: Expression::Variable(x, ..), ..} if x == "$it")
-            }
-            _ => false,
-        })
-    }
-}
-
-impl HasSpan for ExternalCommand {
-    fn span(&self) -> Span {
-        self.name_tag.span.until(self.args.span)
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Copy, Deserialize, Serialize)]
-pub enum Unit {
-    // Filesize units: metric
-    Byte,
-    Kilobyte,
-    Megabyte,
-    Gigabyte,
-    Terabyte,
-    Petabyte,
-
-    // Filesize units: ISO/IEC 80000
-    Kibibyte,
-    Mebibyte,
-    Gibibyte,
-    Tebibyte,
-    Pebibyte,
-
-    // Duration units
-    Nanosecond,
-    Microsecond,
-    Millisecond,
-    Second,
-    Minute,
-    Hour,
-    Day,
-    Week,
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum Member {
-    String(/* outer */ Span, /* inner */ Span),
-    Int(i64, Span),
-    Bare(Spanned<String>),
-}
-
-impl Member {
-    pub fn to_path_member(&self) -> PathMember {
-        match self {
-            //Member::String(outer, inner) => PathMember::string(inner.slice(source), *outer),
-            Member::Int(int, span) => PathMember::int(*int, *span),
-            Member::Bare(spanned_string) => {
-                PathMember::string(spanned_string.item.clone(), spanned_string.span)
-            }
-            _ => unimplemented!("Need to finish to_path_member"),
-        }
-    }
-}
-
-impl PrettyDebugWithSource for Member {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            Member::String(outer, _) => DbgDocBldr::value(outer.slice(source)),
-            Member::Int(int, _) => DbgDocBldr::value(int),
-            Member::Bare(span) => DbgDocBldr::value(span.span.slice(source)),
-        }
-    }
-}
-
-impl HasSpan for Member {
-    fn span(&self) -> Span {
-        match self {
-            Member::String(outer, ..) => *outer,
-            Member::Int(_, int) => *int,
-            Member::Bare(name) => name.span,
-        }
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum Number {
-    BigInt(BigInt),
-    Int(i64),
-    Decimal(BigDecimal),
-}
-
-impl Number {
-    pub fn to_i64(&self) -> Result<i64, ShellError> {
-        match self {
-            Number::BigInt(bi) => match bi.to_i64() {
-                Some(i) => Ok(i),
-                None => Err(ShellError::untagged_runtime_error(
-                    "Cannot convert bigint to i64, too large",
-                )),
-            },
-            Number::Int(i) => Ok(*i),
-            Number::Decimal(_) => Err(ShellError::untagged_runtime_error(
-                "Cannont convert decimal to i64",
-            )),
-        }
-    }
-    pub fn to_u64(&self) -> Result<u64, ShellError> {
-        match self {
-            Number::BigInt(bi) => match bi.to_u64() {
-                Some(i) => Ok(i),
-                None => Err(ShellError::untagged_runtime_error(
-                    "Cannot convert bigint to u64, too large",
-                )),
-            },
-            Number::Int(i) => Ok(*i as u64),
-            Number::Decimal(_) => Err(ShellError::untagged_runtime_error(
-                "Cannont convert decimal to u64",
-            )),
-        }
-    }
-}
-
-impl PrettyDebug for Number {
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            Number::BigInt(int) => DbgDocBldr::primitive(int),
-            Number::Int(int) => DbgDocBldr::primitive(int),
-            Number::Decimal(decimal) => DbgDocBldr::primitive(decimal),
-        }
-    }
-}
-
-macro_rules! primitive_int {
-    ($($ty:ty)*) => {
-        $(
-            impl From<$ty> for Number {
-                fn from(int: $ty) -> Number {
-                    Number::BigInt(BigInt::zero() + int)
-                }
-            }
-
-            impl From<&$ty> for Number {
-                fn from(int: &$ty) -> Number {
-                    Number::BigInt(BigInt::zero() + *int)
-                }
-            }
-        )*
-    }
-}
-
-primitive_int!(i8 u8 i16 u16 i32 u32 i64 u64 i128 u128);
-
-macro_rules! primitive_decimal {
-    ($($ty:tt -> $from:tt),*) => {
-        $(
-            impl From<$ty> for Number {
-                fn from(decimal: $ty) -> Number {
-                    if let Some(num) = BigDecimal::$from(decimal) {
-                        Number::Decimal(num)
-                    } else {
-                        unreachable!("Internal error: BigDecimal 'from' failed")
-                    }
-                }
-            }
-
-            impl From<&$ty> for Number {
-                fn from(decimal: &$ty) -> Number {
-                    if let Some(num) = BigDecimal::$from(*decimal) {
-                        Number::Decimal(num)
-                    } else {
-                        unreachable!("Internal error: BigDecimal 'from' failed")
-                    }
-                }
-            }
-        )*
-    }
-}
-
-primitive_decimal!(f32 -> from_f32, f64 -> from_f64);
-
-impl std::ops::Mul for Number {
-    type Output = Number;
-
-    fn mul(self, other: Number) -> Number {
-        match (self, other) {
-            (Number::Int(a), Number::Int(b)) => Number::Int(a * b),
-            (Number::BigInt(a), Number::Int(b)) => Number::BigInt(a * BigInt::from(b)),
-            (Number::Int(a), Number::BigInt(b)) => Number::BigInt(BigInt::from(a) * b),
-            (Number::BigInt(a), Number::BigInt(b)) => Number::BigInt(a * b),
-            (Number::Int(a), Number::Decimal(b)) => Number::Decimal(BigDecimal::from(a) * b),
-            (Number::Decimal(a), Number::Int(b)) => Number::Decimal(a * BigDecimal::from(b)),
-            (Number::BigInt(a), Number::Decimal(b)) => Number::Decimal(BigDecimal::from(a) * b),
-            (Number::Decimal(a), Number::BigInt(b)) => Number::Decimal(a * BigDecimal::from(b)),
-            (Number::Decimal(a), Number::Decimal(b)) => Number::Decimal(a * b),
-        }
-    }
-}
-
-// For literals
-impl std::ops::Mul<u32> for Number {
-    type Output = Number;
-
-    fn mul(self, other: u32) -> Number {
-        match self {
-            Number::BigInt(left) => Number::BigInt(left * (other as i64)),
-            Number::Int(left) => Number::Int(left * (other as i64)),
-            Number::Decimal(left) => Number::Decimal(left * BigDecimal::from(other)),
-        }
-    }
-}
-
-impl ToBigInt for Number {
-    fn to_bigint(&self) -> Option<BigInt> {
-        match self {
-            Number::Int(int) => Some(BigInt::from(*int)),
-            Number::BigInt(int) => Some(int.clone()),
-            // The BigDecimal to BigInt conversion always return Some().
-            // FIXME: This conversion might not be want we want, it just remove the scale.
-            Number::Decimal(decimal) => decimal.to_bigint(),
-        }
-    }
-}
-
-impl PrettyDebug for Unit {
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::keyword(self.as_str())
-    }
-}
-
-impl Unit {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Unit::Byte => "B",
-            Unit::Kilobyte => "KB",
-            Unit::Megabyte => "MB",
-            Unit::Gigabyte => "GB",
-            Unit::Terabyte => "TB",
-            Unit::Petabyte => "PB",
-            Unit::Kibibyte => "KiB",
-            Unit::Mebibyte => "MiB",
-            Unit::Gibibyte => "GiB",
-            Unit::Tebibyte => "TiB",
-            Unit::Pebibyte => "PiB",
-            Unit::Nanosecond => "ns",
-            Unit::Microsecond => "us",
-            Unit::Millisecond => "ms",
-            Unit::Second => "sec",
-            Unit::Minute => "min",
-            Unit::Hour => "hr",
-            Unit::Day => "day",
-            Unit::Week => "wk",
-        }
-    }
-
-    pub fn compute(self, size: &Number) -> UntaggedValue {
-        let size = size.clone();
-
-        match self {
-            Unit::Byte => filesize(size),
-            Unit::Kilobyte => filesize(size * 1000),
-            Unit::Megabyte => filesize(size * 1000 * 1000),
-            Unit::Gigabyte => filesize(size * 1000 * 1000 * 1000),
-            Unit::Terabyte => filesize(size * 1000 * 1000 * 1000 * 1000),
-            Unit::Petabyte => filesize(size * 1000 * 1000 * 1000 * 1000 * 1000),
-
-            Unit::Kibibyte => filesize(size * 1024),
-            Unit::Mebibyte => filesize(size * 1024 * 1024),
-            Unit::Gibibyte => filesize(size * 1024 * 1024 * 1024),
-            Unit::Tebibyte => filesize(size * 1024 * 1024 * 1024 * 1024),
-            Unit::Pebibyte => filesize(size * 1024 * 1024 * 1024 * 1024 * 1024),
-
-            Unit::Nanosecond => duration(size.to_bigint().expect("Conversion should never fail.")),
-            Unit::Microsecond => {
-                duration(size.to_bigint().expect("Conversion should never fail.") * 1000)
-            }
-            Unit::Millisecond => {
-                duration(size.to_bigint().expect("Conversion should never fail.") * 1000 * 1000)
-            }
-            Unit::Second => duration(
-                size.to_bigint().expect("Conversion should never fail.") * 1000 * 1000 * 1000,
-            ),
-            Unit::Minute => duration(
-                size.to_bigint().expect("Conversion should never fail.") * 60 * 1000 * 1000 * 1000,
-            ),
-            Unit::Hour => duration(
-                size.to_bigint().expect("Conversion should never fail.")
-                    * 60
-                    * 60
-                    * 1000
-                    * 1000
-                    * 1000,
-            ),
-            Unit::Day => duration(
-                size.to_bigint().expect("Conversion should never fail.")
-                    * 24
-                    * 60
-                    * 60
-                    * 1000
-                    * 1000
-                    * 1000,
-            ),
-            Unit::Week => duration(
-                size.to_bigint().expect("Conversion should never fail.")
-                    * 7
-                    * 24
-                    * 60
-                    * 60
-                    * 1000
-                    * 1000
-                    * 1000,
-            ),
-        }
-    }
-}
-
-pub fn filesize(size_in_bytes: Number) -> UntaggedValue {
-    match size_in_bytes {
-        Number::Int(i) => UntaggedValue::Primitive(Primitive::Filesize(i as u64)),
-        Number::BigInt(bi) => match bi.to_u64() {
-            Some(i) => UntaggedValue::Primitive(Primitive::Filesize(i)),
-            None => UntaggedValue::Error(ShellError::untagged_runtime_error(
-                "Big int too large to convert to filesize",
-            )),
-        },
-        Number::Decimal(_) => UntaggedValue::Error(ShellError::untagged_runtime_error(
-            "Decimal can't convert to filesize",
-        )),
-    }
-}
-
-pub fn duration(nanos: impl Into<BigInt>) -> UntaggedValue {
-    UntaggedValue::Primitive(Primitive::Duration(nanos.into()))
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Deserialize, Serialize)]
-pub struct SpannedExpression {
-    pub expr: Expression,
-    pub span: Span,
-}
-
-impl SpannedExpression {
-    pub fn new(expr: Expression, span: Span) -> SpannedExpression {
-        SpannedExpression { expr, span }
-    }
-
-    pub fn precedence(&self) -> usize {
-        match self.expr {
-            Expression::Literal(Literal::Operator(operator)) => {
-                // Higher precedence binds tighter
-
-                match operator {
-                    Operator::Pow => 100,
-                    Operator::Multiply | Operator::Divide | Operator::Modulo => 95,
-                    Operator::Plus | Operator::Minus => 90,
-                    Operator::NotContains
-                    | Operator::Contains
-                    | Operator::LessThan
-                    | Operator::LessThanOrEqual
-                    | Operator::GreaterThan
-                    | Operator::GreaterThanOrEqual
-                    | Operator::Equal
-                    | Operator::NotEqual
-                    | Operator::In
-                    | Operator::NotIn => 80,
-                    Operator::And => 50,
-                    Operator::Or => 40, // TODO: should we have And and Or be different precedence?
-                }
-            }
-            _ => 0,
-        }
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.expr.has_var_usage(var_name)
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        self.expr.get_free_variables(known_variables)
-    }
-
-    pub fn var_name(&self) -> Result<String, ShellError> {
-        let var_name = match &self.expr {
-            Expression::FullColumnPath(path) => match &path.head.expr {
-                Expression::Variable(v, _) => v,
-                x => {
-                    return Err(ShellError::labeled_error(
-                        format!("Expected a variable (got {:?})", x),
-                        "expected a variable",
-                        self.span,
-                    ))
-                }
-            },
-            Expression::Literal(Literal::String(x)) => x,
-            x => {
-                return Err(ShellError::labeled_error(
-                    format!("Expected a variable (got {:?})", x),
-                    "expected a variable",
-                    self.span,
-                ))
-            }
-        }
-        .to_string();
-
-        if !var_name.starts_with('$') {
-            Ok(format!("${}", var_name))
-        } else {
-            Ok(var_name)
-        }
-    }
-}
-
-impl std::ops::Deref for SpannedExpression {
-    type Target = Expression;
-
-    fn deref(&self) -> &Expression {
-        &self.expr
-    }
-}
-
-impl HasSpan for SpannedExpression {
-    fn span(&self) -> Span {
-        self.span
-    }
-}
-
-impl ShellTypeName for SpannedExpression {
-    fn type_name(&self) -> &'static str {
-        self.expr.type_name()
-    }
-}
-
-impl PrettyDebugWithSource for SpannedExpression {
-    fn refined_pretty_debug(&self, refine: PrettyDebugRefineKind, source: &str) -> DebugDocBuilder {
-        match refine {
-            PrettyDebugRefineKind::ContextFree => self.refined_pretty_debug(refine, source),
-            PrettyDebugRefineKind::WithContext => match &self.expr {
-                Expression::Literal(literal) => literal
-                    .clone()
-                    .into_spanned(self.span)
-                    .refined_pretty_debug(refine, source),
-                Expression::ExternalWord => {
-                    DbgDocBldr::delimit("e\"", DbgDocBldr::primitive(self.span.slice(source)), "\"")
-                        .group()
-                }
-                Expression::Synthetic(s) => match s {
-                    Synthetic::String(_) => DbgDocBldr::delimit(
-                        "s\"",
-                        DbgDocBldr::primitive(self.span.slice(source)),
-                        "\"",
-                    )
-                    .group(),
-                },
-                Expression::Variable(_, _) => DbgDocBldr::keyword(self.span.slice(source)),
-                Expression::Binary(binary) => binary.pretty_debug(source),
-                Expression::Range(range) => range.pretty_debug(source),
-                Expression::Block(_) => DbgDocBldr::opaque("block"),
-                Expression::Subexpression(_) => DbgDocBldr::opaque("subexpression"),
-                Expression::Garbage => DbgDocBldr::opaque("garbage"),
-                Expression::List(list) => DbgDocBldr::delimit(
-                    "[",
-                    DbgDocBldr::intersperse(
-                        list.iter()
-                            .map(|item| item.refined_pretty_debug(refine, source)),
-                        DbgDocBldr::space(),
-                    ),
-                    "]",
-                ),
-                Expression::Table(_headers, cells) => DbgDocBldr::delimit(
-                    "[",
-                    DbgDocBldr::intersperse(
-                        cells.iter().flat_map(|row| {
-                            row.iter()
-                                .map(|item| item.refined_pretty_debug(refine, source))
-                        }),
-                        DbgDocBldr::space(),
-                    ),
-                    "]",
-                ),
-                Expression::FullColumnPath(path) => path.pretty_debug(source),
-                Expression::FilePath(path) => {
-                    DbgDocBldr::typed("path", DbgDocBldr::primitive(path.display()))
-                }
-                Expression::ExternalCommand(external) => {
-                    DbgDocBldr::keyword("^") + DbgDocBldr::keyword(external.name.span.slice(source))
-                }
-                Expression::Command => DbgDocBldr::keyword(self.span.slice(source)),
-                Expression::Boolean(boolean) => match boolean {
-                    true => DbgDocBldr::primitive("$yes"),
-                    false => DbgDocBldr::primitive("$no"),
-                },
-            },
-        }
-    }
-
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match &self.expr {
-            Expression::Literal(literal) => {
-                literal.clone().into_spanned(self.span).pretty_debug(source)
-            }
-            Expression::ExternalWord => DbgDocBldr::typed(
-                "external word",
-                DbgDocBldr::primitive(self.span.slice(source)),
-            ),
-            Expression::Synthetic(s) => match s {
-                Synthetic::String(s) => {
-                    DbgDocBldr::typed("synthetic", DbgDocBldr::primitive(format!("{:?}", s)))
-                }
-            },
-            Expression::Variable(_, _) => DbgDocBldr::keyword(self.span.slice(source)),
-            Expression::Binary(binary) => binary.pretty_debug(source),
-            Expression::Range(range) => range.pretty_debug(source),
-            Expression::Block(_) => DbgDocBldr::opaque("block"),
-            Expression::Subexpression(_) => DbgDocBldr::opaque("subexpression"),
-            Expression::Garbage => DbgDocBldr::opaque("garbage"),
-            Expression::List(list) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::intersperse(
-                    list.iter().map(|item| item.pretty_debug(source)),
-                    DbgDocBldr::space(),
-                ),
-                "]",
-            ),
-            Expression::Table(_headers, cells) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::intersperse(
-                    cells
-                        .iter()
-                        .flat_map(|row| row.iter().map(|item| item.pretty_debug(source))),
-                    DbgDocBldr::space(),
-                ),
-                "]",
-            ),
-            Expression::FullColumnPath(path) => path.pretty_debug(source),
-            Expression::FilePath(path) => {
-                DbgDocBldr::typed("path", DbgDocBldr::primitive(path.display()))
-            }
-            Expression::ExternalCommand(external) => DbgDocBldr::typed(
-                "command",
-                DbgDocBldr::keyword("^") + DbgDocBldr::primitive(external.name.span.slice(source)),
-            ),
-            Expression::Command => {
-                DbgDocBldr::typed("command", DbgDocBldr::primitive(self.span.slice(source)))
-            }
-            Expression::Boolean(boolean) => match boolean {
-                true => DbgDocBldr::primitive("$yes"),
-                false => DbgDocBldr::primitive("$no"),
-            },
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, Eq, Hash, PartialEq, Deserialize, Serialize)]
-pub enum Operator {
-    Equal,
-    NotEqual,
-    LessThan,
-    GreaterThan,
-    LessThanOrEqual,
-    GreaterThanOrEqual,
-    Contains,
-    NotContains,
-    Plus,
-    Minus,
-    Multiply,
-    Divide,
-    In,
-    NotIn,
-    Modulo,
-    And,
-    Or,
-    Pow,
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize, new)]
-pub struct Binary {
-    pub left: SpannedExpression,
-    pub op: SpannedExpression,
-    pub right: SpannedExpression,
-}
-
-impl PrettyDebugWithSource for Binary {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::delimit(
-            "<",
-            self.left.pretty_debug(source)
-                + DbgDocBldr::space()
-                + DbgDocBldr::keyword(self.op.span.slice(source))
-                + DbgDocBldr::space()
-                + self.right.pretty_debug(source),
-            ">",
-        )
-        .group()
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum Synthetic {
-    String(String),
-}
-
-impl ShellTypeName for Synthetic {
-    fn type_name(&self) -> &'static str {
-        match self {
-            Synthetic::String(_) => "string",
-        }
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub struct Range {
-    pub left: Option<SpannedExpression>,
-    pub operator: Spanned<RangeOperator>,
-    pub right: Option<SpannedExpression>,
-}
-
-impl PrettyDebugWithSource for Range {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::delimit(
-            "<",
-            (if let Some(left) = &self.left {
-                left.pretty_debug(source)
-            } else {
-                DebugDocBuilder::blank()
-            }) + DbgDocBldr::space()
-                + DbgDocBldr::keyword(self.operator.span().slice(source))
-                + DbgDocBldr::space()
-                + (if let Some(right) = &self.right {
-                    right.pretty_debug(source)
-                } else {
-                    DebugDocBuilder::blank()
-                }),
-            ">",
-        )
-        .group()
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum RangeOperator {
-    Inclusive,
-    RightExclusive,
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum Literal {
-    Number(Number),
-    Size(Spanned<Number>, Spanned<Unit>),
-    Operator(Operator),
-    String(String),
-    GlobPattern(String),
-    ColumnPath(Vec<Member>),
-    Bare(String),
-}
-
-impl Literal {
-    pub fn into_spanned(self, span: impl Into<Span>) -> SpannedLiteral {
-        SpannedLiteral {
-            literal: self,
-            span: span.into(),
-        }
-    }
-}
-
-//, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize
-#[derive(Debug, Clone)]
-pub struct SpannedLiteral {
-    pub literal: Literal,
-    pub span: Span,
-}
-
-impl ShellTypeName for Literal {
-    fn type_name(&self) -> &'static str {
-        match &self {
-            Literal::Number(..) => "number",
-            Literal::Size(..) => "size",
-            Literal::String(..) => "string",
-            Literal::ColumnPath(..) => "column path",
-            Literal::Bare(_) => "string",
-            Literal::GlobPattern(_) => "pattern",
-            Literal::Operator(_) => "operator",
-        }
-    }
-}
-
-impl PrettyDebugWithSource for SpannedLiteral {
-    fn refined_pretty_debug(&self, refine: PrettyDebugRefineKind, source: &str) -> DebugDocBuilder {
-        match refine {
-            PrettyDebugRefineKind::ContextFree => self.pretty_debug(source),
-            PrettyDebugRefineKind::WithContext => match &self.literal {
-                Literal::Number(number) => number.pretty(),
-                Literal::Size(number, unit) => (number.pretty() + unit.pretty()).group(),
-                Literal::String(string) => DbgDocBldr::primitive(format!("{:?}", string)), //string.slice(source))),
-                Literal::GlobPattern(pattern) => DbgDocBldr::primitive(pattern),
-                Literal::ColumnPath(path) => {
-                    DbgDocBldr::intersperse_with_source(path, DbgDocBldr::space(), source)
-                }
-                Literal::Bare(bare) => {
-                    DbgDocBldr::delimit("b\"", DbgDocBldr::primitive(bare), "\"")
-                }
-                Literal::Operator(operator) => DbgDocBldr::primitive(format!("{:?}", operator)),
-            },
-        }
-    }
-
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match &self.literal {
-            Literal::Number(number) => number.pretty(),
-            Literal::Size(number, unit) => {
-                DbgDocBldr::typed("size", (number.pretty() + unit.pretty()).group())
-            }
-            Literal::String(string) => DbgDocBldr::typed(
-                "string",
-                DbgDocBldr::primitive(format!("{:?}", string)), //string.slice(source))),
-            ),
-            Literal::GlobPattern(pattern) => {
-                DbgDocBldr::typed("pattern", DbgDocBldr::primitive(pattern))
-            }
-            Literal::ColumnPath(path) => DbgDocBldr::typed(
-                "column path",
-                DbgDocBldr::intersperse_with_source(path, DbgDocBldr::space(), source),
-            ),
-            Literal::Bare(bare) => DbgDocBldr::typed("bare", DbgDocBldr::primitive(bare)),
-            Literal::Operator(operator) => {
-                DbgDocBldr::typed("operator", DbgDocBldr::primitive(format!("{:?}", operator)))
-            }
-        }
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, new, Deserialize, Serialize)]
-pub struct FullColumnPath {
-    pub head: SpannedExpression,
-    pub tail: Vec<PathMember>,
-}
-
-impl PrettyDebugWithSource for FullColumnPath {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        self.head.pretty_debug(source)
-            + DbgDocBldr::operator(".")
-            + DbgDocBldr::intersperse(
-                self.tail.iter().map(|m| m.pretty()),
-                DbgDocBldr::operator("."),
-            )
-    }
-}
-
-#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Clone, Hash, Deserialize, Serialize)]
-pub enum Expression {
-    Literal(Literal),
-    ExternalWord,
-    Synthetic(Synthetic),
-    Variable(String, Span),
-    Binary(Box<Binary>),
-    Range(Box<Range>),
-    Block(Arc<hir::Block>),
-    List(Vec<SpannedExpression>),
-    Table(Vec<SpannedExpression>, Vec<Vec<SpannedExpression>>),
-    FullColumnPath(Box<FullColumnPath>),
-
-    FilePath(PathBuf),
-    ExternalCommand(ExternalStringCommand),
-    Command,
-    Subexpression(Arc<hir::Block>),
-
-    Boolean(bool),
-
-    // Trying this approach out: if we let parsing always be infallible
-    // we can use the same parse and just place bad token markers in the output
-    // We can later throw an error if we try to process them further.
-    Garbage,
-}
-
-impl ShellTypeName for Expression {
-    fn type_name(&self) -> &'static str {
-        match self {
-            Expression::Literal(literal) => literal.type_name(),
-            Expression::Synthetic(synthetic) => synthetic.type_name(),
-            Expression::Command => "command",
-            Expression::ExternalWord => "external word",
-            Expression::FilePath(..) => "file path",
-            Expression::Variable(..) => "variable",
-            Expression::List(..) => "list",
-            Expression::Table(..) => "table",
-            Expression::Binary(..) => "binary",
-            Expression::Range(..) => "range",
-            Expression::Block(..) => "block",
-            Expression::Subexpression(..) => "subexpression",
-            Expression::FullColumnPath(..) => "variable path",
-            Expression::Boolean(..) => "boolean",
-            Expression::ExternalCommand(..) => "external",
-            Expression::Garbage => "garbage",
-        }
-    }
-}
-
-impl IntoSpanned for Expression {
-    type Output = SpannedExpression;
-
-    fn into_spanned(self, span: impl Into<Span>) -> Self::Output {
-        SpannedExpression {
-            expr: self,
-            span: span.into(),
-        }
-    }
-}
-
-impl Expression {
-    pub fn integer(i: i64) -> Expression {
-        Expression::Literal(Literal::Number(Number::Int(i)))
-    }
-
-    pub fn big_integer(i: BigInt) -> Expression {
-        Expression::Literal(Literal::Number(Number::BigInt(i)))
-    }
-
-    pub fn decimal(dec: BigDecimal) -> Expression {
-        Expression::Literal(Literal::Number(Number::Decimal(dec)))
-    }
-
-    pub fn string(s: String) -> Expression {
-        Expression::Literal(Literal::String(s))
-    }
-
-    pub fn operator(operator: Operator) -> Expression {
-        Expression::Literal(Literal::Operator(operator))
-    }
-
-    pub fn range(
-        left: Option<SpannedExpression>,
-        operator: Spanned<RangeOperator>,
-        right: Option<SpannedExpression>,
-    ) -> Expression {
-        Expression::Range(Box::new(Range {
-            left,
-            operator,
-            right,
-        }))
-    }
-
-    pub fn glob_pattern(p: String) -> Expression {
-        Expression::Literal(Literal::GlobPattern(p))
-    }
-
-    pub fn file_path(file_path: PathBuf) -> Expression {
-        Expression::FilePath(file_path)
-    }
-
-    pub fn simple_column_path(members: Vec<Member>) -> Expression {
-        Expression::Literal(Literal::ColumnPath(members))
-    }
-
-    pub fn path(head: SpannedExpression, tail: Vec<impl Into<PathMember>>) -> Expression {
-        let tail = tail.into_iter().map(|t| t.into()).collect();
-        Expression::FullColumnPath(Box::new(FullColumnPath::new(head, tail)))
-    }
-
-    pub fn unit(i: Spanned<i64>, unit: Spanned<Unit>) -> Expression {
-        Expression::Literal(Literal::Size(
-            Number::BigInt(BigInt::from(i.item)).spanned(i.span),
-            unit,
-        ))
-    }
-
-    pub fn variable(v: String, span: Span) -> Expression {
-        Expression::Variable(v, span)
-    }
-
-    pub fn boolean(b: bool) -> Expression {
-        Expression::Boolean(b)
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        match self {
-            Expression::Variable(name, _) if name == var_name => true,
-            Expression::Table(headers, values) => {
-                headers.iter().any(|se| se.has_var_usage(var_name))
-                    || values
-                        .iter()
-                        .any(|v| v.iter().any(|se| se.has_var_usage(var_name)))
-            }
-            Expression::List(list) => list.iter().any(|se| se.has_var_usage(var_name)),
-            Expression::Subexpression(block) => block.has_var_usage(var_name),
-            Expression::Binary(binary) => {
-                binary.left.has_var_usage(var_name) || binary.right.has_var_usage(var_name)
-            }
-            Expression::FullColumnPath(path) => path.head.has_var_usage(var_name),
-            Expression::Range(range) => {
-                (if let Some(left) = &range.left {
-                    left.has_var_usage(var_name)
-                } else {
-                    false
-                }) || (if let Some(right) = &range.right {
-                    right.has_var_usage(var_name)
-                } else {
-                    false
-                })
-            }
-            _ => false,
-        }
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        let mut output = vec![];
-        match self {
-            Expression::Variable(name, _) => {
-                if !known_variables.contains(name) {
-                    output.push(name.clone());
-                }
-            }
-            Expression::Table(headers, values) => {
-                for header in headers {
-                    output.extend(header.get_free_variables(known_variables));
-                }
-                for row in values {
-                    for value in row {
-                        output.extend(value.get_free_variables(known_variables));
-                    }
-                }
-            }
-            Expression::List(list) => {
-                for item in list {
-                    output.extend(item.get_free_variables(known_variables));
-                }
-            }
-            Expression::Subexpression(block) | Expression::Block(block) => {
-                output.extend(block.get_free_variables(known_variables));
-            }
-            Expression::Binary(binary) => {
-                output.extend(binary.left.get_free_variables(known_variables));
-                output.extend(binary.right.get_free_variables(known_variables));
-            }
-            Expression::FullColumnPath(path) => {
-                output.extend(path.head.get_free_variables(known_variables));
-            }
-            Expression::Range(range) => {
-                if let Some(left) = &range.left {
-                    output.extend(left.get_free_variables(known_variables));
-                }
-                if let Some(right) = &range.right {
-                    output.extend(right.get_free_variables(known_variables));
-                }
-            }
-            _ => {}
-        }
-        output
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum NamedValue {
-    AbsentSwitch,
-    PresentSwitch(Span),
-    AbsentValue,
-    Value(Span, Box<SpannedExpression>),
-}
-
-impl NamedValue {
-    fn has_var_usage(&self, var_name: &str) -> bool {
-        if let NamedValue::Value(_, se) = self {
-            se.has_var_usage(var_name)
-        } else {
-            false
-        }
-    }
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        if let NamedValue::Value(_, se) = self {
-            se.get_free_variables(known_variables)
-        } else {
-            vec![]
-        }
-    }
-    pub fn get_contents(&self) -> Option<&SpannedExpression> {
-        match self {
-            NamedValue::Value(_, expr) => Some(expr),
-            _ => None,
-        }
-    }
-}
-
-impl PrettyDebugWithSource for NamedValue {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            NamedValue::AbsentSwitch => {
-                DbgDocBldr::typed("switch", DbgDocBldr::description("absent"))
-            }
-            NamedValue::PresentSwitch(_) => {
-                DbgDocBldr::typed("switch", DbgDocBldr::description("present"))
-            }
-            NamedValue::AbsentValue => DbgDocBldr::description("absent"),
-            NamedValue::Value(_, value) => value.pretty_debug(source),
-        }
-    }
-
-    fn refined_pretty_debug(&self, refine: PrettyDebugRefineKind, source: &str) -> DebugDocBuilder {
-        match refine {
-            PrettyDebugRefineKind::ContextFree => self.pretty_debug(source),
-            PrettyDebugRefineKind::WithContext => match self {
-                NamedValue::AbsentSwitch => DbgDocBldr::value("absent"),
-                NamedValue::PresentSwitch(_) => DbgDocBldr::value("present"),
-                NamedValue::AbsentValue => DbgDocBldr::value("absent"),
-                NamedValue::Value(_, value) => value.refined_pretty_debug(refine, source),
-            },
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum ExternalRedirection {
-    None,
-    Stdout,
-    Stderr,
-    StdoutAndStderr,
-}
-
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub struct Call {
-    pub head: Box<SpannedExpression>,
-    pub positional: Option<Vec<SpannedExpression>>,
-    pub named: Option<NamedArguments>,
-    pub span: Span,
-    pub external_redirection: ExternalRedirection,
-}
-
-impl Call {
-    pub fn switch_preset(&self, switch: &str) -> bool {
-        self.named
-            .as_ref()
-            .map(|n| n.switch_present(switch))
-            .unwrap_or(false)
-    }
-
-    pub fn get_flag(&self, switch: &str) -> Option<&SpannedExpression> {
-        self.named
-            .as_ref()
-            .and_then(|n| n.get(switch))
-            .and_then(|x| x.get_contents())
-    }
-
-    pub fn set_initial_flags(&mut self, signature: &crate::Signature) {
-        for (named, value) in &signature.named {
-            if self.named.is_none() {
-                self.named = Some(NamedArguments::new());
-            }
-
-            if let Some(ref mut args) = self.named {
-                match value.0 {
-                    crate::NamedType::Switch(_) => args.insert_switch(named, None),
-                    _ => args.insert_optional(named, Span::new(0, 0), None),
-                }
-            }
-        }
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.head.has_var_usage(var_name)
-            || (if let Some(pos) = &self.positional {
-                pos.iter().any(|x| x.has_var_usage(var_name))
-            } else {
-                false
-            })
-            || (if let Some(named) = &self.named {
-                named.has_var_usage(var_name)
-            } else {
-                false
-            })
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        let mut free_variables = vec![];
-
-        free_variables.extend(self.head.get_free_variables(known_variables));
-        if let Some(pos) = &self.positional {
-            for pos in pos {
-                free_variables.extend(pos.get_free_variables(known_variables));
-            }
-        }
-
-        if let Some(named) = &self.named {
-            free_variables.extend(named.get_free_variables(known_variables));
-        }
-
-        free_variables
-    }
-}
-
-impl PrettyDebugWithSource for Call {
-    fn refined_pretty_debug(&self, refine: PrettyDebugRefineKind, source: &str) -> DebugDocBuilder {
-        match refine {
-            PrettyDebugRefineKind::ContextFree => self.pretty_debug(source),
-            PrettyDebugRefineKind::WithContext => {
-                self.head
-                    .refined_pretty_debug(PrettyDebugRefineKind::WithContext, source)
-                    + DbgDocBldr::preceded_option(
-                        Some(DbgDocBldr::space()),
-                        self.positional.as_ref().map(|pos| {
-                            DbgDocBldr::intersperse(
-                                pos.iter().map(|expr| {
-                                    expr.refined_pretty_debug(
-                                        PrettyDebugRefineKind::WithContext,
-                                        source,
-                                    )
-                                }),
-                                DbgDocBldr::space(),
-                            )
-                        }),
-                    )
-                    + DbgDocBldr::preceded_option(
-                        Some(DbgDocBldr::space()),
-                        self.named.as_ref().map(|named| {
-                            named.refined_pretty_debug(PrettyDebugRefineKind::WithContext, source)
-                        }),
-                    )
-            }
-        }
-    }
-
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::typed(
-            "call",
-            self.refined_pretty_debug(PrettyDebugRefineKind::WithContext, source),
-        )
-    }
-}
-
-impl Call {
-    pub fn new(head: Box<SpannedExpression>, span: Span) -> Call {
-        Call {
-            head,
-            positional: None,
-            named: None,
-            span,
-            external_redirection: ExternalRedirection::Stdout,
-        }
-    }
-}
-
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-pub enum Delimiter {
-    Paren,
-    Brace,
-    Square,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum FlatShape {
-    BareMember,
-    CloseDelimiter(Delimiter),
-    Comment,
-    Decimal,
-    Dot,
-    DotDot,
-    DotDotLeftAngleBracket,
-    ExternalCommand,
-    ExternalWord,
-    Flag,
-    Garbage,
-    GlobPattern,
-    Identifier,
-    Int,
-    InternalCommand,
-    ItVariable,
-    Keyword,
-    OpenDelimiter(Delimiter),
-    Operator,
-    Path,
-    Pipe,
-    Separator,
-    ShorthandFlag,
-    Size { number: Span, unit: Span },
-    String,
-    StringMember,
-    Type,
-    Variable,
-    Whitespace,
-    Word,
-}
-
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct NamedArguments {
-    pub named: IndexMap<String, NamedValue>,
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl Hash for NamedArguments {
-    /// Create the hash function to allow the Hash trait for dictionaries
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let mut entries = self.named.clone();
-        entries.sort_keys();
-        entries.keys().collect::<Vec<&String>>().hash(state);
-        entries.values().collect::<Vec<&NamedValue>>().hash(state);
-    }
-}
-
-impl PartialOrd for NamedArguments {
-    /// Compare two dictionaries for sort ordering
-    fn partial_cmp(&self, other: &NamedArguments) -> Option<Ordering> {
-        let this: Vec<&String> = self.named.keys().collect();
-        let that: Vec<&String> = other.named.keys().collect();
-
-        if this != that {
-            return this.partial_cmp(&that);
-        }
-
-        let this: Vec<&NamedValue> = self.named.values().collect();
-        let that: Vec<&NamedValue> = other.named.values().collect();
-
-        this.partial_cmp(&that)
-    }
-}
-
-impl Ord for NamedArguments {
-    /// Compare two dictionaries for ordering
-    fn cmp(&self, other: &NamedArguments) -> Ordering {
-        let this: Vec<&String> = self.named.keys().collect();
-        let that: Vec<&String> = other.named.keys().collect();
-
-        if this != that {
-            return this.cmp(&that);
-        }
-
-        let this: Vec<&NamedValue> = self.named.values().collect();
-        let that: Vec<&NamedValue> = other.named.values().collect();
-
-        this.cmp(&that)
-    }
-}
-
-impl NamedArguments {
-    pub fn new() -> NamedArguments {
-        Default::default()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&String, &NamedValue)> {
-        self.named.iter()
-    }
-
-    pub fn get(&self, name: &str) -> Option<&NamedValue> {
-        self.named.get(name)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.named.is_empty()
-    }
-
-    pub fn has_var_usage(&self, var_name: &str) -> bool {
-        self.iter().any(|x| x.1.has_var_usage(var_name))
-    }
-
-    pub fn get_free_variables(&self, known_variables: &mut Vec<String>) -> Vec<String> {
-        let mut free_variables = vec![];
-        for (_, val) in &self.named {
-            free_variables.extend(val.get_free_variables(known_variables));
-        }
-        free_variables
-    }
-}
-
-impl NamedArguments {
-    pub fn insert_switch(&mut self, name: impl Into<String>, switch: Option<Flag>) {
-        let name = name.into();
-        trace!("Inserting switch -- {} = {:?}", name, switch);
-
-        match switch {
-            None => self.named.insert(name, NamedValue::AbsentSwitch),
-            Some(flag) => self
-                .named
-                .insert(name, NamedValue::PresentSwitch(flag.name)),
-        };
-    }
-
-    pub fn insert_optional(
-        &mut self,
-        name: impl Into<String>,
-        flag_span: Span,
-        expr: Option<SpannedExpression>,
-    ) {
-        match expr {
-            None => self.named.insert(name.into(), NamedValue::AbsentValue),
-            Some(expr) => self
-                .named
-                .insert(name.into(), NamedValue::Value(flag_span, Box::new(expr))),
-        };
-    }
-
-    pub fn insert_mandatory(
-        &mut self,
-        name: impl Into<String>,
-        flag_span: Span,
-        expr: SpannedExpression,
-    ) {
-        self.named
-            .insert(name.into(), NamedValue::Value(flag_span, Box::new(expr)));
-    }
-
-    pub fn switch_present(&self, switch: &str) -> bool {
-        self.named
-            .get(switch)
-            .map(|t| matches!(t, NamedValue::PresentSwitch(_)))
-            .unwrap_or(false)
-    }
-}
-
-impl PrettyDebugWithSource for NamedArguments {
-    fn refined_pretty_debug(&self, refine: PrettyDebugRefineKind, source: &str) -> DebugDocBuilder {
-        match refine {
-            PrettyDebugRefineKind::ContextFree => self.pretty_debug(source),
-            PrettyDebugRefineKind::WithContext => DbgDocBldr::intersperse(
-                self.named.iter().map(|(key, value)| {
-                    DbgDocBldr::key(key)
-                        + DbgDocBldr::equals()
-                        + value.refined_pretty_debug(PrettyDebugRefineKind::WithContext, source)
-                }),
-                DbgDocBldr::space(),
-            ),
-        }
-    }
-
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::delimit(
-            "(",
-            self.refined_pretty_debug(PrettyDebugRefineKind::WithContext, source),
-            ")",
-        )
-    }
-}
-
-impl<'a> IntoIterator for &'a NamedArguments {
-    type Item = (&'a String, &'a NamedValue);
-
-    type IntoIter = Iter<'a, String, NamedValue>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.named.iter()
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum FlagKind {
-    Shorthand,
-    Longhand,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, new)]
-pub struct Flag {
-    pub(crate) kind: FlagKind,
-    pub(crate) name: Span,
-}
-
-impl PrettyDebugWithSource for Flag {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        let prefix = match self.kind {
-            FlagKind::Longhand => DbgDocBldr::description("--"),
-            FlagKind::Shorthand => DbgDocBldr::description("-"),
-        };
-
-        prefix + DbgDocBldr::description(self.name.slice(source))
-    }
-}
-
-impl Flag {
-    pub fn color(&self, span: impl Into<Span>) -> Spanned<FlatShape> {
-        match self.kind {
-            FlagKind::Longhand => FlatShape::Flag.spanned(span.into()),
-            FlagKind::Shorthand => FlatShape::ShorthandFlag.spanned(span.into()),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/lib.rs b/old_nushell/crates/nu-protocol/src/lib.rs
deleted file mode 100644
index e9d734635..000000000
--- a/old_nushell/crates/nu-protocol/src/lib.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-#[macro_use]
-mod macros;
-
-mod call_info;
-pub mod config_path;
-pub mod hir;
-mod maybe_owned;
-mod registry;
-mod return_value;
-mod signature;
-mod syntax_shape;
-mod type_name;
-mod type_shape;
-pub mod value;
-
-#[cfg(feature = "dataframe")]
-pub mod dataframe;
-
-pub use crate::call_info::{CallInfo, EvaluatedArgs};
-pub use crate::config_path::ConfigPath;
-pub use crate::maybe_owned::MaybeOwned;
-pub use crate::registry::{SignatureRegistry, VariableRegistry};
-pub use crate::return_value::{CommandAction, ReturnSuccess, ReturnValue};
-pub use crate::signature::{NamedType, PositionalType, Signature};
-pub use crate::syntax_shape::SyntaxShape;
-pub use crate::type_name::{PrettyType, ShellTypeName, SpannedTypeName};
-pub use crate::type_shape::{Row as RowType, Type};
-pub use crate::value::column_path::{ColumnPath, PathMember, UnspannedPathMember};
-pub use crate::value::dict::{Dictionary, TaggedDictBuilder};
-pub use crate::value::did_you_mean::did_you_mean;
-pub use crate::value::primitive::Primitive;
-pub use crate::value::primitive::{format_date, format_duration, format_primitive};
-pub use crate::value::range::{Range, RangeInclusion};
-pub use crate::value::value_structure::{ValueResource, ValueStructure};
-pub use crate::value::{merge_descriptors, UntaggedValue, Value};
diff --git a/old_nushell/crates/nu-protocol/src/macros.rs b/old_nushell/crates/nu-protocol/src/macros.rs
deleted file mode 100644
index ef9a496c5..000000000
--- a/old_nushell/crates/nu-protocol/src/macros.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-/// Outputs to standard out
-///
-/// Note: this exists to differentiate between intentional writing to stdout
-/// and stray printlns left by accident
-#[macro_export]
-macro_rules! out {
-    ($($tokens:tt)*) => {
-        use std::io::Write;
-        write!(std::io::stdout(), $($tokens)*).unwrap_or(());
-        let _ = std::io::stdout().flush();
-    }
-}
-
-/// Outputs to standard out with a newline added
-///
-/// Note: this exists to differentiate between intentional writing to stdout
-/// and stray printlns left by accident
-#[macro_export]
-macro_rules! outln {
-    ($($tokens:tt)*) => {
-        {
-            use std::io::Write;
-            writeln!(std::io::stdout(), $($tokens)*).unwrap_or(())
-        }
-    }
-}
-
-/// Outputs to standard error
-///
-/// Note: this exists to differentiate between intentional writing to stdout
-/// and stray printlns left by accident
-#[macro_export]
-macro_rules! errln {
-    ($($tokens:tt)*) => {
-        {
-            use std::io::Write;
-            writeln!(std::io::stderr(), $($tokens)*).unwrap_or(())
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! row {
-    ($( $key: expr => $val: expr ),*) => {{
-         let mut map = ::indexmap::IndexMap::new();
-         $( map.insert($key, $val); )*
-         ::nu_protocol::UntaggedValue::row(map).into_untagged_value()
-    }}
-}
diff --git a/old_nushell/crates/nu-protocol/src/maybe_owned.rs b/old_nushell/crates/nu-protocol/src/maybe_owned.rs
deleted file mode 100644
index 10c57cb38..000000000
--- a/old_nushell/crates/nu-protocol/src/maybe_owned.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![allow(clippy::should_implement_trait)]
-
-/// Helper type to allow passing something that may potentially be owned, but could also be borrowed
-#[derive(Debug)]
-pub enum MaybeOwned<'a, T> {
-    Owned(T),
-    Borrowed(&'a T),
-}
-
-impl<T> MaybeOwned<'_, T> {
-    /// Allows the borrowing of an owned value or passes out the borrowed value
-    pub fn borrow(&self) -> &T {
-        match self {
-            MaybeOwned::Owned(v) => v,
-            MaybeOwned::Borrowed(v) => v,
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/registry.rs b/old_nushell/crates/nu-protocol/src/registry.rs
deleted file mode 100644
index f264d6943..000000000
--- a/old_nushell/crates/nu-protocol/src/registry.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::{Signature, Value};
-use nu_source::Spanned;
-use std::fmt::Debug;
-
-pub trait VariableRegistry {
-    fn get_variable(&self, name: &Spanned<&str>) -> Option<Value>;
-    fn variables(&self) -> Vec<String>;
-}
-
-pub trait SignatureRegistry: Debug {
-    fn names(&self) -> Vec<String>;
-    fn has(&self, name: &str) -> bool;
-    fn get(&self, name: &str) -> Option<Signature>;
-    fn clone_box(&self) -> Box<dyn SignatureRegistry>;
-}
-
-impl SignatureRegistry for Box<dyn SignatureRegistry> {
-    fn names(&self) -> Vec<String> {
-        (&**self).names()
-    }
-
-    fn has(&self, name: &str) -> bool {
-        (&**self).has(name)
-    }
-    fn get(&self, name: &str) -> Option<Signature> {
-        (&**self).get(name)
-    }
-    fn clone_box(&self) -> Box<dyn SignatureRegistry> {
-        (&**self).clone_box()
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/return_value.rs b/old_nushell/crates/nu-protocol/src/return_value.rs
deleted file mode 100644
index 34a80c54a..000000000
--- a/old_nushell/crates/nu-protocol/src/return_value.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use crate::{value::Value, ConfigPath};
-use nu_errors::ShellError;
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug};
-use serde::{Deserialize, Serialize};
-
-/// The inner set of actions for the command processor. Each denotes a way to change state in the processor without changing it directly from the command itself.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum CommandAction {
-    /// Change to a new directory or path (in non-filesystem situations)
-    ChangePath(String),
-    /// Exit out of Nu
-    Exit(i32),
-    /// Display an error
-    Error(ShellError),
-    /// Enter a new shell at the given path
-    EnterShell(String),
-    /// Convert the value given from one type to another
-    AutoConvert(Value, String),
-    /// Enter a value shell, one that allows exploring inside of a Value
-    EnterValueShell(Value),
-    /// Add plugins from path given
-    AddPlugins(String),
-    /// Unload the config specified by PathBuf if present
-    UnloadConfig(ConfigPath),
-    /// Load the config specified by PathBuf
-    LoadConfig(ConfigPath),
-    /// Go to the previous shell in the shell ring buffer
-    PreviousShell,
-    /// Go to the next shell in the shell ring buffer
-    NextShell,
-    /// Jump to the specified shell in the shell ring buffer
-    GotoShell(usize),
-    /// Leave the current shell. If it's the last shell, exit out of Nu
-    LeaveShell(i32),
-}
-
-impl PrettyDebug for CommandAction {
-    /// Get a command action ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            CommandAction::ChangePath(path) => {
-                DbgDocBldr::typed("change path", DbgDocBldr::description(path))
-            }
-            CommandAction::Exit(_) => DbgDocBldr::description("exit"),
-            CommandAction::Error(_) => DbgDocBldr::error("error"),
-            CommandAction::AutoConvert(_, extension) => {
-                DbgDocBldr::typed("auto convert", DbgDocBldr::description(extension))
-            }
-            CommandAction::EnterShell(s) => {
-                DbgDocBldr::typed("enter shell", DbgDocBldr::description(s))
-            }
-            CommandAction::EnterValueShell(v) => DbgDocBldr::typed("enter value shell", v.pretty()),
-            CommandAction::AddPlugins(..) => DbgDocBldr::description("add plugins"),
-            CommandAction::PreviousShell => DbgDocBldr::description("previous shell"),
-            CommandAction::NextShell => DbgDocBldr::description("next shell"),
-            CommandAction::GotoShell(_) => DbgDocBldr::description("goto shell"),
-            CommandAction::LeaveShell(_) => DbgDocBldr::description("leave shell"),
-            CommandAction::UnloadConfig(cfg) => {
-                DbgDocBldr::description(format!("unload config {:?}", cfg))
-            }
-            CommandAction::LoadConfig(cfg) => {
-                DbgDocBldr::description(format!("load config {:?}", cfg))
-            }
-        }
-    }
-}
-
-/// The fundamental success type in the pipeline. Commands return these values as their main responsibility
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum ReturnSuccess {
-    /// A value to be used or shown to the user
-    Value(Value),
-    /// A debug-enabled value to be used or shown to the user
-    DebugValue(Value),
-    /// An action to be performed as values pass out of the command. These are performed rather than passed to the next command in the pipeline
-    Action(CommandAction),
-}
-
-impl PrettyDebug for ReturnSuccess {
-    /// Get a return success ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            ReturnSuccess::Value(value) => DbgDocBldr::typed("value", value.pretty()),
-            ReturnSuccess::DebugValue(value) => DbgDocBldr::typed("debug value", value.pretty()),
-            ReturnSuccess::Action(action) => DbgDocBldr::typed("action", action.pretty()),
-        }
-    }
-}
-
-/// The core Result type for pipelines
-pub type ReturnValue = Result<ReturnSuccess, ShellError>;
-
-impl From<Value> for ReturnValue {
-    fn from(v: Value) -> Self {
-        Ok(ReturnSuccess::Value(v))
-    }
-}
-
-impl ReturnSuccess {
-    /// Get to the contained Value, if possible
-    pub fn raw_value(&self) -> Option<Value> {
-        match self {
-            ReturnSuccess::Value(raw) => Some(raw.clone()),
-            ReturnSuccess::DebugValue(raw) => Some(raw.clone()),
-            ReturnSuccess::Action(_) => None,
-        }
-    }
-
-    /// Helper function for an action to change the the path
-    pub fn change_cwd(path: String) -> ReturnValue {
-        Ok(ReturnSuccess::Action(CommandAction::ChangePath(path)))
-    }
-
-    /// Helper function to create simple values for returning
-    pub fn value(input: impl Into<Value>) -> ReturnValue {
-        Ok(ReturnSuccess::Value(input.into()))
-    }
-
-    /// Helper function to create simple debug-enabled values for returning
-    pub fn debug_value(input: impl Into<Value>) -> ReturnValue {
-        Ok(ReturnSuccess::DebugValue(input.into()))
-    }
-
-    /// Helper function for creating actions
-    pub fn action(input: CommandAction) -> ReturnValue {
-        Ok(ReturnSuccess::Action(input))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{ReturnSuccess, ReturnValue, UntaggedValue};
-
-    #[test]
-    fn return_value_can_be_used_in_assert_eq() {
-        let v1: ReturnValue = ReturnSuccess::value(UntaggedValue::nothing());
-        let v2: ReturnValue = ReturnSuccess::value(UntaggedValue::nothing());
-        assert_eq!(v1, v2);
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/signature.rs b/old_nushell/crates/nu-protocol/src/signature.rs
deleted file mode 100644
index 196993124..000000000
--- a/old_nushell/crates/nu-protocol/src/signature.rs
+++ /dev/null
@@ -1,383 +0,0 @@
-use crate::syntax_shape::SyntaxShape;
-use crate::type_shape::Type;
-use indexmap::IndexMap;
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug, PrettyDebugWithSource};
-use serde::{Deserialize, Serialize};
-
-/// The types of named parameter that a command can have
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
-pub enum NamedType {
-    /// A flag without any associated argument. eg) `foo --bar, foo -b`
-    Switch(Option<char>),
-    /// A mandatory flag, with associated argument. eg) `foo --required xyz, foo -r xyz`
-    Mandatory(Option<char>, SyntaxShape),
-    /// An optional flag, with associated argument. eg) `foo --optional abc, foo -o abc`
-    Optional(Option<char>, SyntaxShape),
-}
-
-impl NamedType {
-    pub fn get_short(&self) -> Option<char> {
-        match self {
-            NamedType::Switch(s) => *s,
-            NamedType::Mandatory(s, _) => *s,
-            NamedType::Optional(s, _) => *s,
-        }
-    }
-
-    pub fn get_type_description(&self) -> (String, String, String) {
-        let empty_string = ("".to_string(), "".to_string(), "".to_string());
-        match self {
-            NamedType::Switch(f) => match f {
-                Some(flag) => ("switch_flag".to_string(), flag.to_string(), "".to_string()),
-                None => empty_string,
-            },
-            NamedType::Mandatory(f, shape) => match f {
-                Some(flag) => (
-                    "mandatory_flag".to_string(),
-                    flag.to_string(),
-                    shape.syntax_shape_name().to_string(),
-                ),
-                None => empty_string,
-            },
-            NamedType::Optional(f, shape) => match f {
-                Some(flag) => (
-                    "optional_flag".to_string(),
-                    flag.to_string(),
-                    shape.syntax_shape_name().to_string(),
-                ),
-                None => empty_string,
-            },
-        }
-    }
-}
-
-/// The type of positional arguments
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub enum PositionalType {
-    /// A mandatory positional argument with the expected shape of the value
-    Mandatory(String, SyntaxShape),
-    /// An optional positional argument with the expected shape of the value
-    Optional(String, SyntaxShape),
-}
-
-impl PrettyDebug for PositionalType {
-    /// Prepare the PositionalType for pretty-printing
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            PositionalType::Mandatory(string, shape) => {
-                DbgDocBldr::description(string)
-                    + DbgDocBldr::delimit("(", shape.pretty(), ")")
-                        .into_kind()
-                        .group()
-            }
-            PositionalType::Optional(string, shape) => {
-                DbgDocBldr::description(string)
-                    + DbgDocBldr::operator("?")
-                    + DbgDocBldr::delimit("(", shape.pretty(), ")")
-                        .into_kind()
-                        .group()
-            }
-        }
-    }
-}
-
-impl PositionalType {
-    /// Helper to create a mandatory positional argument type
-    pub fn mandatory(name: &str, ty: SyntaxShape) -> PositionalType {
-        PositionalType::Mandatory(name.to_string(), ty)
-    }
-
-    /// Helper to create a mandatory positional argument with an "any" type
-    pub fn mandatory_any(name: &str) -> PositionalType {
-        PositionalType::Mandatory(name.to_string(), SyntaxShape::Any)
-    }
-
-    /// Helper to create a mandatory positional argument with a block type
-    pub fn mandatory_block(name: &str) -> PositionalType {
-        PositionalType::Mandatory(name.to_string(), SyntaxShape::Block)
-    }
-
-    /// Helper to create a optional positional argument type
-    pub fn optional(name: &str, ty: SyntaxShape) -> PositionalType {
-        PositionalType::Optional(name.to_string(), ty)
-    }
-
-    /// Helper to create a optional positional argument with an "any" type
-    pub fn optional_any(name: &str) -> PositionalType {
-        PositionalType::Optional(name.to_string(), SyntaxShape::Any)
-    }
-
-    /// Gets the name of the positional argument
-    pub fn name(&self) -> &str {
-        match self {
-            PositionalType::Mandatory(s, _) => s,
-            PositionalType::Optional(s, _) => s,
-        }
-    }
-
-    /// Gets the expected type of a positional argument
-    pub fn syntax_type(&self) -> SyntaxShape {
-        match *self {
-            PositionalType::Mandatory(_, t) => t,
-            PositionalType::Optional(_, t) => t,
-        }
-    }
-
-    pub fn get_type_description(&self) -> (String, String) {
-        match &self {
-            PositionalType::Mandatory(c, s) => (c.to_string(), s.syntax_shape_name().to_string()),
-            PositionalType::Optional(c, s) => (c.to_string(), s.syntax_shape_name().to_string()),
-        }
-    }
-}
-
-type Description = String;
-
-/// The full signature of a command. All commands have a signature similar to a function signature.
-/// Commands will use this information to register themselves with Nu's core engine so that the command
-/// can be invoked, help can be displayed, and calls to the command can be error-checked.
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct Signature {
-    /// The name of the command. Used when calling the command
-    pub name: String,
-    /// Usage instructions about the command
-    pub usage: String,
-    /// Longer or more verbose usage statement
-    pub extra_usage: String,
-    /// The list of positional arguments, both required and optional, and their corresponding types and help text
-    pub positional: Vec<(PositionalType, Description)>,
-    /// After the positional arguments, a catch-all for the rest of the arguments that might follow, their type, and help text
-    pub rest_positional: Option<(String, SyntaxShape, Description)>,
-    /// The named flags with corresponding type and help text
-    pub named: IndexMap<String, (NamedType, Description)>,
-    /// The type of values being sent out from the command into the pipeline, if any
-    pub yields: Option<Type>,
-    /// The type of values being read in from the pipeline into the command, if any
-    pub input: Option<Type>,
-    /// If the command is expected to filter data, or to consume it (as a sink)
-    pub is_filter: bool,
-}
-
-impl PartialEq for Signature {
-    fn eq(&self, other: &Self) -> bool {
-        self.name == other.name
-            && self.usage == other.usage
-            && self.positional == other.positional
-            && self.rest_positional == other.rest_positional
-            && self.is_filter == other.is_filter
-    }
-}
-
-impl Eq for Signature {}
-
-impl Signature {
-    pub fn shift_positional(&mut self) {
-        self.positional = Vec::from(&self.positional[1..]);
-    }
-
-    pub fn remove_named(&mut self, name: &str) {
-        self.named.remove(name);
-    }
-
-    pub fn allowed(&self) -> Vec<String> {
-        let mut allowed = indexmap::IndexSet::new();
-
-        for (name, (t, _)) in &self.named {
-            if let Some(c) = t.get_short() {
-                allowed.insert(format!("-{}", c));
-            }
-            allowed.insert(format!("--{}", name));
-        }
-
-        for (ty, _) in &self.positional {
-            let shape = ty.syntax_type();
-            allowed.insert(shape.display());
-        }
-
-        if let Some((_, shape, _)) = &self.rest_positional {
-            allowed.insert(shape.display());
-        }
-
-        allowed.into_iter().collect()
-    }
-}
-
-impl PrettyDebugWithSource for Signature {
-    /// Prepare a Signature for pretty-printing
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::typed(
-            "signature",
-            DbgDocBldr::description(&self.name)
-                + DbgDocBldr::preceded(
-                    DbgDocBldr::space(),
-                    DbgDocBldr::intersperse(
-                        self.positional
-                            .iter()
-                            .map(|(ty, _)| ty.pretty_debug(source)),
-                        DbgDocBldr::space(),
-                    ),
-                ),
-        )
-    }
-}
-
-impl Signature {
-    /// Create a new command signature with the given name
-    pub fn new(name: impl Into<String>) -> Signature {
-        Signature {
-            name: name.into(),
-            usage: String::new(),
-            extra_usage: String::new(),
-            positional: vec![],
-            rest_positional: None,
-            named: indexmap::indexmap! {"help".into() => (NamedType::Switch(Some('h')), "Display this help message".into())},
-            is_filter: false,
-            yields: None,
-            input: None,
-        }
-    }
-
-    /// Create a new signature
-    pub fn build(name: impl Into<String>) -> Signature {
-        Signature::new(name.into())
-    }
-
-    /// Add a description to the signature
-    pub fn desc(mut self, usage: impl Into<String>) -> Signature {
-        self.usage = usage.into();
-        self
-    }
-
-    /// Add a required positional argument to the signature
-    pub fn required(
-        mut self,
-        name: impl Into<String>,
-        ty: impl Into<SyntaxShape>,
-        desc: impl Into<String>,
-    ) -> Signature {
-        self.positional.push((
-            PositionalType::Mandatory(name.into(), ty.into()),
-            desc.into(),
-        ));
-
-        self
-    }
-
-    /// Add an optional positional argument to the signature
-    pub fn optional(
-        mut self,
-        name: impl Into<String>,
-        ty: impl Into<SyntaxShape>,
-        desc: impl Into<String>,
-    ) -> Signature {
-        self.positional.push((
-            PositionalType::Optional(name.into(), ty.into()),
-            desc.into(),
-        ));
-
-        self
-    }
-
-    /// Add an optional named flag argument to the signature
-    pub fn named(
-        mut self,
-        name: impl Into<String>,
-        ty: impl Into<SyntaxShape>,
-        desc: impl Into<String>,
-        short: Option<char>,
-    ) -> Signature {
-        let s = short.map(|c| {
-            debug_assert!(!self.get_shorts().contains(&c));
-            c
-        });
-        self.named.insert(
-            name.into(),
-            (NamedType::Optional(s, ty.into()), desc.into()),
-        );
-
-        self
-    }
-
-    /// Add a required named flag argument to the signature
-    pub fn required_named(
-        mut self,
-        name: impl Into<String>,
-        ty: impl Into<SyntaxShape>,
-        desc: impl Into<String>,
-        short: Option<char>,
-    ) -> Signature {
-        let s = short.map(|c| {
-            debug_assert!(!self.get_shorts().contains(&c));
-            c
-        });
-
-        self.named.insert(
-            name.into(),
-            (NamedType::Mandatory(s, ty.into()), desc.into()),
-        );
-
-        self
-    }
-
-    /// Add a switch to the signature
-    pub fn switch(
-        mut self,
-        name: impl Into<String>,
-        desc: impl Into<String>,
-        short: Option<char>,
-    ) -> Signature {
-        let s = short.map(|c| {
-            debug_assert!(
-                !self.get_shorts().contains(&c),
-                "There may be duplicate short flags, such as -h"
-            );
-            c
-        });
-
-        self.named
-            .insert(name.into(), (NamedType::Switch(s), desc.into()));
-        self
-    }
-
-    /// Set the filter flag for the signature
-    pub fn filter(mut self) -> Signature {
-        self.is_filter = true;
-        self
-    }
-
-    /// Set the type for the "rest" of the positional arguments
-    /// Note: Not naming the field in your struct holding the rest values "rest", can
-    /// cause errors when deserializing
-    pub fn rest(
-        mut self,
-        name: impl Into<String>,
-        ty: SyntaxShape,
-        desc: impl Into<String>,
-    ) -> Signature {
-        self.rest_positional = Some((name.into(), ty, desc.into()));
-        self
-    }
-
-    /// Add a type for the output of the command to the signature
-    pub fn yields(mut self, ty: Type) -> Signature {
-        self.yields = Some(ty);
-        self
-    }
-
-    /// Add a type for the input of the command to the signature
-    pub fn input(mut self, ty: Type) -> Signature {
-        self.input = Some(ty);
-        self
-    }
-
-    /// Get list of the short-hand flags
-    pub fn get_shorts(&self) -> Vec<char> {
-        let mut shorts = Vec::new();
-        for (_, (t, _)) in &self.named {
-            if let Some(c) = t.get_short() {
-                shorts.push(c);
-            }
-        }
-        shorts
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/syntax_shape.rs b/old_nushell/crates/nu-protocol/src/syntax_shape.rs
deleted file mode 100644
index 0cea4011b..000000000
--- a/old_nushell/crates/nu-protocol/src/syntax_shape.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug};
-use serde::{Deserialize, Serialize};
-
-/// The syntactic shapes that values must match to be passed into a command. You can think of this as the type-checking that occurs when you call a function.
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
-pub enum SyntaxShape {
-    /// Any syntactic form is allowed
-    Any,
-    /// Strings and string-like bare words are allowed
-    String,
-    /// A dotted path to navigate the table
-    ColumnPath,
-    /// A dotted path to navigate the table (including variable)
-    FullColumnPath,
-    /// Only a numeric (integer or decimal) value is allowed
-    Number,
-    /// A range is allowed (eg, `1..3`)
-    Range,
-    /// Only an integer value is allowed
-    Int,
-    /// A filepath is allowed
-    FilePath,
-    /// A glob pattern is allowed, eg `foo*`
-    GlobPattern,
-    /// A block is allowed, eg `{start this thing}`
-    Block,
-    /// A table is allowed, eg `[first second]`
-    Table,
-    /// A filesize value is allowed, eg `10kb`
-    Filesize,
-    /// A duration value is allowed, eg `19day`
-    Duration,
-    /// An operator
-    Operator,
-    /// A math expression which expands shorthand forms on the lefthand side, eg `foo > 1`
-    /// The shorthand allows us to more easily reach columns inside of the row being passed in
-    RowCondition,
-    /// A general math expression, eg the `1 + 2` of `= 1 + 2`
-    MathExpression,
-}
-
-impl SyntaxShape {
-    pub fn syntax_shape_name(&self) -> &str {
-        match self {
-            SyntaxShape::Any => "any",
-            SyntaxShape::String => "string",
-            SyntaxShape::FullColumnPath => "column path (with variable)",
-            SyntaxShape::ColumnPath => "column path",
-            SyntaxShape::Number => "number",
-            SyntaxShape::Range => "range",
-            SyntaxShape::Int => "integer",
-            SyntaxShape::FilePath => "file path",
-            SyntaxShape::GlobPattern => "pattern",
-            SyntaxShape::Block => "block",
-            SyntaxShape::Table => "table",
-            SyntaxShape::Duration => "duration",
-            SyntaxShape::Filesize => "filesize",
-            SyntaxShape::Operator => "operator",
-            SyntaxShape::RowCondition => "condition",
-            SyntaxShape::MathExpression => "math expression",
-        }
-    }
-}
-
-impl PrettyDebug for SyntaxShape {
-    /// Prepare SyntaxShape for pretty-printing
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::kind(self.syntax_shape_name().to_string())
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/type_name.rs b/old_nushell/crates/nu-protocol/src/type_name.rs
deleted file mode 100644
index 0020e6815..000000000
--- a/old_nushell/crates/nu-protocol/src/type_name.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use nu_source::{DebugDocBuilder, HasSpan, Spanned, SpannedItem, Tagged};
-
-/// A trait that allows structures to define a known .type_name() which pretty-prints the type
-pub trait ShellTypeName {
-    fn type_name(&self) -> &'static str;
-}
-
-impl<T: ShellTypeName> ShellTypeName for Spanned<T> {
-    /// Return the type_name of the spanned item
-    fn type_name(&self) -> &'static str {
-        self.item.type_name()
-    }
-}
-
-impl<T: ShellTypeName> ShellTypeName for &T {
-    /// Return the type_name for the borrowed reference
-    fn type_name(&self) -> &'static str {
-        (*self).type_name()
-    }
-}
-
-/// A trait that allows structures to define a known way to return a spanned type name
-pub trait SpannedTypeName {
-    fn spanned_type_name(&self) -> Spanned<&'static str>;
-}
-
-impl<T: ShellTypeName + HasSpan> SpannedTypeName for T {
-    /// Return the type name as a spanned string
-    fn spanned_type_name(&self) -> Spanned<&'static str> {
-        self.type_name().spanned(self.span())
-    }
-}
-
-impl<T: ShellTypeName> SpannedTypeName for Tagged<T> {
-    /// Return the spanned type name for a Tagged value
-    fn spanned_type_name(&self) -> Spanned<&'static str> {
-        self.item.type_name().spanned(self.tag.span)
-    }
-}
-
-/// A trait to enable pretty-printing of type information
-pub trait PrettyType {
-    fn pretty_type(&self) -> DebugDocBuilder;
-}
diff --git a/old_nushell/crates/nu-protocol/src/type_shape.rs b/old_nushell/crates/nu-protocol/src/type_shape.rs
deleted file mode 100644
index 3f4eaa60d..000000000
--- a/old_nushell/crates/nu-protocol/src/type_shape.rs
+++ /dev/null
@@ -1,426 +0,0 @@
-///
-/// This file describes the structural types of the nushell system.
-///
-/// Its primary purpose today is to identify "equivalent" values for the purpose
-/// of merging rows into a single table or identify rows in a table that have the
-/// same shape for reflection.
-use crate::value::dict::Dictionary;
-use crate::value::primitive::Primitive;
-use crate::value::range::RangeInclusion;
-use crate::value::{UntaggedValue, Value};
-use derive_new::new;
-use indexmap::map::IndexMap;
-use nu_source::{DbgDocBldr, DebugDoc, DebugDocBuilder, PrettyDebug};
-use serde::{Deserialize, Serialize};
-use std::cmp::Ordering;
-use std::fmt::Debug;
-use std::hash::{Hash, Hasher};
-
-/// Representation of the type of ranges
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize, new)]
-pub struct RangeType {
-    from: (Type, RangeInclusion),
-    to: (Type, RangeInclusion),
-}
-
-/// Representation of for the type of a value in Nu
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
-pub enum Type {
-    /// A value which has no value
-    Nothing,
-    /// An integer-based value
-    Int,
-    /// An big integer-based value
-    BigInt,
-    /// A range between two values
-    Range(Box<RangeType>),
-    /// A decimal (floating point) value
-    Decimal,
-    /// A filesize in bytes
-    Filesize,
-    /// A string of text
-    String,
-    /// A line of text (a string with trailing line ending)
-    Line,
-    /// A path through a table
-    ColumnPath,
-    /// A glob pattern (like foo*)
-    GlobPattern,
-    /// A boolean value
-    Boolean,
-    /// A date value (in UTC)
-    Date,
-    /// A data duration value
-    Duration,
-    /// A filepath value
-    FilePath,
-    /// A binary (non-text) buffer value
-    Binary,
-
-    /// A row of data
-    Row(Row),
-    /// A full table of data
-    Table(Vec<Type>),
-
-    /// A block of script (TODO)
-    Block,
-    /// An error value (TODO)
-    Error,
-
-    /// Beginning of stream marker (used as bookend markers rather than actual values)
-    BeginningOfStream,
-    /// End of stream marker (used as bookend markers rather than actual values)
-    EndOfStream,
-
-    /// Dataframe
-    #[cfg(feature = "dataframe")]
-    DataFrame,
-
-    /// Dataframe
-    #[cfg(feature = "dataframe")]
-    FrameStruct,
-}
-
-/// A shape representation of the type of a row
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Row {
-    map: IndexMap<Column, Type>,
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl Hash for Row {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let mut entries = self.map.clone();
-        entries.sort_keys();
-        entries.keys().collect::<Vec<&Column>>().hash(state);
-        entries.values().collect::<Vec<&Type>>().hash(state);
-    }
-}
-
-impl PartialOrd for Row {
-    /// Compare two dictionaries for sort ordering
-    fn partial_cmp(&self, other: &Row) -> Option<Ordering> {
-        let this: Vec<&Column> = self.map.keys().collect();
-        let that: Vec<&Column> = other.map.keys().collect();
-
-        if this != that {
-            return this.partial_cmp(&that);
-        }
-
-        let this: Vec<&Type> = self.map.values().collect();
-        let that: Vec<&Type> = self.map.values().collect();
-
-        this.partial_cmp(&that)
-    }
-}
-
-impl Ord for Row {
-    /// Compare two dictionaries for ordering
-    fn cmp(&self, other: &Row) -> Ordering {
-        let this: Vec<&Column> = self.map.keys().collect();
-        let that: Vec<&Column> = other.map.keys().collect();
-
-        if this != that {
-            return this.cmp(&that);
-        }
-
-        let this: Vec<&Type> = self.map.values().collect();
-        let that: Vec<&Type> = self.map.values().collect();
-
-        this.cmp(&that)
-    }
-}
-
-impl Type {
-    /// Convert a Primitive into its corresponding Type
-    pub fn from_primitive(primitive: &Primitive) -> Type {
-        match primitive {
-            Primitive::Nothing => Type::Nothing,
-            Primitive::Int(_) => Type::Int,
-            Primitive::BigInt(_) => Type::BigInt,
-            Primitive::Range(range) => {
-                let (left_value, left_inclusion) = &range.from;
-                let (right_value, right_inclusion) = &range.to;
-
-                let left_type = (Type::from_primitive(left_value), *left_inclusion);
-                let right_type = (Type::from_primitive(right_value), *right_inclusion);
-
-                let range = RangeType::new(left_type, right_type);
-                Type::Range(Box::new(range))
-            }
-            Primitive::Decimal(_) => Type::Decimal,
-            Primitive::Filesize(_) => Type::Filesize,
-            Primitive::String(_) => Type::String,
-            Primitive::ColumnPath(_) => Type::ColumnPath,
-            Primitive::GlobPattern(_) => Type::GlobPattern,
-            Primitive::Boolean(_) => Type::Boolean,
-            Primitive::Date(_) => Type::Date,
-            Primitive::Duration(_) => Type::Duration,
-            Primitive::FilePath(_) => Type::FilePath,
-            Primitive::Binary(_) => Type::Binary,
-            Primitive::BeginningOfStream => Type::BeginningOfStream,
-            Primitive::EndOfStream => Type::EndOfStream,
-        }
-    }
-
-    /// Convert a dictionary into its corresponding row Type
-    pub fn from_dictionary(dictionary: &Dictionary) -> Type {
-        let mut map = IndexMap::new();
-
-        for (key, value) in &dictionary.entries {
-            let column = Column::String(key.clone());
-            map.insert(column, Type::from_value(value));
-        }
-
-        Type::Row(Row { map })
-    }
-
-    /// Convert a table into its corresponding Type
-    pub fn from_table<'a>(table: impl IntoIterator<Item = &'a Value>) -> Type {
-        let mut vec = vec![];
-
-        for item in table {
-            vec.push(Type::from_value(item))
-        }
-
-        Type::Table(vec)
-    }
-
-    /// Convert a value into its corresponding Type
-    pub fn from_value<'a>(value: impl Into<&'a UntaggedValue>) -> Type {
-        match value.into() {
-            UntaggedValue::Primitive(p) => Type::from_primitive(p),
-            UntaggedValue::Row(row) => Type::from_dictionary(row),
-            UntaggedValue::Table(table) => Type::from_table(table),
-            UntaggedValue::Error(_) => Type::Error,
-            UntaggedValue::Block(_) => Type::Block,
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::DataFrame(_) => Type::DataFrame,
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::FrameStruct(_) => Type::DataFrame,
-        }
-    }
-}
-
-impl PrettyDebug for Type {
-    /// Prepare Type for pretty-printing
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            Type::Nothing => ty("nothing"),
-            Type::Int => ty("integer"),
-            Type::BigInt => ty("big integer"),
-            Type::Range(range) => {
-                let (left, left_inclusion) = &range.from;
-                let (right, right_inclusion) = &range.to;
-
-                let left_bracket = DbgDocBldr::delimiter(match left_inclusion {
-                    RangeInclusion::Exclusive => "(",
-                    RangeInclusion::Inclusive => "[",
-                });
-
-                let right_bracket = DbgDocBldr::delimiter(match right_inclusion {
-                    RangeInclusion::Exclusive => ")",
-                    RangeInclusion::Inclusive => "]",
-                });
-
-                DbgDocBldr::typed(
-                    "range",
-                    (left_bracket
-                        + left.pretty()
-                        + DbgDocBldr::operator(",")
-                        + DbgDocBldr::space()
-                        + right.pretty()
-                        + right_bracket)
-                        .group(),
-                )
-            }
-            Type::Decimal => ty("decimal"),
-            Type::Filesize => ty("filesize"),
-            Type::String => ty("string"),
-            Type::Line => ty("line"),
-            Type::ColumnPath => ty("column-path"),
-            Type::GlobPattern => ty("pattern"),
-            Type::Boolean => ty("boolean"),
-            Type::Date => ty("date"),
-            Type::Duration => ty("duration"),
-            Type::FilePath => ty("path"),
-            Type::Binary => ty("binary"),
-            Type::Error => DbgDocBldr::error("error"),
-            Type::BeginningOfStream => DbgDocBldr::keyword("beginning-of-stream"),
-            Type::EndOfStream => DbgDocBldr::keyword("end-of-stream"),
-            Type::Row(row) => (DbgDocBldr::kind("row")
-                + DbgDocBldr::space()
-                + DbgDocBldr::intersperse(
-                    row.map.iter().map(|(key, ty)| {
-                        (DbgDocBldr::key(match key {
-                            Column::String(string) => string.clone(),
-                            Column::Value => "".to_string(),
-                        }) + DbgDocBldr::delimit("(", ty.pretty(), ")").into_kind())
-                        .nest()
-                    }),
-                    DbgDocBldr::space(),
-                )
-                .nest())
-            .nest(),
-
-            Type::Table(table) => {
-                let mut group: Group<DebugDoc, Vec<(usize, usize)>> = Group::new();
-
-                for (i, item) in table.iter().enumerate() {
-                    group.add(item.to_doc(), i);
-                }
-
-                (DbgDocBldr::kind("table") + DbgDocBldr::space() + DbgDocBldr::keyword("of"))
-                    .group()
-                    + DbgDocBldr::space()
-                    + (if group.len() == 1 {
-                        let (doc, _) = group.into_iter().collect::<Vec<_>>()[0].clone();
-                        DebugDocBuilder::from_doc(doc)
-                    } else {
-                        DbgDocBldr::intersperse(
-                            group.into_iter().map(|(doc, rows)| {
-                                (DbgDocBldr::intersperse(
-                                    rows.iter().map(|(from, to)| {
-                                        if from == to {
-                                            DbgDocBldr::description(from)
-                                        } else {
-                                            (DbgDocBldr::description(from)
-                                                + DbgDocBldr::space()
-                                                + DbgDocBldr::keyword("to")
-                                                + DbgDocBldr::space()
-                                                + DbgDocBldr::description(to))
-                                            .group()
-                                        }
-                                    }),
-                                    DbgDocBldr::description(", "),
-                                ) + DbgDocBldr::description(":")
-                                    + DbgDocBldr::space()
-                                    + DebugDocBuilder::from_doc(doc))
-                                .nest()
-                            }),
-                            DbgDocBldr::space(),
-                        )
-                    })
-            }
-            Type::Block => ty("block"),
-            #[cfg(feature = "dataframe")]
-            Type::DataFrame | Type::FrameStruct => ty("data_type_formatter"),
-        }
-    }
-}
-
-/// A view into dictionaries for debug purposes
-#[derive(Debug, new)]
-struct DebugEntry<'a> {
-    key: &'a Column,
-    value: &'a Type,
-}
-
-impl<'a> PrettyDebug for DebugEntry<'a> {
-    /// Prepare debug entries for pretty-printing
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::key(match self.key {
-            Column::String(string) => string.clone(),
-            Column::Value => "".to_string(),
-        }) + DbgDocBldr::delimit("(", self.value.pretty(), ")").into_kind()
-    }
-}
-
-/// Helper to create a pretty-print for the type
-fn ty(name: impl std::fmt::Display) -> DebugDocBuilder {
-    DbgDocBldr::kind(name)
-}
-
-pub trait GroupedValue: Debug + Clone {
-    type Item;
-
-    fn new() -> Self;
-    fn merge(&mut self, value: Self::Item);
-}
-
-impl GroupedValue for Vec<(usize, usize)> {
-    type Item = usize;
-
-    fn new() -> Vec<(usize, usize)> {
-        vec![]
-    }
-
-    fn merge(&mut self, new_value: usize) {
-        match self.last_mut() {
-            Some(value) if value.1 == new_value - 1 => {
-                value.1 += 1;
-            }
-
-            _ => self.push((new_value, new_value)),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Group<K: Debug + Eq + Hash, V: GroupedValue> {
-    values: indexmap::IndexMap<K, V>,
-}
-
-impl<K, G> Group<K, G>
-where
-    K: Debug + Eq + Hash,
-    G: GroupedValue,
-{
-    pub fn new() -> Group<K, G> {
-        Group {
-            values: indexmap::IndexMap::default(),
-        }
-    }
-
-    pub fn len(&self) -> usize {
-        self.values.len()
-    }
-
-    pub fn into_iter(self) -> impl Iterator<Item = (K, G)> {
-        self.values.into_iter()
-    }
-
-    pub fn add(&mut self, key: impl Into<K>, value: impl Into<G::Item>) {
-        let key = key.into();
-        let value = value.into();
-
-        let group = self.values.get_mut(&key);
-
-        match group {
-            None => {
-                self.values.insert(key, {
-                    let mut group = G::new();
-                    group.merge(value);
-                    group
-                });
-            }
-            Some(group) => {
-                group.merge(value);
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, Hash)]
-pub enum Column {
-    String(String),
-    Value,
-}
-
-impl From<String> for Column {
-    fn from(x: String) -> Self {
-        Column::String(x)
-    }
-}
-
-impl From<&String> for Column {
-    fn from(x: &String) -> Self {
-        Column::String(x.clone())
-    }
-}
-
-impl From<&str> for Column {
-    fn from(x: &str) -> Self {
-        Column::String(x.to_string())
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value.rs b/old_nushell/crates/nu-protocol/src/value.rs
deleted file mode 100644
index a4df02608..000000000
--- a/old_nushell/crates/nu-protocol/src/value.rs
+++ /dev/null
@@ -1,1177 +0,0 @@
-pub mod column_path;
-mod convert;
-mod debug;
-pub mod dict;
-pub mod did_you_mean;
-pub mod iter;
-pub mod primitive;
-pub mod range;
-mod serde_bigdecimal;
-mod serde_bigint;
-pub mod value_structure;
-
-use crate::hir;
-use crate::type_name::{ShellTypeName, SpannedTypeName};
-use crate::value::dict::Dictionary;
-use crate::value::iter::{RowValueIter, TableValueIter};
-use crate::value::primitive::Primitive;
-use crate::value::range::{Range, RangeInclusion};
-use crate::ColumnPath;
-use bigdecimal::BigDecimal;
-use bigdecimal::FromPrimitive;
-use chrono::{DateTime, FixedOffset, Utc};
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_source::{AnchorLocation, HasSpan, Span, Spanned, SpannedItem, Tag};
-use num_bigint::BigInt;
-use num_traits::ToPrimitive;
-use serde::{Deserialize, Serialize};
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::time::SystemTime;
-
-#[cfg(feature = "dataframe")]
-use crate::dataframe::{FrameStruct, NuDataFrame};
-
-/// The core structured values that flow through a pipeline
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum UntaggedValue {
-    /// A primitive (or fundamental) type of values
-    Primitive(Primitive),
-
-    /// A table row
-    Row(Dictionary),
-
-    /// A full inner (or embedded) table
-    Table(Vec<Value>),
-
-    /// An error value that represents an error that occurred as the values in the pipeline were built
-    Error(ShellError),
-
-    /// A block of Nu code, eg `{ ls | get name ; echo "done" }` with its captured values
-    Block(Box<hir::CapturedBlock>),
-
-    /// Main nushell dataframe
-    #[cfg(feature = "dataframe")]
-    DataFrame(NuDataFrame),
-
-    /// Data option that holds intermediate struct required to do data
-    /// manipulation and operations for dataframes such as groupby, lazy frames
-    /// and lazy groupby
-    #[cfg(feature = "dataframe")]
-    FrameStruct(FrameStruct),
-}
-
-impl UntaggedValue {
-    /// Get the corresponding descriptors (column names) associated with this value
-    pub fn data_descriptors(&self) -> Vec<String> {
-        match self {
-            UntaggedValue::Row(columns) => columns.entries.keys().map(|x| x.to_string()).collect(),
-            _ => vec![],
-        }
-    }
-
-    /// Convert this UntaggedValue to a Value with the given Tag
-    pub fn into_value(self, tag: impl Into<Tag>) -> Value {
-        Value {
-            value: self,
-            tag: tag.into(),
-        }
-    }
-
-    /// Convert this UntaggedValue into a Value with an empty Tag
-    pub fn into_untagged_value(self) -> Value {
-        Value {
-            value: self,
-            tag: Tag::unknown(),
-        }
-    }
-
-    /// Returns true if this value represents a binary
-    pub fn is_binary(&self) -> bool {
-        matches!(self, &UntaggedValue::Primitive(Primitive::Binary(_)))
-    }
-
-    /// Returns true if this value represents boolean true
-    pub fn is_true(&self) -> bool {
-        matches!(self, UntaggedValue::Primitive(Primitive::Boolean(true)))
-    }
-
-    /// Returns true if this value represents a filesize
-    pub fn is_filesize(&self) -> bool {
-        matches!(self, UntaggedValue::Primitive(Primitive::Filesize(_)))
-    }
-
-    /// Returns true if this value represents a duration
-    pub fn is_duration(&self) -> bool {
-        matches!(self, UntaggedValue::Primitive(Primitive::Duration(_)))
-    }
-
-    /// Returns true if this value represents a table
-    pub fn is_table(&self) -> bool {
-        matches!(self, UntaggedValue::Table(_))
-    }
-
-    /// Returns true if this value represents a row
-    pub fn is_row(&self) -> bool {
-        matches!(self, UntaggedValue::Row(_))
-    }
-
-    /// Returns true if this value represents a string
-    pub fn is_string(&self) -> bool {
-        matches!(self, UntaggedValue::Primitive(Primitive::String(_)))
-    }
-
-    /// Returns true if the value represents something other than Nothing
-    pub fn is_some(&self) -> bool {
-        !self.is_none()
-    }
-
-    /// Returns true if the value represents Nothing
-    pub fn is_none(&self) -> bool {
-        matches!(self, UntaggedValue::Primitive(Primitive::Nothing))
-    }
-
-    /// Returns true if the value represents an error
-    pub fn is_error(&self) -> bool {
-        matches!(self, UntaggedValue::Error(_err))
-    }
-
-    /// Expect this value to be an error and return it
-    pub fn expect_error(&self) -> ShellError {
-        match self {
-            UntaggedValue::Error(err) => err.clone(),
-            _ => panic!("Don't call expect_error without first calling is_error"),
-        }
-    }
-
-    /// Expect this value to be a string and return it
-    pub fn expect_string(&self) -> &str {
-        match self {
-            UntaggedValue::Primitive(Primitive::String(string)) => &string[..],
-            _ => panic!("expect_string assumes that the value must be a string"),
-        }
-    }
-
-    /// Expect this value to be an integer and return it
-    pub fn expect_int(&self) -> i64 {
-        let big_int = match self {
-            UntaggedValue::Primitive(Primitive::Int(int)) => Some(int),
-            _ => None,
-        };
-
-        match big_int.and_then(|i| i.to_i64()) {
-            Some(i) => i,
-            _ => panic!("expect_int assumes that the value must be a integer"),
-        }
-    }
-
-    /// Helper for creating row values
-    pub fn row(entries: IndexMap<String, Value>) -> UntaggedValue {
-        UntaggedValue::Row(entries.into())
-    }
-
-    /// Helper for creating table values
-    pub fn table(list: &[Value]) -> UntaggedValue {
-        UntaggedValue::Table(list.to_vec())
-    }
-
-    /// Helper for creating string values
-    pub fn string(s: impl Into<String>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::String(s.into()))
-    }
-
-    /// Helper for creating column-path values
-    pub fn column_path(s: &str, span: Span) -> UntaggedValue {
-        let s = s.to_string().spanned(span);
-
-        UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build(&s)))
-    }
-
-    /// Helper for creating integer values
-    pub fn int(i: impl Into<i64>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Int(i.into()))
-    }
-
-    /// Helper for creating big integer values
-    pub fn big_int(i: impl Into<BigInt>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::BigInt(i.into()))
-    }
-
-    /// Helper for creating glob pattern values
-    pub fn glob_pattern(s: impl Into<String>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::String(s.into()))
-    }
-
-    /// Helper for creating filepath values
-    pub fn filepath(s: impl Into<PathBuf>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::FilePath(s.into()))
-    }
-
-    /// Helper for creating filesize values
-    pub fn filesize(s: u64) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Filesize(s))
-    }
-
-    /// Helper for creating decimal values
-    pub fn decimal(s: impl Into<BigDecimal>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Decimal(s.into()))
-    }
-
-    /// Helper for creating decimal values
-    pub fn decimal_from_float(f: f64, span: Span) -> UntaggedValue {
-        let dec = BigDecimal::from_f64(f);
-
-        // BigDecimal doesn't have the concept of inf/NaN so handle manually
-        if f.is_sign_negative() && f.is_infinite() {
-            UntaggedValue::from("-inf")
-        } else if f.is_infinite() {
-            UntaggedValue::from("inf")
-        } else if f.is_nan() {
-            UntaggedValue::from("NaN")
-        } else {
-            match dec {
-                Some(dec) => UntaggedValue::Primitive(Primitive::Decimal(dec)),
-                None => UntaggedValue::Error(ShellError::labeled_error(
-                    "Can not convert f64 to big decimal",
-                    "can not create decimal",
-                    span,
-                )),
-            }
-        }
-    }
-
-    /// Helper for creating binary (non-text) buffer values
-    pub fn binary(binary: Vec<u8>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Binary(binary))
-    }
-
-    /// Helper for creating range values
-    pub fn range(
-        left: (Spanned<Primitive>, RangeInclusion),
-        right: (Spanned<Primitive>, RangeInclusion),
-    ) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Range(Box::new(Range::new(left, right))))
-    }
-
-    /// Helper for creating boolean values
-    pub fn boolean(b: impl Into<bool>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Boolean(b.into()))
-    }
-
-    /// Helper for creating date duration values
-    pub fn duration(nanos: impl Into<BigInt>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Duration(nanos.into()))
-    }
-
-    /// Helper for creating datatime values
-    pub fn system_date(s: SystemTime) -> UntaggedValue {
-        let utc: DateTime<Utc> = s.into();
-        UntaggedValue::Primitive(Primitive::Date(utc.into()))
-    }
-
-    pub fn date(d: impl Into<DateTime<FixedOffset>>) -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Date(d.into()))
-    }
-
-    /// Helper for creating the Nothing value
-    pub fn nothing() -> UntaggedValue {
-        UntaggedValue::Primitive(Primitive::Nothing)
-    }
-}
-
-/// The fundamental structured value that flows through the pipeline, with associated metadata
-#[derive(Debug, Clone, PartialOrd, Ord, Eq, Serialize, Deserialize)]
-pub struct Value {
-    pub value: UntaggedValue,
-    pub tag: Tag,
-}
-
-impl PartialEq for Value {
-    fn eq(&self, other: &Self) -> bool {
-        self.value == other.value
-    }
-}
-
-impl Hash for Value {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.value.hash(state);
-    }
-}
-
-/// Overload deferencing to give back the UntaggedValue inside of a Value
-impl std::ops::Deref for Value {
-    type Target = UntaggedValue;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-impl Value {
-    /// Helper to create a Value
-    pub fn new(untagged_value: UntaggedValue, the_tag: Tag) -> Self {
-        Value {
-            value: untagged_value,
-            tag: the_tag,
-        }
-    }
-
-    /// Get the corresponding anchor (originating location) for the Value
-    pub fn anchor(&self) -> Option<AnchorLocation> {
-        self.tag.anchor()
-    }
-
-    /// Get the name (url, filepath, etc) behind an anchor for the Value
-    pub fn anchor_name(&self) -> Option<String> {
-        self.tag.anchor_name()
-    }
-
-    /// Get the metadata for the Value
-    pub fn tag(&self) -> Tag {
-        self.tag.clone()
-    }
-
-    pub fn error(e: ShellError) -> Value {
-        UntaggedValue::Error(e).into_untagged_value()
-    }
-
-    /// View the Value as a string, if possible
-    pub fn as_string(&self) -> Result<String, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::String(string)) => Ok(string.clone()),
-            UntaggedValue::Primitive(Primitive::FilePath(path)) => {
-                Ok(path.to_string_lossy().to_string())
-            }
-            _ => Err(ShellError::type_error("string", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a FilePath (PathBuf), if possible
-    pub fn as_filepath(&self) -> Result<PathBuf, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::FilePath(path)) => Ok(path.clone()),
-            _ => Err(ShellError::type_error("path", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a Int, if possible
-    pub fn as_int(&self) -> Result<i64, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Int(n)) => Ok(*n),
-            _ => Err(ShellError::type_error("bigint", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a Int, if possible
-    pub fn as_big_int(&self) -> Result<BigInt, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::BigInt(n)) => Ok(n.clone()),
-            _ => Err(ShellError::type_error("bigint", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a Filesize (u64), if possible
-    pub fn as_filesize(&self) -> Result<u64, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Filesize(fs)) => Ok(*fs),
-            _ => Err(ShellError::type_error("int", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a Duration (BigInt), if possible
-    pub fn as_duration(&self) -> Result<BigInt, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Duration(dur)) => Ok(dur.clone()),
-            _ => Err(ShellError::type_error("bigint", self.spanned_type_name())),
-        }
-    }
-    /// View the Value as a Decimal (BigDecimal), if possible
-    pub fn as_decimal(&self) -> Result<BigDecimal, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Decimal(d)) => Ok(d.clone()),
-            _ => Err(ShellError::type_error(
-                "bigdecimal",
-                self.spanned_type_name(),
-            )),
-        }
-    }
-
-    pub fn convert_to_string(&self) -> String {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => s.clone(),
-            UntaggedValue::Primitive(Primitive::Date(dt)) => dt.format("%Y-%m-%d").to_string(),
-            UntaggedValue::Primitive(Primitive::Boolean(x)) => x.to_string(),
-            UntaggedValue::Primitive(Primitive::Decimal(x)) => x.to_string(),
-            UntaggedValue::Primitive(Primitive::Int(x)) => x.to_string(),
-            UntaggedValue::Primitive(Primitive::Filesize(x)) => x.to_string(),
-            UntaggedValue::Primitive(Primitive::FilePath(x)) => x.display().to_string(),
-            UntaggedValue::Primitive(Primitive::ColumnPath(path)) => {
-                let joined: String = path
-                    .iter()
-                    .map(|member| member.as_string())
-                    .collect::<Vec<String>>()
-                    .join(".");
-
-                if joined.contains(' ') {
-                    format!("\"{}\"", joined)
-                } else {
-                    joined
-                }
-            }
-
-            _ => String::from(""),
-        }
-    }
-
-    pub fn format(&self, fmt: &str) -> Result<String, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Date(dt)) => Ok(dt.format(fmt).to_string()),
-            _ => Err(ShellError::type_error("date", self.spanned_type_name())),
-        }
-    }
-
-    /// View a Primitive::Binary as a Vec<u8>, if possible
-    pub fn as_binary_vec(&self) -> Result<Vec<u8>, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Binary(bin)) => Ok(bin.to_vec()),
-            _ => Err(ShellError::type_error("binary", self.spanned_type_name())),
-        }
-    }
-
-    /// View into the borrowed string contents of a Value, if possible
-    pub fn as_forgiving_string(&self) -> Result<&str, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::String(string)) => Ok(&string[..]),
-            _ => Err(ShellError::type_error("string", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a path, if possible
-    pub fn as_path(&self) -> Result<PathBuf, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::FilePath(path)) => Ok(path.clone()),
-            UntaggedValue::Primitive(Primitive::String(path_str)) => Ok(PathBuf::from(&path_str)),
-            _ => Err(ShellError::type_error("Path", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as a Primitive value, if possible
-    pub fn as_primitive(&self) -> Result<Primitive, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => Ok(primitive.clone()),
-            _ => Err(ShellError::type_error(
-                "Primitive",
-                self.spanned_type_name(),
-            )),
-        }
-    }
-
-    /// View the Value as a Primitive value, if possible
-    pub fn is_primitive(&self) -> bool {
-        matches!(&self.value, UntaggedValue::Primitive(_))
-    }
-
-    /// View the Value as char, if possible
-    pub fn as_char(&self) -> Result<char, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_char(self.tag.span),
-            _ => Err(ShellError::type_error("char", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as unsigned size, if possible
-    pub fn as_usize(&self) -> Result<usize, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_usize(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as unsigned 64-bit, if possible
-    pub fn as_u64(&self) -> Result<u64, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_u64(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as signed 64-bit, if possible
-    pub fn as_i64(&self) -> Result<i64, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_i64(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as unsigned 32-bit, if possible
-    pub fn as_u32(&self) -> Result<u32, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_u32(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as signed 32-bit, if possible
-    pub fn as_i32(&self) -> Result<i32, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_i32(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as signed 16-bit, if possible
-    pub fn as_i16(&self) -> Result<i16, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_i16(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as signed 32-bit float, if possible
-    pub fn as_f32(&self) -> Result<f32, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_f32(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as signed 64-bit float, if possible
-    pub fn as_f64(&self) -> Result<f64, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(primitive) => primitive.as_f64(self.tag.span),
-            _ => Err(ShellError::type_error("integer", self.spanned_type_name())),
-        }
-    }
-
-    /// View the Value as boolean, if possible
-    pub fn as_bool(&self) -> Result<bool, ShellError> {
-        match &self.value {
-            UntaggedValue::Primitive(Primitive::Boolean(p)) => Ok(*p),
-            _ => Err(ShellError::type_error("boolean", self.spanned_type_name())),
-        }
-    }
-
-    /// Returns an iterator of the values rows
-    pub fn table_entries(&self) -> TableValueIter<'_> {
-        crate::value::iter::table_entries(self)
-    }
-
-    /// Returns an iterator of the value's cells
-    pub fn row_entries(&self) -> RowValueIter<'_> {
-        crate::value::iter::row_entries(self)
-    }
-
-    /// Returns true if the value is empty
-    pub fn is_empty(&self) -> bool {
-        match &self {
-            Value {
-                value: UntaggedValue::Primitive(p),
-                ..
-            } => p.is_empty(),
-            Value {
-                value: UntaggedValue::Table(rows),
-                ..
-            } => rows.is_empty(),
-            r @ Value {
-                value: UntaggedValue::Row(_),
-                ..
-            } => r.row_entries().all(|(_, value)| value.is_empty()),
-            _ => false,
-        }
-    }
-
-    pub fn nothing() -> Value {
-        UntaggedValue::nothing().into_untagged_value()
-    }
-}
-
-impl From<String> for Value {
-    fn from(s: String) -> Value {
-        let end = s.len();
-        Value {
-            value: s.into(),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-}
-
-impl From<&str> for Value {
-    fn from(s: &str) -> Value {
-        let end = s.len();
-        Value {
-            value: s.into(),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-}
-
-impl From<bool> for Value {
-    fn from(s: bool) -> Value {
-        Value {
-            value: s.into(),
-            tag: Tag {
-                anchor: None,
-                span: Span::unknown(),
-            },
-        }
-    }
-}
-
-impl<T> From<T> for UntaggedValue
-where
-    T: Into<Primitive>,
-{
-    /// Convert a Primitive to an UntaggedValue
-    fn from(input: T) -> UntaggedValue {
-        UntaggedValue::Primitive(input.into())
-    }
-}
-
-impl From<ShellError> for UntaggedValue {
-    fn from(e: ShellError) -> Self {
-        UntaggedValue::Error(e)
-    }
-}
-
-impl From<UntaggedValue> for Value {
-    /// Convert an UntaggedValue into a Value with a default tag
-    fn from(value: UntaggedValue) -> Value {
-        Value {
-            value,
-            tag: Tag::default(),
-        }
-    }
-}
-
-impl From<Value> for UntaggedValue {
-    /// Convert a Value into an UntaggedValue
-    fn from(v: Value) -> UntaggedValue {
-        v.value
-    }
-}
-
-/// Convert a borrowed Value into a borrowed UntaggedValue
-impl<'a> From<&'a Value> for &'a UntaggedValue {
-    fn from(x: &'a Value) -> Self {
-        &x.value
-    }
-}
-
-impl HasSpan for Value {
-    /// Return the corresponding Span for the Value
-    fn span(&self) -> Span {
-        self.tag.span
-    }
-}
-
-impl ShellTypeName for Value {
-    /// Get the type name for the Value
-    fn type_name(&self) -> &'static str {
-        ShellTypeName::type_name(&self.value)
-    }
-}
-
-impl ShellTypeName for UntaggedValue {
-    /// Get the type name for the UntaggedValue
-    fn type_name(&self) -> &'static str {
-        match &self {
-            UntaggedValue::Primitive(p) => p.type_name(),
-            UntaggedValue::Row(_) => "row",
-            UntaggedValue::Table(_) => "table",
-            UntaggedValue::Error(_) => "error",
-            UntaggedValue::Block(_) => "block",
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::DataFrame(_) => "dataframe",
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::FrameStruct(FrameStruct::GroupBy(_)) => "groupby",
-        }
-    }
-}
-
-pub fn merge_descriptors(values: &[Value]) -> Vec<String> {
-    let mut ret: Vec<String> = vec![];
-    let value_column = "".to_string();
-    for value in values {
-        let descs = value.data_descriptors();
-
-        if descs.is_empty() {
-            if !ret.contains(&value_column) {
-                ret.push("".to_string());
-            }
-        } else {
-            for desc in value.data_descriptors() {
-                if !ret.contains(&desc) {
-                    ret.push(desc);
-                }
-            }
-        }
-    }
-    ret
-}
-
-// Extensions
-
-pub trait StringExt {
-    fn to_string_untagged_value(&self) -> UntaggedValue;
-    fn to_string_value(&self, tag: Tag) -> Value;
-    fn to_string_value_create_tag(&self) -> Value;
-    fn to_column_path_value(&self, tag: Tag) -> Value;
-    fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue;
-    fn to_pattern_value(&self, tag: Tag) -> Value;
-    fn to_pattern_untagged_value(&self) -> UntaggedValue;
-}
-
-impl StringExt for String {
-    fn to_string_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::String(self.to_string())),
-            tag: the_tag,
-        }
-    }
-
-    fn to_string_value_create_tag(&self) -> Value {
-        let end = self.len();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::String(self.to_string())),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_string_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::string(self)
-    }
-
-    fn to_column_path_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build(
-                &the_tag.span.spanned_string(self), // this is suspect
-            ))),
-            tag: the_tag,
-        }
-    }
-
-    fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue {
-        let s = self.to_string().spanned(span);
-        UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build(&s)))
-    }
-
-    fn to_pattern_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::GlobPattern(self.to_string())),
-            tag: the_tag,
-        }
-    }
-
-    fn to_pattern_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::glob_pattern(self)
-    }
-}
-
-pub trait StrExt {
-    fn to_str_untagged_value(&self) -> UntaggedValue;
-    fn to_str_value(&self, tag: Tag) -> Value;
-    fn to_str_value_create_tag(&self) -> Value;
-    fn to_column_path_value(&self, tag: Tag) -> Value;
-    fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue;
-    fn to_pattern_value(&self, tag: Tag) -> Value;
-    fn to_pattern_untagged_value(&self) -> UntaggedValue;
-}
-
-impl StrExt for &str {
-    fn to_str_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::String(self.to_string())),
-            tag: the_tag,
-        }
-    }
-
-    fn to_str_value_create_tag(&self) -> Value {
-        let end = self.len();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::String(self.to_string())),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_str_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::string(*self)
-    }
-
-    fn to_column_path_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build(
-                &the_tag.span.spanned_string(self), // this is suspect
-            ))),
-            tag: the_tag,
-        }
-    }
-
-    fn to_column_path_untagged_value(&self, span: Span) -> UntaggedValue {
-        let s = self.to_string().spanned(span);
-        UntaggedValue::Primitive(Primitive::ColumnPath(ColumnPath::build(&s)))
-    }
-
-    fn to_pattern_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::GlobPattern(self.to_string())),
-            tag: the_tag,
-        }
-    }
-
-    fn to_pattern_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::glob_pattern(*self)
-    }
-}
-
-pub trait I64Ext {
-    fn to_untagged_value(&self) -> UntaggedValue;
-    fn to_duration_value(&self, tag: Tag) -> Value;
-    fn to_duration_untagged_value(&self) -> UntaggedValue;
-    fn to_value(&self, tag: Tag) -> Value;
-    fn to_value_create_tag(&self) -> Value;
-}
-
-impl I64Ext for i64 {
-    fn to_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Int(*self)),
-            tag: the_tag,
-        }
-    }
-
-    fn to_duration_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Duration(
-                BigInt::from_i64(*self)
-                    .expect("Internal error: conversion to big int should not fail"),
-            )),
-            tag: the_tag,
-        }
-    }
-
-    fn to_duration_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::duration(*self)
-    }
-
-    fn to_value_create_tag(&self) -> Value {
-        let end = self.to_string().len();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Int(*self)),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::int(*self)
-    }
-}
-
-pub trait DecimalExt {
-    fn to_untagged_value(&self) -> UntaggedValue;
-    fn to_value(&self, tag: Tag) -> Value;
-    fn to_value_create_tag(&self) -> Value;
-}
-
-impl DecimalExt for f64 {
-    fn to_value(&self, the_tag: Tag) -> Value {
-        if let Some(f) = BigDecimal::from_f64(*self) {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Decimal(f)),
-                tag: the_tag,
-            }
-        } else {
-            unreachable!("Internal error: protocol did not use f64-compatible decimal")
-        }
-    }
-
-    fn to_value_create_tag(&self) -> Value {
-        let end = self.to_string().len();
-        if let Some(f) = BigDecimal::from_f64(*self) {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Decimal(f)),
-                tag: Tag {
-                    anchor: None,
-                    span: Span::new(0, end),
-                },
-            }
-        } else {
-            unreachable!("Internal error: protocol did not use f64-compatible decimal")
-        }
-    }
-
-    fn to_untagged_value(&self) -> UntaggedValue {
-        if let Some(f) = BigDecimal::from_f64(*self) {
-            UntaggedValue::decimal(f)
-        } else {
-            unreachable!("Internal error: protocol did not use f64-compatible decimal")
-        }
-    }
-}
-
-pub trait PathBufExt {
-    fn to_untagged_value(&self) -> UntaggedValue;
-    fn to_value(&self, tag: Tag) -> Value;
-    fn to_value_create_tag(&self) -> Value;
-}
-
-impl PathBufExt for PathBuf {
-    fn to_value(&self, the_tag: Tag) -> Value {
-        let pb = self.clone();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::FilePath(pb)),
-            tag: the_tag,
-        }
-    }
-
-    fn to_value_create_tag(&self) -> Value {
-        let end = self
-            .to_str()
-            .expect("unable to convert pathbuf to str")
-            .len();
-        let pb = self.clone();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::FilePath(pb)),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_untagged_value(&self) -> UntaggedValue {
-        let pb = self.clone();
-        UntaggedValue::filepath(pb)
-    }
-}
-
-pub trait BooleanExt {
-    fn to_untagged_value(&self) -> UntaggedValue;
-    fn to_value(&self, tag: Tag) -> Value;
-    fn to_value_create_tag(&self) -> Value;
-}
-
-impl BooleanExt for bool {
-    fn to_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Boolean(*self)),
-            tag: the_tag,
-        }
-    }
-
-    fn to_value_create_tag(&self) -> Value {
-        let end = self.to_string().len();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Boolean(*self)),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::boolean(*self)
-    }
-}
-
-pub trait DateTimeExt {
-    fn to_untagged_value(&self) -> UntaggedValue;
-    fn to_value(&self, tag: Tag) -> Value;
-    fn to_value_create_tag(&self) -> Value;
-}
-
-impl DateTimeExt for DateTime<FixedOffset> {
-    fn to_value(&self, the_tag: Tag) -> Value {
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Date(*self)),
-            tag: the_tag,
-        }
-    }
-
-    fn to_value_create_tag(&self) -> Value {
-        let end = self.to_string().len();
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Date(*self)),
-            tag: Tag {
-                anchor: None,
-                span: Span::new(0, end),
-            },
-        }
-    }
-
-    fn to_untagged_value(&self) -> UntaggedValue {
-        UntaggedValue::date(*self)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indexmap::indexmap;
-
-    #[test]
-    fn test_merge_descriptors() {
-        let value = vec![
-            UntaggedValue::row(indexmap! {
-                "h1".into() => Value::from("Ecuador")
-            })
-            .into_untagged_value(),
-            UntaggedValue::row(indexmap! {
-                "h2".into() => Value::from("Ecuador")
-            })
-            .into_untagged_value(),
-            UntaggedValue::row(indexmap! {
-                "h3".into() => Value::from("Ecuador")
-            })
-            .into_untagged_value(),
-            UntaggedValue::row(indexmap! {
-                "h1".into() => Value::from("Ecuador"),
-                "h4".into() => Value::from("Ecuador"),
-            })
-            .into_untagged_value(),
-        ];
-
-        assert_eq!(
-            merge_descriptors(&value),
-            vec![
-                String::from("h1"),
-                String::from("h2"),
-                String::from("h3"),
-                String::from("h4")
-            ]
-        );
-    }
-
-    #[test]
-    fn test_data_descriptors() {
-        let value = vec![
-            UntaggedValue::row(indexmap! {
-                "h1".into() => Value::from("Ecuador")
-            }),
-            UntaggedValue::row(indexmap! {
-                "h2".into() => Value::from("Ecuador")
-            }),
-            UntaggedValue::row(indexmap! {
-                "h3".into() => Value::from("Ecuador")
-            }),
-            UntaggedValue::row(indexmap! {
-                "h1".into() => Value::from("Ecuador"),
-                "h4".into() => Value::from("Ecuador"),
-            }),
-        ];
-
-        assert_eq!(
-            value
-                .iter()
-                .map(|v| v.data_descriptors().len())
-                .collect::<Vec<_>>(),
-            vec![1, 1, 1, 2]
-        );
-    }
-
-    #[test]
-    fn test_decimal_from_float() {
-        assert_eq!(
-            UntaggedValue::from("inf"),
-            UntaggedValue::decimal_from_float(f64::INFINITY, Span::default())
-        );
-        assert_eq!(
-            UntaggedValue::from("-inf"),
-            UntaggedValue::decimal_from_float(f64::NEG_INFINITY, Span::default())
-        );
-        assert_eq!(
-            UntaggedValue::from("NaN"),
-            UntaggedValue::decimal_from_float(f64::NAN, Span::default())
-        );
-        assert_eq!(
-            UntaggedValue::from(5.5),
-            UntaggedValue::decimal_from_float(5.5, Span::default())
-        )
-    }
-
-    #[test]
-    fn test_string_to_string_untagged_value_extension() {
-        assert_eq!(
-            "a_string".to_string().to_string_untagged_value(),
-            UntaggedValue::from("a_string".to_string())
-        );
-    }
-
-    #[test]
-    fn test_string_to_string_value_extension() {
-        let end = "a_string".to_string().len();
-        let the_tag = Tag {
-            anchor: None,
-            span: Span::new(0, end),
-        };
-
-        let expected = Value {
-            value: UntaggedValue::Primitive(Primitive::String("a_string".to_string())),
-            tag: the_tag.clone(),
-        };
-
-        assert_eq!("a_string".to_string().to_string_value(the_tag), expected);
-    }
-
-    #[test]
-    fn test_string_to_string_value_create_tag_extension() {
-        let end = "a_string".to_string().len();
-        let tag = Tag {
-            anchor: None,
-            span: Span::new(0, end),
-        };
-
-        let expected = Value {
-            value: UntaggedValue::Primitive(Primitive::String("a_string".to_string())),
-            tag,
-        };
-
-        assert_eq!(
-            "a_string".to_string().to_string_value_create_tag(),
-            expected
-        );
-    }
-
-    #[test]
-    fn test_string_to_pattern_untagged_value() {
-        let a_pattern = r"[a-zA-Z0-9 ]";
-        assert_eq!(
-            a_pattern.to_pattern_untagged_value(),
-            UntaggedValue::glob_pattern(a_pattern)
-        );
-    }
-
-    #[test]
-    fn test_string_to_column_path_untagged_value() {
-        let a_columnpath = "some_column_path";
-        let a_span = Span::new(0, a_columnpath.len());
-        assert_eq!(
-            a_columnpath.to_column_path_untagged_value(a_span),
-            UntaggedValue::column_path(a_columnpath, a_span)
-        );
-    }
-
-    #[test]
-    fn test_str_to_str_untaggged_value_extension() {
-        assert_eq!(
-            "a_str".to_str_untagged_value(),
-            UntaggedValue::from("a_str".to_string())
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/column_path.rs b/old_nushell/crates/nu-protocol/src/value/column_path.rs
deleted file mode 100644
index 53121f496..000000000
--- a/old_nushell/crates/nu-protocol/src/value/column_path.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-use derive_new::new;
-use getset::Getters;
-use nu_source::{
-    span_for_spanned_list, DbgDocBldr, DebugDocBuilder, HasFallibleSpan, PrettyDebug, Span,
-    Spanned, SpannedItem,
-};
-use serde::{Deserialize, Serialize};
-
-use crate::hir::{Expression, Literal, Member, SpannedExpression};
-use nu_errors::ParseError;
-
-/// A PathMember that has yet to be spanned so that it can be used in later processing
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
-pub enum UnspannedPathMember {
-    String(String),
-    Int(i64),
-}
-
-impl UnspannedPathMember {
-    /// Add the span information and get a full PathMember
-    pub fn into_path_member(self, span: impl Into<Span>) -> PathMember {
-        PathMember {
-            unspanned: self,
-            span: span.into(),
-        }
-    }
-}
-
-/// A basic piece of a ColumnPath, which describes the steps to take through a table to arrive a cell, row, or inner table
-#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
-pub struct PathMember {
-    pub unspanned: UnspannedPathMember,
-    pub span: Span,
-}
-
-impl PrettyDebug for &PathMember {
-    /// Gets the PathMember ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        match &self.unspanned {
-            UnspannedPathMember::String(string) => DbgDocBldr::primitive(format!("{:?}", string)),
-            UnspannedPathMember::Int(int) => DbgDocBldr::primitive(int),
-        }
-    }
-}
-
-/// The fundamental path primitive to describe how to navigate through a table to get to a sub-item. A path member can be either a word or a number. Words/strings are taken to mean
-/// a column name, and numbers are the row number. Taken together they describe which column or row to narrow to in order to get data.
-///
-/// Rows must follow column names, they can't come first. eg) `foo.1` is valid where `1.foo` is not.
-#[derive(
-    Debug, Hash, Serialize, Deserialize, Ord, PartialOrd, Eq, PartialEq, Getters, Clone, new,
-)]
-pub struct ColumnPath {
-    #[get = "pub"]
-    members: Vec<PathMember>,
-}
-
-impl ColumnPath {
-    /// Iterate over the members of the column path
-    pub fn iter(&self) -> impl Iterator<Item = &PathMember> {
-        self.members.iter()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.members.is_empty()
-    }
-
-    /// Returns the last member and a slice of the remaining members
-    pub fn split_last(&self) -> Option<(&PathMember, &[PathMember])> {
-        self.members.split_last()
-    }
-
-    /// Returns the last member
-    pub fn last(&self) -> Option<&PathMember> {
-        self.iter().last()
-    }
-
-    pub fn path(&self) -> String {
-        let sep = std::path::MAIN_SEPARATOR;
-        let mut members = self.iter();
-        let mut f = String::from(sep);
-
-        if let Some(member) = members.next() {
-            f.push_str(&member.as_string());
-        }
-
-        for member in members {
-            f.push(sep);
-            f.push_str(&member.as_string());
-        }
-
-        f
-    }
-
-    pub fn build(text: &Spanned<String>) -> ColumnPath {
-        if let (
-            SpannedExpression {
-                expr: Expression::Literal(Literal::ColumnPath(path)),
-                span: _,
-            },
-            _,
-        ) = parse(text)
-        {
-            ColumnPath {
-                members: path.iter().map(|member| member.to_path_member()).collect(),
-            }
-        } else {
-            ColumnPath { members: vec![] }
-        }
-    }
-
-    pub fn with_head(text: &Spanned<String>) -> Option<(String, ColumnPath)> {
-        match parse_full_column_path(text) {
-            (
-                SpannedExpression {
-                    expr: Expression::FullColumnPath(path),
-                    ..
-                },
-                _,
-            ) => {
-                if let crate::hir::FullColumnPath {
-                    head:
-                        SpannedExpression {
-                            expr: Expression::Variable(name, _),
-                            span: _,
-                        },
-                    tail,
-                } = *path
-                {
-                    Some((
-                        name,
-                        ColumnPath {
-                            members: tail.to_vec(),
-                        },
-                    ))
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        }
-    }
-}
-
-impl PrettyDebug for ColumnPath {
-    /// Gets the ColumnPath ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        let members: Vec<DebugDocBuilder> =
-            self.members.iter().map(|member| member.pretty()).collect();
-
-        DbgDocBldr::delimit(
-            "(",
-            DbgDocBldr::description("path")
-                + DbgDocBldr::equals()
-                + DbgDocBldr::intersperse(members, DbgDocBldr::space()),
-            ")",
-        )
-        .nest()
-    }
-}
-
-impl HasFallibleSpan for ColumnPath {
-    /// Creates a span that will cover the column path, if possible
-    fn maybe_span(&self) -> Option<Span> {
-        if self.members.is_empty() {
-            None
-        } else {
-            Some(span_for_spanned_list(self.members.iter().map(|m| m.span)))
-        }
-    }
-}
-
-impl<'a> IntoIterator for &'a ColumnPath {
-    type Item = &'a PathMember;
-
-    type IntoIter = std::slice::Iter<'a, PathMember>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.members.iter()
-    }
-}
-
-impl PathMember {
-    /// Create a string path member
-    pub fn string(string: impl Into<String>, span: impl Into<Span>) -> PathMember {
-        UnspannedPathMember::String(string.into()).into_path_member(span)
-    }
-
-    /// Create a numeric path member
-    pub fn int(int: i64, span: impl Into<Span>) -> PathMember {
-        UnspannedPathMember::Int(int).into_path_member(span)
-    }
-
-    pub fn as_string(&self) -> String {
-        match &self.unspanned {
-            UnspannedPathMember::String(string) => string.clone(),
-            UnspannedPathMember::Int(int) => int.to_string(),
-        }
-    }
-}
-
-fn parse_full_column_path(
-    raw_column_path: &Spanned<String>,
-) -> (SpannedExpression, Option<ParseError>) {
-    let mut inside_delimiter = vec![];
-    let mut output = vec![];
-    let mut current_part = String::new();
-    let mut start_index = 0;
-    let mut last_index = 0;
-    let error = None;
-
-    let mut head = None;
-
-    for (idx, c) in raw_column_path.item.char_indices() {
-        last_index = idx;
-        if c == '(' {
-            inside_delimiter.push(')');
-        } else if let Some(delimiter) = inside_delimiter.last() {
-            if c == *delimiter {
-                inside_delimiter.pop();
-            }
-        } else if c == '\'' || c == '"' {
-            inside_delimiter.push(c);
-        } else if c == '.' {
-            let part_span = Span::new(
-                raw_column_path.span.start() + start_index,
-                raw_column_path.span.start() + idx,
-            );
-
-            if head.is_none() && current_part.starts_with('$') {
-                // We have the variable head
-                head = Some(Expression::variable(current_part.clone(), part_span))
-            } else if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-            } else {
-                let current_part = trim_quotes(&current_part);
-                output.push(
-                    UnspannedPathMember::String(current_part.clone()).into_path_member(part_span),
-                );
-            }
-            current_part.clear();
-            // Note: I believe this is safe because of the delimiter we're using,
-            // but if we get fancy with Unicode we'll need to change this.
-            start_index = idx + '.'.len_utf8();
-            continue;
-        }
-        current_part.push(c);
-    }
-
-    if !current_part.is_empty() {
-        let part_span = Span::new(
-            raw_column_path.span.start() + start_index,
-            raw_column_path.span.start() + last_index + 1,
-        );
-
-        if head.is_none() {
-            if current_part.starts_with('$') {
-                head = Some(Expression::variable(current_part, raw_column_path.span));
-            } else if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-            } else {
-                let current_part = trim_quotes(&current_part);
-                output.push(UnspannedPathMember::String(current_part).into_path_member(part_span));
-            }
-        } else if let Ok(row_number) = current_part.parse::<i64>() {
-            output.push(UnspannedPathMember::Int(row_number).into_path_member(part_span));
-        } else {
-            let current_part = trim_quotes(&current_part);
-            output.push(UnspannedPathMember::String(current_part).into_path_member(part_span));
-        }
-    }
-
-    if let Some(head) = head {
-        (
-            SpannedExpression::new(
-                Expression::path(SpannedExpression::new(head, raw_column_path.span), output),
-                raw_column_path.span,
-            ),
-            error,
-        )
-    } else {
-        (
-            SpannedExpression::new(
-                Expression::path(
-                    SpannedExpression::new(
-                        Expression::variable("$it".into(), raw_column_path.span),
-                        raw_column_path.span,
-                    ),
-                    output,
-                ),
-                raw_column_path.span,
-            ),
-            error,
-        )
-    }
-}
-
-fn parse(raw_column_path: &Spanned<String>) -> (SpannedExpression, Option<ParseError>) {
-    let mut delimiter = '.';
-    let mut inside_delimiter = false;
-    let mut output = vec![];
-    let mut current_part = String::new();
-    let mut start_index = 0;
-    let mut last_index = 0;
-
-    for (idx, c) in raw_column_path.item.char_indices() {
-        last_index = idx;
-        if inside_delimiter {
-            if c == delimiter {
-                inside_delimiter = false;
-            }
-        } else if c == '\'' || c == '"' || c == '`' {
-            inside_delimiter = true;
-            delimiter = c;
-        } else if c == '.' {
-            let part_span = Span::new(
-                raw_column_path.span.start() + start_index,
-                raw_column_path.span.start() + idx,
-            );
-
-            if let Ok(row_number) = current_part.parse::<i64>() {
-                output.push(Member::Int(row_number, part_span));
-            } else {
-                let trimmed = trim_quotes(&current_part);
-                output.push(Member::Bare(trimmed.clone().spanned(part_span)));
-            }
-            current_part.clear();
-            // Note: I believe this is safe because of the delimiter we're using,
-            // but if we get fancy with Unicode we'll need to change this.
-            start_index = idx + '.'.len_utf8();
-            continue;
-        }
-        current_part.push(c);
-    }
-
-    if !current_part.is_empty() {
-        let part_span = Span::new(
-            raw_column_path.span.start() + start_index,
-            raw_column_path.span.start() + last_index + 1,
-        );
-        if let Ok(row_number) = current_part.parse::<i64>() {
-            output.push(Member::Int(row_number, part_span));
-        } else {
-            let current_part = trim_quotes(&current_part);
-            output.push(Member::Bare(current_part.spanned(part_span)));
-        }
-    }
-
-    (
-        SpannedExpression::new(Expression::simple_column_path(output), raw_column_path.span),
-        None,
-    )
-}
-
-fn trim_quotes(input: &str) -> String {
-    let mut chars = input.chars();
-
-    match (chars.next(), chars.next_back()) {
-        (Some('\''), Some('\'')) => chars.collect(),
-        (Some('"'), Some('"')) => chars.collect(),
-        _ => input.to_string(),
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/convert.rs b/old_nushell/crates/nu-protocol/src/value/convert.rs
deleted file mode 100644
index c3b71871e..000000000
--- a/old_nushell/crates/nu-protocol/src/value/convert.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use crate::type_name::SpannedTypeName;
-use crate::value::dict::Dictionary;
-use crate::value::primitive::Primitive;
-use crate::value::{UntaggedValue, Value};
-use nu_errors::{CoerceInto, ShellError};
-use nu_source::TaggedItem;
-
-impl std::convert::TryFrom<&Value> for i64 {
-    type Error = ShellError;
-
-    /// Convert to an i64 integer, if possible
-    fn try_from(value: &Value) -> Result<i64, ShellError> {
-        match &value.value {
-            UntaggedValue::Primitive(Primitive::Int(int)) => Ok(*int),
-            UntaggedValue::Primitive(Primitive::BigInt(int)) => {
-                int.tagged(&value.tag).coerce_into("converting to i64")
-            }
-            _ => Err(ShellError::type_error("Integer", value.spanned_type_name())),
-        }
-    }
-}
-
-impl std::convert::TryFrom<&Value> for String {
-    type Error = ShellError;
-
-    /// Convert to a string, if possible
-    fn try_from(value: &Value) -> Result<String, ShellError> {
-        match &value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => Ok(s.clone()),
-            _ => Err(ShellError::type_error("String", value.spanned_type_name())),
-        }
-    }
-}
-
-impl std::convert::TryFrom<&Value> for Vec<u8> {
-    type Error = ShellError;
-
-    /// Convert to a u8 vec, if possible
-    fn try_from(value: &Value) -> Result<Vec<u8>, ShellError> {
-        match &value.value {
-            UntaggedValue::Primitive(Primitive::Binary(b)) => Ok(b.clone()),
-            _ => Err(ShellError::type_error("Binary", value.spanned_type_name())),
-        }
-    }
-}
-
-impl<'a> std::convert::TryFrom<&'a Value> for &'a Dictionary {
-    type Error = ShellError;
-
-    /// Convert to a dictionary, if possible
-    fn try_from(value: &'a Value) -> Result<&'a Dictionary, ShellError> {
-        match &value.value {
-            UntaggedValue::Row(d) => Ok(d),
-            _ => Err(ShellError::type_error(
-                "Dictionary",
-                value.spanned_type_name(),
-            )),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/debug.rs b/old_nushell/crates/nu-protocol/src/value/debug.rs
deleted file mode 100644
index 6ce7da44e..000000000
--- a/old_nushell/crates/nu-protocol/src/value/debug.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::type_name::PrettyType;
-use crate::value::primitive::Primitive;
-use crate::value::{UntaggedValue, Value};
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug};
-
-impl PrettyDebug for &Value {
-    /// Get a borrowed Value ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        PrettyDebug::pretty(*self)
-    }
-}
-
-impl PrettyDebug for Value {
-    /// Get a Value ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        match &self.value {
-            UntaggedValue::Primitive(p) => p.pretty(),
-            UntaggedValue::Row(row) => row.pretty_builder().nest(1).group().into(),
-            UntaggedValue::Table(table) => DbgDocBldr::delimit(
-                "[",
-                DbgDocBldr::intersperse(table, DbgDocBldr::space()),
-                "]",
-            )
-            .nest(),
-            UntaggedValue::Error(_) => DbgDocBldr::error("error"),
-            UntaggedValue::Block(_) => DbgDocBldr::opaque("block"),
-            #[cfg(feature = "dataframe")]
-            UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-                DbgDocBldr::opaque("dataframe")
-            }
-        }
-    }
-}
-
-impl PrettyType for Primitive {
-    /// Find the type of the Value and prepare it for pretty-printing
-    fn pretty_type(&self) -> DebugDocBuilder {
-        match self {
-            Primitive::Nothing => ty("nothing"),
-            Primitive::Int(_) => ty("integer"),
-            Primitive::BigInt(_) => ty("big-integer"),
-            Primitive::Range(_) => ty("range"),
-            Primitive::Decimal(_) => ty("decimal"),
-            Primitive::Filesize(_) => ty("filesize"),
-            Primitive::String(_) => ty("string"),
-            Primitive::ColumnPath(_) => ty("column-path"),
-            Primitive::GlobPattern(_) => ty("pattern"),
-            Primitive::Boolean(_) => ty("boolean"),
-            Primitive::Date(_) => ty("date"),
-            Primitive::Duration(_) => ty("duration"),
-            Primitive::FilePath(_) => ty("path"),
-            Primitive::Binary(_) => ty("binary"),
-            Primitive::BeginningOfStream => DbgDocBldr::keyword("beginning-of-stream"),
-            Primitive::EndOfStream => DbgDocBldr::keyword("end-of-stream"),
-        }
-    }
-}
-
-impl PrettyDebug for Primitive {
-    /// Get a Primitive value ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            Primitive::Nothing => DbgDocBldr::primitive("nothing"),
-            Primitive::Int(int) => prim(format_args!("{}", int)),
-            Primitive::BigInt(int) => prim(format_args!("{}", int)),
-            Primitive::Decimal(decimal) => prim(format_args!("{}", decimal)),
-            Primitive::Range(range) => {
-                let (left, left_inclusion) = &range.from;
-                let (right, right_inclusion) = &range.to;
-
-                DbgDocBldr::typed(
-                    "range",
-                    (left_inclusion.debug_left_bracket()
-                        + left.pretty()
-                        + DbgDocBldr::operator(",")
-                        + DbgDocBldr::space()
-                        + right.pretty()
-                        + right_inclusion.debug_right_bracket())
-                    .group(),
-                )
-            }
-            Primitive::Filesize(bytes) => primitive_doc(bytes, "filesize"),
-            Primitive::String(string) => prim(string),
-            Primitive::ColumnPath(path) => path.pretty(),
-            Primitive::GlobPattern(pattern) => primitive_doc(pattern, "pattern"),
-            Primitive::Boolean(boolean) => match boolean {
-                true => DbgDocBldr::primitive("$yes"),
-                false => DbgDocBldr::primitive("$no"),
-            },
-            Primitive::Date(date) => primitive_doc(date, "date"),
-            Primitive::Duration(duration) => primitive_doc(duration, "nanoseconds"),
-            Primitive::FilePath(path) => primitive_doc(path, "path"),
-            Primitive::Binary(_) => DbgDocBldr::opaque("binary"),
-            Primitive::BeginningOfStream => DbgDocBldr::keyword("beginning-of-stream"),
-            Primitive::EndOfStream => DbgDocBldr::keyword("end-of-stream"),
-        }
-    }
-}
-
-fn prim(name: impl std::fmt::Debug) -> DebugDocBuilder {
-    DbgDocBldr::primitive(format!("{:?}", name))
-}
-
-fn primitive_doc(name: impl std::fmt::Debug, ty: impl Into<String>) -> DebugDocBuilder {
-    DbgDocBldr::primitive(format!("{:?}", name))
-        + DbgDocBldr::delimit("(", DbgDocBldr::kind(ty.into()), ")")
-}
-
-fn ty(name: impl std::fmt::Debug) -> DebugDocBuilder {
-    DbgDocBldr::kind(format!("{:?}", name))
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/dict.rs b/old_nushell/crates/nu-protocol/src/value/dict.rs
deleted file mode 100644
index 9806f706a..000000000
--- a/old_nushell/crates/nu-protocol/src/value/dict.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-use crate::maybe_owned::MaybeOwned;
-use crate::value::primitive::Primitive;
-use crate::value::{UntaggedValue, Value};
-use derive_new::new;
-use getset::Getters;
-use indexmap::IndexMap;
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug, Spanned, SpannedItem, Tag};
-use serde::{Deserialize, Serialize};
-use std::cmp::{Ord, Ordering, PartialOrd};
-use std::hash::{Hash, Hasher};
-
-/// A dictionary that can hold a mapping from names to Values
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq, Clone, Getters, new)]
-pub struct Dictionary {
-    #[get = "pub"]
-    pub entries: IndexMap<String, Value>,
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl Hash for Dictionary {
-    /// Create the hash function to allow the Hash trait for dictionaries
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let mut entries = self.entries.clone();
-        entries.sort_keys();
-        entries.keys().collect::<Vec<&String>>().hash(state);
-        entries.values().collect::<Vec<&Value>>().hash(state);
-    }
-}
-
-impl PartialOrd for Dictionary {
-    /// Compare two dictionaries for sort ordering
-    fn partial_cmp(&self, other: &Dictionary) -> Option<Ordering> {
-        let this: Vec<&String> = self.entries.keys().collect();
-        let that: Vec<&String> = other.entries.keys().collect();
-
-        if this != that {
-            return this.partial_cmp(&that);
-        }
-
-        let this: Vec<&Value> = self.entries.values().collect();
-        let that: Vec<&Value> = self.entries.values().collect();
-
-        this.partial_cmp(&that)
-    }
-}
-
-impl Ord for Dictionary {
-    /// Compare two dictionaries for ordering
-    fn cmp(&self, other: &Dictionary) -> Ordering {
-        let this: Vec<&String> = self.entries.keys().collect();
-        let that: Vec<&String> = other.entries.keys().collect();
-
-        if this != that {
-            return this.cmp(&that);
-        }
-
-        let this: Vec<&Value> = self.entries.values().collect();
-        let that: Vec<&Value> = self.entries.values().collect();
-
-        this.cmp(&that)
-    }
-}
-
-impl PartialEq<Value> for Dictionary {
-    /// Test a dictionary against a Value for equality
-    fn eq(&self, other: &Value) -> bool {
-        matches!(&other.value, UntaggedValue::Row(d) if self == d)
-    }
-}
-
-/// A key-value pair specifically meant to be used in debug and pretty-printing
-#[derive(Debug, new)]
-struct DebugEntry<'a> {
-    key: &'a str,
-    value: &'a Value,
-}
-
-impl<'a> PrettyDebug for DebugEntry<'a> {
-    /// Build the the information to pretty-print the DebugEntry
-    fn pretty(&self) -> DebugDocBuilder {
-        (DbgDocBldr::key(self.key.to_string())
-            + DbgDocBldr::equals()
-            + self.value.pretty().into_value())
-        .group()
-    }
-}
-
-impl PrettyDebug for Dictionary {
-    /// Get a Dictionary ready to be pretty-printed
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::delimit(
-            "(",
-            DbgDocBldr::intersperse(
-                self.entries()
-                    .iter()
-                    .map(|(key, value)| DebugEntry::new(key, value)),
-                DbgDocBldr::space(),
-            ),
-            ")",
-        )
-    }
-}
-
-impl From<IndexMap<String, Value>> for Dictionary {
-    /// Create a dictionary from a map of strings to Values
-    fn from(input: IndexMap<String, Value>) -> Dictionary {
-        let mut out = IndexMap::default();
-
-        for (key, value) in input {
-            out.insert(key, value);
-        }
-
-        Dictionary::new(out)
-    }
-}
-
-impl Dictionary {
-    /// Find the matching Value for a given key, if possible. If not, return a Primitive::Nothing
-    pub fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value> {
-        match self.entries.get(desc) {
-            Some(v) => MaybeOwned::Borrowed(v),
-            None => MaybeOwned::Owned(
-                UntaggedValue::Primitive(Primitive::Nothing).into_untagged_value(),
-            ),
-        }
-    }
-
-    pub fn insert(&mut self, key: String, value: Value) -> Option<Value> {
-        self.entries.insert_full(key, value).1
-    }
-
-    pub fn merge_from(&self, other: &Dictionary) -> Dictionary {
-        let mut obj = self.clone();
-
-        for column in other.keys() {
-            let key = column.clone();
-            let value_key = key.as_str();
-            let value_spanned_key = value_key.spanned_unknown();
-
-            let other_column = match other.get_data_by_key(value_spanned_key) {
-                Some(value) => value,
-                None => UntaggedValue::Primitive(Primitive::Nothing).into_untagged_value(),
-            };
-
-            obj.entries.insert(key, other_column);
-        }
-
-        obj
-    }
-
-    /// Iterate the keys in the Dictionary
-    pub fn keys(&self) -> impl Iterator<Item = &String> {
-        self.entries.keys()
-    }
-
-    /// Iterate the values in the Dictionary
-    pub fn values(&self) -> impl Iterator<Item = &Value> {
-        self.entries.values()
-    }
-
-    /// Checks if given key exists
-    pub fn contains_key(&self, key: &str) -> bool {
-        self.entries.contains_key(key)
-    }
-
-    /// Find the matching Value for a key, if possible
-    pub fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value> {
-        let result = self
-            .entries
-            .iter()
-            .find(|(desc_name, _)| *desc_name == name.item)?
-            .1;
-
-        Some(
-            result
-                .value
-                .clone()
-                .into_value(Tag::new(result.tag.anchor(), name.span)),
-        )
-    }
-
-    /// Get a mutable entry that matches a key, if possible
-    pub fn get_mut_data_by_key(&mut self, name: &str) -> Option<&mut Value> {
-        self.entries
-            .iter_mut()
-            .find(|(desc_name, _)| *desc_name == name)
-            .map(|(_, v)| v)
-    }
-
-    /// Insert a new key/value pair into the dictionary
-    pub fn insert_data_at_key(&mut self, name: &str, value: Value) {
-        self.entries.insert(name.to_string(), value);
-    }
-
-    /// Return size of dictionary
-    pub fn length(&self) -> usize {
-        self.entries.len()
-    }
-}
-
-/// A helper to help create dictionaries for you. It has the ability to insert values into the dictionary while maintaining the tags that need to be applied to the individual members
-#[derive(Debug, Clone)]
-pub struct TaggedDictBuilder {
-    tag: Tag,
-    dict: IndexMap<String, Value>,
-}
-
-impl TaggedDictBuilder {
-    /// Create a new builder
-    pub fn new(tag: impl Into<Tag>) -> TaggedDictBuilder {
-        TaggedDictBuilder {
-            tag: tag.into(),
-            dict: IndexMap::default(),
-        }
-    }
-
-    /// Build the contents of the builder into a Value
-    pub fn build(tag: impl Into<Tag>, block: impl FnOnce(&mut TaggedDictBuilder)) -> Value {
-        let mut builder = TaggedDictBuilder::new(tag);
-        block(&mut builder);
-        builder.into_value()
-    }
-
-    /// Create a new builder with a pre-defined capacity
-    pub fn with_capacity(tag: impl Into<Tag>, n: usize) -> TaggedDictBuilder {
-        TaggedDictBuilder {
-            tag: tag.into(),
-            dict: IndexMap::with_capacity(n),
-        }
-    }
-
-    /// Insert an untagged key/value pair into the dictionary, to later be tagged when built
-    pub fn insert_untagged(&mut self, key: impl Into<String>, value: impl Into<UntaggedValue>) {
-        self.dict
-            .insert(key.into(), value.into().into_value(&self.tag));
-    }
-
-    ///  Insert a key/value pair into the dictionary
-    pub fn insert_value(&mut self, key: impl Into<String>, value: impl Into<Value>) {
-        self.dict.insert(key.into(), value.into());
-    }
-
-    /// Convert the dictionary into a tagged Value using the original tag
-    pub fn into_value(self) -> Value {
-        let tag = self.tag.clone();
-        self.into_untagged_value().into_value(tag)
-    }
-
-    /// Convert the dictionary into an UntaggedValue
-    pub fn into_untagged_value(self) -> UntaggedValue {
-        UntaggedValue::Row(Dictionary { entries: self.dict })
-    }
-
-    /// Returns true if the dictionary is empty, false otherwise
-    pub fn is_empty(&self) -> bool {
-        self.dict.is_empty()
-    }
-
-    /// Checks if given key exists
-    pub fn contains_key(&self, key: &str) -> bool {
-        self.dict.contains_key(key)
-    }
-}
-
-impl From<TaggedDictBuilder> for Value {
-    /// Convert a builder into a tagged Value
-    fn from(input: TaggedDictBuilder) -> Value {
-        input.into_value()
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/did_you_mean.rs b/old_nushell/crates/nu-protocol/src/value/did_you_mean.rs
deleted file mode 100644
index d4f1e1bad..000000000
--- a/old_nushell/crates/nu-protocol/src/value/did_you_mean.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use crate::Value;
-
-/// Prepares a list of "sounds like" matches (using edit distance) for the string you're trying to find
-pub fn did_you_mean(obj_source: &Value, field_tried: String) -> Option<Vec<String>> {
-    let possibilities = obj_source.data_descriptors();
-
-    let mut possible_matches: Vec<_> = possibilities
-        .into_iter()
-        .map(|word| {
-            let edit_distance = levenshtein_distance(&word, &field_tried);
-            (edit_distance, word)
-        })
-        .collect();
-
-    if !possible_matches.is_empty() {
-        possible_matches.sort();
-        let words_matched: Vec<String> = possible_matches.into_iter().map(|m| m.1).collect();
-        Some(words_matched)
-    } else {
-        None
-    }
-}
-
-// Borrowed from here https://github.com/wooorm/levenshtein-rs
-pub fn levenshtein_distance(a: &str, b: &str) -> usize {
-    let mut result = 0;
-
-    /* Shortcut optimizations / degenerate cases. */
-    if a == b {
-        return result;
-    }
-
-    let length_a = a.chars().count();
-    let length_b = b.chars().count();
-
-    if length_a == 0 {
-        return length_b;
-    }
-
-    if length_b == 0 {
-        return length_a;
-    }
-
-    /* Initialize the vector.
-     *
-     * This is why it’s fast, normally a matrix is used,
-     * here we use a single vector. */
-    let mut cache: Vec<usize> = (1..).take(length_a).collect();
-    let mut distance_a;
-    let mut distance_b;
-
-    /* Loop. */
-    for (index_b, code_b) in b.chars().enumerate() {
-        result = index_b;
-        distance_a = index_b;
-
-        for (index_a, code_a) in a.chars().enumerate() {
-            distance_b = if code_a == code_b {
-                distance_a
-            } else {
-                distance_a + 1
-            };
-
-            distance_a = cache[index_a];
-
-            result = if distance_a > result {
-                if distance_b > result {
-                    result + 1
-                } else {
-                    distance_b
-                }
-            } else if distance_b > distance_a {
-                distance_a + 1
-            } else {
-                distance_b
-            };
-
-            cache[index_a] = result;
-        }
-    }
-
-    result
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::UntaggedValue;
-    use indexmap::indexmap;
-    use nu_source::Tag;
-
-    #[test]
-    fn did_you_mean_returns_possible_column_matches() {
-        let value = UntaggedValue::row(indexmap! {
-           "dog".to_string() => UntaggedValue::int(1).into(),
-           "cat".to_string() => UntaggedValue::int(1).into(),
-           "alt".to_string() => UntaggedValue::int(1).into(),
-        });
-
-        let source = Value {
-            tag: Tag::unknown(),
-            value,
-        };
-
-        assert_eq!(
-            Some(vec![
-                "cat".to_string(),
-                "alt".to_string(),
-                "dog".to_string()
-            ]),
-            did_you_mean(&source, "hat".to_string())
-        )
-    }
-
-    #[test]
-    fn did_you_mean_returns_no_matches_when_empty() {
-        let empty_source = Value {
-            tag: Tag::unknown(),
-            value: UntaggedValue::row(indexmap! {}),
-        };
-
-        assert_eq!(None, did_you_mean(&empty_source, "hat".to_string()))
-    }
-
-    #[test]
-    fn test_levenshtein_distance() {
-        assert_eq!(super::levenshtein_distance("hello world", "hello world"), 0);
-        assert_eq!(super::levenshtein_distance("hello", "hello world"), 6);
-        assert_eq!(super::levenshtein_distance("°C", "°C"), 0);
-        assert_eq!(super::levenshtein_distance("°", "°C"), 1);
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/iter.rs b/old_nushell/crates/nu-protocol/src/value/iter.rs
deleted file mode 100644
index b4ad830f7..000000000
--- a/old_nushell/crates/nu-protocol/src/value/iter.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::value::{UntaggedValue, Value};
-
-#[derive(Debug)]
-pub enum RowValueIter<'a> {
-    Empty,
-    Entries(indexmap::map::Iter<'a, String, Value>),
-}
-
-#[derive(Debug)]
-pub enum TableValueIter<'a> {
-    Empty,
-    Entries(std::slice::Iter<'a, Value>),
-}
-
-impl<'a> Iterator for RowValueIter<'a> {
-    type Item = (&'a String, &'a Value);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self {
-            RowValueIter::Empty => None,
-            RowValueIter::Entries(iter) => iter.next(),
-        }
-    }
-}
-
-impl<'a> Iterator for TableValueIter<'a> {
-    type Item = &'a Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match self {
-            TableValueIter::Empty => None,
-            TableValueIter::Entries(iter) => iter.next(),
-        }
-    }
-}
-
-pub fn table_entries(value: &Value) -> TableValueIter<'_> {
-    match &value.value {
-        UntaggedValue::Table(t) => TableValueIter::Entries(t.iter()),
-        _ => TableValueIter::Empty,
-    }
-}
-
-pub fn row_entries(value: &Value) -> RowValueIter<'_> {
-    match &value.value {
-        UntaggedValue::Row(o) => {
-            let iter = o.entries.iter();
-            RowValueIter::Entries(iter)
-        }
-        _ => RowValueIter::Empty,
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/primitive.rs b/old_nushell/crates/nu-protocol/src/value/primitive.rs
deleted file mode 100644
index b979df8c9..000000000
--- a/old_nushell/crates/nu-protocol/src/value/primitive.rs
+++ /dev/null
@@ -1,599 +0,0 @@
-use crate::type_name::ShellTypeName;
-use crate::value::column_path::ColumnPath;
-use crate::value::range::{Range, RangeInclusion};
-use crate::value::{serde_bigdecimal, serde_bigint};
-use bigdecimal::BigDecimal;
-use chrono::{DateTime, FixedOffset};
-use chrono_humanize::HumanTime;
-use nu_errors::{ExpectedRange, ShellError};
-use nu_source::{PrettyDebug, Span, SpannedItem};
-use num_bigint::BigInt;
-use num_integer::Integer;
-use num_traits::cast::{FromPrimitive, ToPrimitive};
-use num_traits::identities::Zero;
-use num_traits::sign::Signed;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-
-const NANOS_PER_SEC: u32 = 1_000_000_000;
-
-/// The most fundamental of structured values in Nu are the Primitive values. These values represent types like integers, strings, booleans, dates, etc
-/// that are then used as the building blocks of more complex structures.
-///
-/// Primitives also include marker values BeginningOfStream and EndOfStream which denote a change of condition in the stream
-#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Deserialize, Serialize)]
-pub enum Primitive {
-    /// An empty value
-    Nothing,
-    /// A common integer
-    Int(i64),
-    /// A "big int", an integer with arbitrarily large size (aka not limited to 64-bit)
-    #[serde(with = "serde_bigint")]
-    BigInt(BigInt),
-    /// A "big decimal", an decimal number with arbitrarily large size (aka not limited to 64-bit)
-    #[serde(with = "serde_bigdecimal")]
-    Decimal(BigDecimal),
-    /// A count in the number of bytes, used as a filesize
-    Filesize(u64),
-    /// A string value
-    String(String),
-    /// A path to travel to reach a value in a table
-    ColumnPath(ColumnPath),
-    /// A glob pattern, eg foo*
-    GlobPattern(String),
-    /// A boolean value
-    Boolean(bool),
-    /// A date value
-    Date(DateTime<FixedOffset>),
-    /// A count in the number of nanoseconds
-    #[serde(with = "serde_bigint")]
-    Duration(BigInt),
-    /// A range of values
-    Range(Box<Range>),
-    /// A file path
-    FilePath(PathBuf),
-    /// A vector of raw binary data
-    #[serde(with = "serde_bytes")]
-    Binary(Vec<u8>),
-
-    /// Beginning of stream marker, a pseudo-value not intended for tables
-    BeginningOfStream,
-    /// End of stream marker, a pseudo-value not intended for tables
-    EndOfStream,
-}
-
-impl Primitive {
-    /// Converts a primitive value to a char, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_char(&self, span: Span) -> Result<char, ShellError> {
-        match self {
-            Primitive::String(s) => {
-                if s.len() > 1 {
-                    return Err(ShellError::type_error(
-                        "char",
-                        self.type_name().spanned(span),
-                    ));
-                }
-                s.chars()
-                    .next()
-                    .ok_or_else(|| ShellError::type_error("char", self.type_name().spanned(span)))
-            }
-            other => Err(ShellError::type_error(
-                "char",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Converts a primitive value to a u64, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_usize(&self, span: Span) -> Result<usize, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_usize().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U64,
-                    &int.to_string().spanned(span),
-                    "converting an integer into an unsigned 64-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_usize().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U64,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into an unsigned 64-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Converts a primitive value to a u64, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_u64(&self, span: Span) -> Result<u64, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_u64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U64,
-                    &int.to_string().spanned(span),
-                    "converting an integer into an unsigned 64-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_u64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U64,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into an unsigned 64-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Converts a primitive value to a f64, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_f64(&self, span: Span) -> Result<f64, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_f64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::F64,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a 64-bit floating point",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_f64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::F64,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a 64-bit floating point",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Converts a primitive value to a i64, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_i64(&self, span: Span) -> Result<i64, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_i64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I64,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a signed 64-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_i64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I64,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a signed 64-bit integer",
-                )
-            }),
-            Primitive::Duration(duration) => duration.to_i64().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I64,
-                    &duration.to_string().spanned(span),
-                    "converting a duration into a signed 64-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Converts a primitive value to a u32, if possible. Uses a span to build an error if the conversion isn't possible.
-    pub fn as_u32(&self, span: Span) -> Result<u32, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_u32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U32,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a unsigned 32-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_u32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::U32,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a unsigned 32-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    pub fn as_i32(&self, span: Span) -> Result<i32, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_i32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I32,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a signed 32-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_i32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I32,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a signed 32-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    pub fn as_i16(&self, span: Span) -> Result<i16, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_i16().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I16,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a signed 16-bit integer",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_i16().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::I16,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a signed 16-bit integer",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    pub fn as_f32(&self, span: Span) -> Result<f32, ShellError> {
-        match self {
-            Primitive::Int(int) => int.to_f32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::F32,
-                    &int.to_string().spanned(span),
-                    "converting an integer into a signed 32-bit float",
-                )
-            }),
-            Primitive::Decimal(decimal) => decimal.to_f32().ok_or_else(|| {
-                ShellError::range_error(
-                    ExpectedRange::F32,
-                    &decimal.to_string().spanned(span),
-                    "converting a decimal into a signed 32-bit float",
-                )
-            }),
-            other => Err(ShellError::type_error(
-                "number",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    // FIXME: This is a bad name, but no other way to differentiate with our own Duration.
-    pub fn into_chrono_duration(self, span: Span) -> Result<chrono::Duration, ShellError> {
-        match self {
-            Primitive::Duration(duration) => {
-                // Divide into seconds because BigInt can be larger than i64
-                let (secs, nanos) = duration.div_rem(
-                    &BigInt::from_u32(NANOS_PER_SEC)
-                        .expect("Internal error: conversion from u32 failed"),
-                );
-                let secs = match secs.to_i64() {
-                    //The duration crate doesn't accept seconds bigger than i64::MAX / 1000
-                    Some(secs) => match secs.checked_mul(1000) {
-                        Some(_) => secs,
-                        None => {
-                            return Err(ShellError::labeled_error(
-                                "Internal duration conversion overflow.",
-                                "duration overflow",
-                                span,
-                            ))
-                        }
-                    },
-                    None => {
-                        return Err(ShellError::labeled_error(
-                            "Internal duration conversion overflow.",
-                            "duration overflow",
-                            span,
-                        ))
-                    }
-                };
-                // This should never fail since NANOS_PER_SEC won't overflow
-                let nanos = nanos.to_i64().expect("Unexpected i64 overflow");
-                // This should also never fail since we are adding less than NANOS_PER_SEC.
-                chrono::Duration::seconds(secs)
-                    .checked_add(&chrono::Duration::nanoseconds(nanos))
-                    .ok_or_else(|| ShellError::unexpected("Unexpected duration overflow"))
-            }
-            other => Err(ShellError::type_error(
-                "duration",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    pub fn into_string(self, span: Span) -> Result<String, ShellError> {
-        match self {
-            Primitive::String(s) => Ok(s),
-            other => Err(ShellError::type_error(
-                "string",
-                other.type_name().spanned(span),
-            )),
-        }
-    }
-
-    /// Returns true if the value is empty
-    pub fn is_empty(&self) -> bool {
-        match self {
-            Primitive::Nothing => true,
-            Primitive::String(s) => s.is_empty(),
-            _ => false,
-        }
-    }
-}
-
-impl From<bool> for Primitive {
-    /// Helper to convert from boolean to a primitive
-    fn from(b: bool) -> Primitive {
-        Primitive::Boolean(b)
-    }
-}
-
-impl From<&str> for Primitive {
-    /// Helper to convert from string slices to a primitive
-    fn from(s: &str) -> Primitive {
-        Primitive::String(s.to_string())
-    }
-}
-
-impl From<String> for Primitive {
-    /// Helper to convert from Strings to a primitive
-    fn from(s: String) -> Primitive {
-        Primitive::String(s)
-    }
-}
-
-impl From<BigDecimal> for Primitive {
-    /// Helper to convert from decimals to a Primitive value
-    fn from(decimal: BigDecimal) -> Primitive {
-        Primitive::Decimal(decimal)
-    }
-}
-
-impl From<BigInt> for Primitive {
-    /// Helper to convert from integers to a Primitive value
-    fn from(int: BigInt) -> Primitive {
-        Primitive::BigInt(int)
-    }
-}
-
-// Macro to define the From trait for native types to primitives
-// The from trait requires a converter that will be applied to the
-// native type.
-macro_rules! from_native_to_primitive {
-    ($native_type:ty, $primitive_type:expr, $converter: expr) => {
-        // e.g. from u32 -> Primitive
-        impl From<$native_type> for Primitive {
-            fn from(value: $native_type) -> Primitive {
-                if let Some(i) = $converter(value) {
-                    $primitive_type(i)
-                } else {
-                    unreachable!("Internal error: protocol did not use compatible decimal")
-                }
-            }
-        }
-    };
-}
-
-from_native_to_primitive!(i8, Primitive::Int, i64::from_i8);
-from_native_to_primitive!(i16, Primitive::Int, i64::from_i16);
-from_native_to_primitive!(i32, Primitive::Int, i64::from_i32);
-from_native_to_primitive!(i64, Primitive::Int, i64::from_i64);
-from_native_to_primitive!(u8, Primitive::Int, i64::from_u8);
-from_native_to_primitive!(u16, Primitive::Int, i64::from_u16);
-from_native_to_primitive!(u32, Primitive::Int, i64::from_u32);
-from_native_to_primitive!(u64, Primitive::BigInt, BigInt::from_u64);
-from_native_to_primitive!(f32, Primitive::Decimal, BigDecimal::from_f32);
-from_native_to_primitive!(f64, Primitive::Decimal, BigDecimal::from_f64);
-
-impl From<chrono::Duration> for Primitive {
-    fn from(duration: chrono::Duration) -> Primitive {
-        // FIXME: This is a hack since chrono::Duration does not give access to its 'nanos' field.
-        let secs: i64 = duration.num_seconds();
-        // This will never fail.
-        let nanos: u32 = duration
-            .checked_sub(&chrono::Duration::seconds(secs))
-            .expect("Unexpected overflow")
-            .num_nanoseconds()
-            .expect("Unexpected overflow") as u32;
-        Primitive::Duration(
-            BigInt::from_i64(secs * NANOS_PER_SEC as i64 + nanos as i64)
-                .expect("Internal error: can't convert from i64"),
-        )
-    }
-}
-
-impl std::fmt::Display for Primitive {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
-impl ShellTypeName for Primitive {
-    /// Get the name of the type of a Primitive value
-    fn type_name(&self) -> &'static str {
-        match self {
-            Primitive::Nothing => "nothing",
-            Primitive::Int(_) => "integer",
-            Primitive::BigInt(_) => "big integer",
-            Primitive::Range(_) => "range",
-            Primitive::Decimal(_) => "decimal",
-            Primitive::Filesize(_) => "filesize(in bytes)",
-            Primitive::String(_) => "string",
-            Primitive::ColumnPath(_) => "column path",
-            Primitive::GlobPattern(_) => "pattern",
-            Primitive::Boolean(_) => "boolean",
-            Primitive::Date(_) => "date",
-            Primitive::Duration(_) => "duration",
-            Primitive::FilePath(_) => "file path",
-            Primitive::Binary(_) => "binary",
-            Primitive::BeginningOfStream => "marker<beginning of stream>",
-            Primitive::EndOfStream => "marker<end of stream>",
-        }
-    }
-}
-
-/// Format a Primitive value into a string
-pub fn format_primitive(primitive: &Primitive, field_name: Option<&String>) -> String {
-    match primitive {
-        Primitive::Nothing => String::new(),
-        Primitive::BeginningOfStream => String::new(),
-        Primitive::EndOfStream => String::new(),
-        Primitive::FilePath(p) => p.display().to_string(),
-        Primitive::Filesize(num_bytes) => {
-            if let Some(value) = num_bytes.to_u128() {
-                let byte = byte_unit::Byte::from_bytes(value);
-
-                if byte.get_bytes() == 0u128 {
-                    return "—".to_string();
-                }
-
-                let byte = byte.get_appropriate_unit(false);
-
-                match byte.get_unit() {
-                    byte_unit::ByteUnit::B => format!("{} B ", byte.get_value()),
-                    _ => byte.format(1),
-                }
-            } else {
-                format!("{} B", num_bytes)
-            }
-        }
-        Primitive::Duration(duration) => format_duration(duration),
-        Primitive::Int(i) => i.to_string(),
-        Primitive::BigInt(i) => i.to_string(),
-        Primitive::Decimal(decimal) => {
-            // TODO: We should really pass the precision in here instead of hard coding it
-            let decimal_string = decimal.to_string();
-            let decimal_places: Vec<&str> = decimal_string.split('.').collect();
-            if decimal_places.len() == 2 && decimal_places[1].len() > 4 {
-                format!("{:.4}", decimal)
-            } else {
-                decimal.to_string()
-            }
-        }
-        Primitive::Range(range) => format!(
-            "{}..{}{}",
-            format_primitive(&range.from.0.item, None),
-            if range.to.1 == RangeInclusion::Exclusive {
-                "<"
-            } else {
-                ""
-            },
-            format_primitive(&range.to.0.item, None)
-        ),
-        Primitive::GlobPattern(s) => s.to_string(),
-        Primitive::String(s) => s.to_owned(),
-        Primitive::ColumnPath(p) => {
-            let mut members = p.iter();
-            let mut f = String::new();
-
-            f.push_str(
-                &members
-                    .next()
-                    .expect("BUG: column path with zero members")
-                    .display(),
-            );
-
-            for member in members {
-                f.push('.');
-                f.push_str(&member.display())
-            }
-
-            f
-        }
-        Primitive::Boolean(b) => match (b, field_name) {
-            (true, None) => "true",
-            (false, None) => "false",
-            (true, Some(s)) if !s.is_empty() => s,
-            (false, Some(s)) if !s.is_empty() => "",
-            (true, Some(_)) => "true",
-            (false, Some(_)) => "false",
-        }
-        .to_owned(),
-        Primitive::Binary(_) => "<binary>".to_owned(),
-        Primitive::Date(d) => format_date(d),
-    }
-}
-
-/// Format a duration in nanoseconds into a string
-pub fn format_duration(duration: &BigInt) -> String {
-    let is_zero = duration.is_zero();
-    // FIXME: This involves a lot of allocation, but it seems inevitable with BigInt.
-    let big_int_1000 = BigInt::from(1000);
-    let big_int_60 = BigInt::from(60);
-    let big_int_24 = BigInt::from(24);
-    // We only want the biggest subdivision to have the negative sign.
-    let (sign, duration) = if duration.is_zero() || duration.is_positive() {
-        (1, duration.clone())
-    } else {
-        (-1, -duration)
-    };
-    let (micros, nanos): (BigInt, BigInt) = duration.div_rem(&big_int_1000);
-    let (millis, micros): (BigInt, BigInt) = micros.div_rem(&big_int_1000);
-    let (secs, millis): (BigInt, BigInt) = millis.div_rem(&big_int_1000);
-    let (mins, secs): (BigInt, BigInt) = secs.div_rem(&big_int_60);
-    let (hours, mins): (BigInt, BigInt) = mins.div_rem(&big_int_60);
-    let (days, hours): (BigInt, BigInt) = hours.div_rem(&big_int_24);
-
-    let mut output_prep = vec![];
-
-    if !days.is_zero() {
-        output_prep.push(format!("{}day", days));
-    }
-
-    if !hours.is_zero() {
-        output_prep.push(format!("{}hr", hours));
-    }
-
-    if !mins.is_zero() {
-        output_prep.push(format!("{}min", mins));
-    }
-    // output 0sec for zero duration
-    if is_zero || !secs.is_zero() {
-        output_prep.push(format!("{}sec", secs));
-    }
-
-    if !millis.is_zero() {
-        output_prep.push(format!("{}ms", millis));
-    }
-
-    if !micros.is_zero() {
-        output_prep.push(format!("{}us", micros));
-    }
-
-    if !nanos.is_zero() {
-        output_prep.push(format!("{}ns", nanos));
-    }
-
-    format!(
-        "{}{}",
-        if sign == -1 { "-" } else { "" },
-        output_prep.join(" ")
-    )
-}
-
-/// Format a date value into a humanized string (eg "1 week ago" instead of a formal date string)
-pub fn format_date(d: &DateTime<FixedOffset>) -> String {
-    HumanTime::from(*d).to_string()
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/range.rs b/old_nushell/crates/nu-protocol/src/value/range.rs
deleted file mode 100644
index 77b27b996..000000000
--- a/old_nushell/crates/nu-protocol/src/value/range.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use crate::value::Primitive;
-use derive_new::new;
-use nu_errors::ShellError;
-use nu_source::{DbgDocBldr, DebugDocBuilder, Spanned};
-use serde::{Deserialize, Serialize};
-
-/// The two types of ways to include a range end. Inclusive means to include the value (eg 1..3 inclusive would include the 3 value).
-/// Exclusive excludes the value (eg 1..3 exclusive does not include 3 value)
-#[derive(Debug, Copy, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize)]
-pub enum RangeInclusion {
-    Inclusive,
-    Exclusive,
-}
-
-impl RangeInclusion {
-    /// Get a RangeInclusion left bracket ready for pretty printing
-    pub fn debug_left_bracket(self) -> DebugDocBuilder {
-        DbgDocBldr::delimiter(match self {
-            RangeInclusion::Exclusive => "(",
-            RangeInclusion::Inclusive => "[",
-        })
-    }
-
-    /// Get a RangeInclusion right bracket ready for pretty printing
-    pub fn debug_right_bracket(self) -> DebugDocBuilder {
-        DbgDocBldr::delimiter(match self {
-            RangeInclusion::Exclusive => ")",
-            RangeInclusion::Inclusive => "]",
-        })
-    }
-}
-
-/// The range definition, holding the starting and end point of the range
-#[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash, Serialize, Deserialize, new)]
-pub struct Range {
-    pub from: (Spanned<Primitive>, RangeInclusion),
-    pub to: (Spanned<Primitive>, RangeInclusion),
-}
-
-impl Range {
-    pub fn min_u64(&self) -> Result<u64, ShellError> {
-        let (from, range_incl) = &self.from;
-
-        let minval = if let Primitive::Nothing = from.item {
-            u64::MIN
-        } else {
-            from.item.as_u64(from.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(minval),
-            RangeInclusion::Exclusive => Ok(minval.saturating_add(1)),
-        }
-    }
-
-    pub fn max_u64(&self) -> Result<u64, ShellError> {
-        let (to, range_incl) = &self.to;
-
-        let maxval = if let Primitive::Nothing = to.item {
-            u64::MAX
-        } else {
-            to.item.as_u64(to.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(maxval),
-            RangeInclusion::Exclusive => Ok(maxval.saturating_sub(1)),
-        }
-    }
-
-    pub fn min_i64(&self) -> Result<i64, ShellError> {
-        let (from, range_incl) = &self.from;
-
-        let minval = if let Primitive::Nothing = from.item {
-            0
-        } else {
-            from.item.as_i64(from.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(minval),
-            RangeInclusion::Exclusive => Ok(minval.saturating_add(1)),
-        }
-    }
-
-    pub fn max_i64(&self) -> Result<i64, ShellError> {
-        let (to, range_incl) = &self.to;
-
-        let maxval = if let Primitive::Nothing = to.item {
-            i64::MAX
-        } else {
-            to.item.as_i64(to.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(maxval),
-            RangeInclusion::Exclusive => Ok(maxval.saturating_sub(1)),
-        }
-    }
-
-    pub fn min_usize(&self) -> Result<usize, ShellError> {
-        let (from, range_incl) = &self.from;
-
-        let minval = if let Primitive::Nothing = from.item {
-            usize::MIN
-        } else {
-            from.item.as_usize(from.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(minval),
-            RangeInclusion::Exclusive => Ok(minval.saturating_add(1)),
-        }
-    }
-
-    pub fn max_usize(&self) -> Result<usize, ShellError> {
-        let (to, range_incl) = &self.to;
-
-        let maxval = if let Primitive::Nothing = to.item {
-            usize::MAX
-        } else {
-            to.item.as_usize(to.span)?
-        };
-
-        match range_incl {
-            RangeInclusion::Inclusive => Ok(maxval),
-            RangeInclusion::Exclusive => Ok(maxval.saturating_sub(1)),
-        }
-    }
-
-    pub fn min_f64(&self) -> Result<f64, ShellError> {
-        let from = &self.from.0;
-
-        if let Primitive::Nothing = from.item {
-            Ok(f64::MIN)
-        } else {
-            Ok(from.item.as_f64(from.span)?)
-        }
-
-        // How would inclusive vs. exclusive range work here?
-    }
-
-    pub fn max_f64(&self) -> Result<f64, ShellError> {
-        let to = &self.to.0;
-
-        if let Primitive::Nothing = to.item {
-            Ok(f64::MAX)
-        } else {
-            Ok(to.item.as_f64(to.span)?)
-        }
-
-        // How would inclusive vs. exclusive range work here?
-    }
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/serde_bigdecimal.rs b/old_nushell/crates/nu-protocol/src/value/serde_bigdecimal.rs
deleted file mode 100644
index 5d8860aff..000000000
--- a/old_nushell/crates/nu-protocol/src/value/serde_bigdecimal.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use bigdecimal::BigDecimal;
-
-/// Enable big decimal serialization by providing a `serialize` function
-pub fn serialize<S>(big_decimal: &BigDecimal, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    serde::Serialize::serialize(&big_decimal.to_string(), serializer)
-}
-
-/// Enable big decimal deserialization by providing a `deserialize` function
-pub fn deserialize<'de, D>(deserializer: D) -> Result<BigDecimal, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let x: String = serde::Deserialize::deserialize(deserializer)?;
-    BigDecimal::parse_bytes(x.as_bytes(), 10)
-        .ok_or_else(|| serde::de::Error::custom("expected a bigdecimal"))
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/serde_bigint.rs b/old_nushell/crates/nu-protocol/src/value/serde_bigint.rs
deleted file mode 100644
index ee455e21f..000000000
--- a/old_nushell/crates/nu-protocol/src/value/serde_bigint.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use num_bigint::BigInt;
-
-/// Enable big int serialization by providing a `serialize` function
-pub fn serialize<S>(big_int: &BigInt, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    serde::Serialize::serialize(&big_int.to_string(), serializer)
-}
-
-/// Enable big int deserialization by providing a `deserialize` function
-pub fn deserialize<'de, D>(deserializer: D) -> Result<BigInt, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let x: String = serde::Deserialize::deserialize(deserializer)?;
-
-    BigInt::parse_bytes(x.as_bytes(), 10)
-        .ok_or_else(|| serde::de::Error::custom("expected a bignum"))
-}
diff --git a/old_nushell/crates/nu-protocol/src/value/unit.rs b/old_nushell/crates/nu-protocol/src/value/unit.rs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/old_nushell/crates/nu-protocol/src/value/value_structure.rs b/old_nushell/crates/nu-protocol/src/value/value_structure.rs
deleted file mode 100644
index d57e75615..000000000
--- a/old_nushell/crates/nu-protocol/src/value/value_structure.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use crate::{UntaggedValue, Value};
-use nu_errors::ShellError;
-use std::path::{Component, Path, PathBuf};
-
-fn is_value_tagged_dir(value: &Value) -> bool {
-    matches!(
-        &value.value,
-        UntaggedValue::Row(_) | UntaggedValue::Table(_)
-    )
-}
-
-#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
-pub struct ValueResource {
-    pub at: usize,
-    pub loc: PathBuf,
-}
-
-impl ValueResource {}
-
-#[derive(Default, Debug)]
-pub struct ValueStructure {
-    pub resources: Vec<ValueResource>,
-}
-
-impl ValueStructure {
-    pub fn new() -> ValueStructure {
-        ValueStructure {
-            resources: Vec::<ValueResource>::new(),
-        }
-    }
-
-    pub fn exists(&self, path: &Path) -> bool {
-        if path == Path::new("/") {
-            return true;
-        }
-
-        let path = if path.starts_with("/") {
-            path.strip_prefix("/").unwrap_or(path)
-        } else {
-            path
-        };
-
-        let comps: Vec<_> = path.components().map(Component::as_os_str).collect();
-
-        let mut is_there = true;
-
-        for (at, fragment) in comps.iter().enumerate() {
-            is_there = is_there
-                && self
-                    .resources
-                    .iter()
-                    .any(|resource| at == resource.at && *fragment == resource.loc.as_os_str());
-        }
-
-        is_there
-    }
-
-    pub fn walk_decorate(&mut self, start: &Value) -> Result<(), ShellError> {
-        self.resources = Vec::<ValueResource>::new();
-        self.build(start, 0)?;
-        self.resources.sort();
-
-        Ok(())
-    }
-
-    fn build(&mut self, src: &Value, lvl: usize) -> Result<(), ShellError> {
-        for entry in src.row_entries() {
-            let value = entry.1;
-            let path = entry.0;
-
-            self.resources.push(ValueResource {
-                at: lvl,
-                loc: PathBuf::from(path),
-            });
-
-            if is_value_tagged_dir(value) {
-                self.build(value, lvl + 1)?;
-            }
-        }
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu-serde/Cargo.toml b/old_nushell/crates/nu-serde/Cargo.toml
deleted file mode 100644
index 602e050d6..000000000
--- a/old_nushell/crates/nu-serde/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "nu-serde"
-version = "0.43.0"
-edition = "2018"
-authors = ["The Nu Project Contributors"]
-description = "Turn any value into a nu-protocol::Value with serde"
-license = "MIT"
-repository = "https://github.com/nushell/nushell"
-documentation = "https://docs.rs/nu-serde"
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-nu-protocol = { version = "0.43.0", path = "../nu-protocol" }
-nu-source = { version = "0.43.0", path = "../nu-source" }
-serde = "1"
-thiserror = "1"
-
-[dev-dependencies]
-insta = "1"
diff --git a/old_nushell/crates/nu-serde/README.md b/old_nushell/crates/nu-serde/README.md
deleted file mode 100644
index 75aca0121..000000000
--- a/old_nushell/crates/nu-serde/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# `serde-nu`
-
-Convert any value implementing `serde::Serialize` into a
-`nu_protocol::Value` using `nu_serde::to_value`. Compare the below manual
-implemeentation and the one using `nu_serde`.
-
-```rust
-use nu_protocol::{Dictionary, Primitive, UntaggedValue, Value};
-use nu_source::Tag;
-use serde::Serialize;
-
-#[derive(Serialize)]
-struct MyStruct {
-    index: usize,
-    name: String,
-}
-
-fn manual(s: MyStruct, tag: Tag) -> Value {
-    let mut dict = Dictionary::default();
-    dict.insert(
-        "index".into(),
-        Value {
-            value: UntaggedValue::Primitive(Primitive::Int(s.index as i64)),
-            tag: tag.clone(),
-        },
-    );
-    dict.insert(
-        "name".into(),
-        Value {
-            value: UntaggedValue::Primitive(Primitive::String(s.name)),
-            tag: tag.clone(),
-        },
-    );
-
-    Value {
-        value: UntaggedValue::Row(dict),
-        tag,
-    }
-}
-
-fn auto(s: &MyStruct, tag: Tag) -> Value {
-    nu_serde::to_value(s, tag).unwrap()
-}
-```
diff --git a/old_nushell/crates/nu-serde/src/lib.rs b/old_nushell/crates/nu-serde/src/lib.rs
deleted file mode 100644
index e07a62c26..000000000
--- a/old_nushell/crates/nu-serde/src/lib.rs
+++ /dev/null
@@ -1,485 +0,0 @@
-//! Convert any value implementing `serde::Serialize` into a
-//! `nu_protocol::Value` using `nu_serde::to_value`. Compare the below manual
-//! implemeentation and the one using `nu_serde`.
-//!
-//! ```
-//! use nu_protocol::{Dictionary, Primitive, UntaggedValue, Value};
-//! use nu_source::Tag;
-//! use serde::Serialize;
-//!
-//! #[derive(Serialize)]
-//! struct MyStruct {
-//!     index: usize,
-//!     name: String,
-//! }
-//!
-//! fn manual(s: MyStruct, tag: Tag) -> Value {
-//!     let mut dict = Dictionary::default();
-//!     dict.insert(
-//!         "index".into(),
-//!         Value {
-//!             value: UntaggedValue::Primitive(Primitive::Int(s.index as i64)),
-//!             tag: tag.clone(),
-//!         },
-//!     );
-//!     dict.insert(
-//!         "name".into(),
-//!         Value {
-//!             value: UntaggedValue::Primitive(Primitive::String(s.name)),
-//!             tag: tag.clone(),
-//!         },
-//!     );
-//!
-//!     Value {
-//!         value: UntaggedValue::Row(dict),
-//!         tag,
-//!     }
-//! }
-//!
-//! fn auto(s: &MyStruct, tag: Tag) -> Value {
-//!     nu_serde::to_value(s, tag).unwrap()
-//! }
-//! ```
-
-use bigdecimal::{BigDecimal, FromPrimitive};
-use nu_protocol::value::dict::Dictionary;
-use nu_protocol::{Primitive, ReturnSuccess, ReturnValue, UntaggedValue, Value};
-use nu_source::Tag;
-use serde::Serialize;
-
-#[cfg(test)]
-mod test;
-
-#[derive(Debug, thiserror::Error, Serialize)]
-pub enum Error {
-    #[error("{0}")]
-    SerdeCustom(String),
-
-    #[error("Expceted serializer to provide map implementation with a key before value")]
-    MapValueLackedKey,
-
-    #[error("Expceted map key to be string, found {0:?}")]
-    InvalidMapKey(Value),
-
-    #[error("Failed to convert f32 value into BigDecimal")]
-    F32BigDecimalError(f32),
-
-    #[error("Failed to convert f64 value into BigDecimal")]
-    F64BigDecimalError(f64),
-}
-
-impl serde::ser::Error for Error {
-    fn custom<T>(msg: T) -> Self
-    where
-        T: std::fmt::Display,
-    {
-        Self::SerdeCustom(msg.to_string())
-    }
-}
-
-/// Convert any value into a `nu_protocol::Value`
-pub fn to_value<T>(value: T, tag: impl Into<Tag>) -> Result<Value, Error>
-where
-    T: Serialize,
-{
-    value.serialize(&Serializer { tag: tag.into() })
-}
-
-/// Convenience function that takes an iterator over values and turns them into
-/// a `Vec<ReturnValue>` (all successful). This is necessary for the return
-/// signatures of most functions in the `nu_plugin::Plugin` trait.
-pub fn to_success_return_values<T>(
-    values: impl IntoIterator<Item = T>,
-    tag: impl Into<Tag>,
-) -> Result<Vec<ReturnValue>, Error>
-where
-    T: Serialize,
-{
-    let tag = tag.into();
-
-    let mut out_values = Vec::new();
-
-    for value in values {
-        let value = to_value(&value, &tag)?;
-
-        out_values.push(ReturnValue::Ok(ReturnSuccess::Value(value)));
-    }
-
-    Ok(out_values)
-}
-
-struct Serializer {
-    tag: Tag,
-}
-
-struct SeqSerializer<'a> {
-    seq: Vec<Value>,
-    serializer: &'a Serializer,
-}
-
-struct MapSerializer<'a> {
-    dict: Dictionary,
-    serializer: &'a Serializer,
-    current_key: Option<String>,
-}
-
-impl Serializer {
-    fn value(&self, untagged: UntaggedValue) -> Value {
-        Value {
-            value: untagged,
-            tag: self.tag.clone(),
-        }
-    }
-}
-
-impl<'a> serde::ser::SerializeSeq for SeqSerializer<'a> {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.seq.push(value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
-    }
-}
-
-impl<'a> serde::ser::SerializeTuple for SeqSerializer<'a> {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.seq.push(value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
-    }
-}
-
-impl<'a> serde::ser::SerializeTupleStruct for SeqSerializer<'a> {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.seq.push(value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
-    }
-}
-
-impl<'a> serde::ser::SerializeTupleVariant for SeqSerializer<'a> {
-    type Ok = Value;
-
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.seq.push(value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Table(self.seq)))
-    }
-}
-
-impl<'a> serde::ser::SerializeMap for MapSerializer<'a> {
-    type Ok = Value;
-    type Error = Error;
-
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        let key_value = key.serialize(self.serializer)?;
-
-        let key = match key_value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => s,
-            _ => return Err(Error::InvalidMapKey(key_value)),
-        };
-
-        self.current_key = Some(key);
-
-        Ok(())
-    }
-
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        let key = self.current_key.take().ok_or(Error::MapValueLackedKey)?;
-
-        self.dict.insert(key, value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
-    }
-}
-
-impl<'a> serde::ser::SerializeStruct for MapSerializer<'a> {
-    type Ok = Value;
-
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.dict
-            .insert(key.to_owned(), value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
-    }
-}
-
-impl<'a> serde::ser::SerializeStructVariant for MapSerializer<'a> {
-    type Ok = Value;
-
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        self.dict
-            .insert(key.to_owned(), value.serialize(self.serializer)?);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.serializer.value(UntaggedValue::Row(self.dict)))
-    }
-}
-
-impl<'a> SeqSerializer<'a> {
-    fn new(serializer: &'a Serializer) -> Self {
-        Self {
-            seq: Vec::new(),
-            serializer,
-        }
-    }
-}
-
-impl<'a> MapSerializer<'a> {
-    fn new(serializer: &'a Serializer) -> Self {
-        Self {
-            dict: Dictionary::default(),
-            current_key: None,
-            serializer,
-        }
-    }
-}
-
-impl<'a> serde::Serializer for &'a Serializer {
-    type Ok = Value;
-    type Error = Error;
-
-    type SerializeSeq = SeqSerializer<'a>;
-    type SerializeTuple = SeqSerializer<'a>;
-    type SerializeTupleStruct = SeqSerializer<'a>;
-    type SerializeTupleVariant = SeqSerializer<'a>;
-    type SerializeMap = MapSerializer<'a>;
-    type SerializeStruct = MapSerializer<'a>;
-    type SerializeStructVariant = MapSerializer<'a>;
-
-    fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Boolean(v))))
-    }
-
-    fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Int(v as i64))))
-    }
-
-    fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::BigInt(v.into()))))
-    }
-
-    fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Decimal(
-            BigDecimal::from_f32(v).ok_or(Error::F32BigDecimalError(v))?,
-        ))))
-    }
-
-    fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Decimal(
-            BigDecimal::from_f64(v).ok_or(Error::F64BigDecimalError(v))?,
-        ))))
-    }
-
-    fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::String(v.into()))))
-    }
-
-    fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::String(v.into()))))
-    }
-
-    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Binary(v.into()))))
-    }
-
-    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
-    }
-
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
-    where
-        T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
-        // TODO: is this OK?
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
-    }
-
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
-        // TODO: is this OK?
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
-    }
-
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-    ) -> Result<Self::Ok, Self::Error> {
-        // TODO: is this OK?
-        Ok(self.value(UntaggedValue::Primitive(Primitive::Nothing)))
-    }
-
-    fn serialize_newtype_struct<T: ?Sized>(
-        self,
-        _name: &'static str,
-        value: &T,
-    ) -> Result<Self::Ok, Self::Error>
-    where
-        T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_newtype_variant<T: ?Sized>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        value: &T,
-    ) -> Result<Self::Ok, Self::Error>
-    where
-        T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(SeqSerializer::new(self))
-    }
-
-    fn serialize_tuple(self, _len: usize) -> Result<Self::SerializeTuple, Self::Error> {
-        Ok(SeqSerializer::new(self))
-    }
-
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
-        Ok(SeqSerializer::new(self))
-    }
-
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
-        Ok(SeqSerializer::new(self))
-    }
-
-    fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(MapSerializer::new(self))
-    }
-
-    fn serialize_struct(
-        self,
-        _name: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        Ok(MapSerializer::new(self))
-    }
-
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Ok(MapSerializer::new(self))
-    }
-}
diff --git a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_serializes_return_value_list.snap b/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_serializes_return_value_list.snap
deleted file mode 100644
index 72df45f59..000000000
--- a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_serializes_return_value_list.snap
+++ /dev/null
@@ -1,81 +0,0 @@
----
-source: src/test.rs
-expression: "to_success_return_values(vec![4i32, 10, 8843234, 100])"
-
----
-Ok(
-    [
-        Ok(
-            Value(
-                Value {
-                    value: Primitive(
-                        Int(
-                            4,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-            ),
-        ),
-        Ok(
-            Value(
-                Value {
-                    value: Primitive(
-                        Int(
-                            10,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-            ),
-        ),
-        Ok(
-            Value(
-                Value {
-                    value: Primitive(
-                        Int(
-                            8843234,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-            ),
-        ),
-        Ok(
-            Value(
-                Value {
-                    value: Primitive(
-                        Int(
-                            100,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-            ),
-        ),
-    ],
-)
diff --git a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_complex_structs.snap b/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_complex_structs.snap
deleted file mode 100644
index cb0be7011..000000000
--- a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_complex_structs.snap
+++ /dev/null
@@ -1,173 +0,0 @@
----
-source: src/test.rs
-expression: "to_value(&Complex{index: -40, x: 32.8, y: 38.2, map,})"
-
----
-Ok(
-    Value {
-        value: Row(
-            Dictionary {
-                entries: {
-                    "index": Value {
-                        value: Primitive(
-                            Int(
-                                -40,
-                            ),
-                        ),
-                        tag: Tag {
-                            anchor: None,
-                            span: Span {
-                                start: 0,
-                                end: 0,
-                            },
-                        },
-                    },
-                    "x": Value {
-                        value: Primitive(
-                            Decimal(
-                                BigDecimal("32.80000"),
-                            ),
-                        ),
-                        tag: Tag {
-                            anchor: None,
-                            span: Span {
-                                start: 0,
-                                end: 0,
-                            },
-                        },
-                    },
-                    "y": Value {
-                        value: Primitive(
-                            Decimal(
-                                BigDecimal("38.20000000000000"),
-                            ),
-                        ),
-                        tag: Tag {
-                            anchor: None,
-                            span: Span {
-                                start: 0,
-                                end: 0,
-                            },
-                        },
-                    },
-                    "map": Value {
-                        value: Row(
-                            Dictionary {
-                                entries: {
-                                    "coconuts": Value {
-                                        value: Table(
-                                            [
-                                                Value {
-                                                    value: Primitive(
-                                                        Int(
-                                                            4,
-                                                        ),
-                                                    ),
-                                                    tag: Tag {
-                                                        anchor: None,
-                                                        span: Span {
-                                                            start: 0,
-                                                            end: 0,
-                                                        },
-                                                    },
-                                                },
-                                            ],
-                                        ),
-                                        tag: Tag {
-                                            anchor: None,
-                                            span: Span {
-                                                start: 0,
-                                                end: 0,
-                                            },
-                                        },
-                                    },
-                                    "mahi mahi": Value {
-                                        value: Table(
-                                            [],
-                                        ),
-                                        tag: Tag {
-                                            anchor: None,
-                                            span: Span {
-                                                start: 0,
-                                                end: 0,
-                                            },
-                                        },
-                                    },
-                                    "tilapia": Value {
-                                        value: Table(
-                                            [
-                                                Value {
-                                                    value: Primitive(
-                                                        Int(
-                                                            16,
-                                                        ),
-                                                    ),
-                                                    tag: Tag {
-                                                        anchor: None,
-                                                        span: Span {
-                                                            start: 0,
-                                                            end: 0,
-                                                        },
-                                                    },
-                                                },
-                                                Value {
-                                                    value: Primitive(
-                                                        Int(
-                                                            3,
-                                                        ),
-                                                    ),
-                                                    tag: Tag {
-                                                        anchor: None,
-                                                        span: Span {
-                                                            start: 0,
-                                                            end: 0,
-                                                        },
-                                                    },
-                                                },
-                                                Value {
-                                                    value: Primitive(
-                                                        Int(
-                                                            24,
-                                                        ),
-                                                    ),
-                                                    tag: Tag {
-                                                        anchor: None,
-                                                        span: Span {
-                                                            start: 0,
-                                                            end: 0,
-                                                        },
-                                                    },
-                                                },
-                                            ],
-                                        ),
-                                        tag: Tag {
-                                            anchor: None,
-                                            span: Span {
-                                                start: 0,
-                                                end: 0,
-                                            },
-                                        },
-                                    },
-                                },
-                            },
-                        ),
-                        tag: Tag {
-                            anchor: None,
-                            span: Span {
-                                start: 0,
-                                end: 0,
-                            },
-                        },
-                    },
-                },
-            },
-        ),
-        tag: Tag {
-            anchor: None,
-            span: Span {
-                start: 0,
-                end: 0,
-            },
-        },
-    },
-)
diff --git a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_lists_of_values.snap b/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_lists_of_values.snap
deleted file mode 100644
index 151e813bb..000000000
--- a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_lists_of_values.snap
+++ /dev/null
@@ -1,76 +0,0 @@
----
-source: src/test.rs
-expression: "to_value(&vec![4i32, 10, 8843234, 100])"
-
----
-Ok(
-    Value {
-        value: Table(
-            [
-                Value {
-                    value: Primitive(
-                        Int(
-                            4,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-                Value {
-                    value: Primitive(
-                        Int(
-                            10,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-                Value {
-                    value: Primitive(
-                        Int(
-                            8843234,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-                Value {
-                    value: Primitive(
-                        Int(
-                            100,
-                        ),
-                    ),
-                    tag: Tag {
-                        anchor: None,
-                        span: Span {
-                            start: 0,
-                            end: 0,
-                        },
-                    },
-                },
-            ],
-        ),
-        tag: Tag {
-            anchor: None,
-            span: Span {
-                start: 0,
-                end: 0,
-            },
-        },
-    },
-)
diff --git a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_single_integers.snap b/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_single_integers.snap
deleted file mode 100644
index 0a8f0d160..000000000
--- a/old_nushell/crates/nu-serde/src/snapshots/nu_serde__test__it_works_with_single_integers.snap
+++ /dev/null
@@ -1,21 +0,0 @@
----
-source: src/test.rs
-expression: to_value(&4i32)
-
----
-Ok(
-    Value {
-        value: Primitive(
-            Int(
-                4,
-            ),
-        ),
-        tag: Tag {
-            anchor: None,
-            span: Span {
-                start: 0,
-                end: 0,
-            },
-        },
-    },
-)
diff --git a/old_nushell/crates/nu-serde/src/test.rs b/old_nushell/crates/nu-serde/src/test.rs
deleted file mode 100644
index dea0263ee..000000000
--- a/old_nushell/crates/nu-serde/src/test.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use crate::{to_success_return_values, to_value};
-use insta::assert_debug_snapshot;
-use nu_source::Tag;
-use serde::Serialize;
-use std::collections::BTreeMap;
-
-#[test]
-fn it_works_with_single_integers() {
-    assert_debug_snapshot!(to_value(&4i32, Tag::default()));
-}
-
-#[test]
-fn it_works_with_lists_of_values() {
-    assert_debug_snapshot!(to_value(&vec![4i32, 10, 8843234, 100], Tag::default()));
-}
-
-#[test]
-fn it_works_with_complex_structs() {
-    #[derive(Serialize, Debug)]
-    struct Complex {
-        index: i64,
-        x: f32,
-        y: f64,
-        map: BTreeMap<String, Vec<u8>>,
-    }
-
-    let mut map = BTreeMap::new();
-
-    map.insert("coconuts".into(), vec![4]);
-    map.insert("tilapia".into(), vec![16, 3, 24]);
-    map.insert("mahi mahi".into(), vec![]);
-
-    assert_debug_snapshot!(to_value(
-        &Complex {
-            index: -40,
-            x: 32.8,
-            y: 38.2,
-            map
-        },
-        Tag::default()
-    ));
-}
-
-#[test]
-fn it_serializes_return_value_list() {
-    assert_debug_snapshot!(to_success_return_values(
-        vec![4i32, 10, 8843234, 100],
-        Tag::default()
-    ));
-}
diff --git a/old_nushell/crates/nu-source/Cargo.toml b/old_nushell/crates/nu-source/Cargo.toml
deleted file mode 100644
index 9ce9ce738..000000000
--- a/old_nushell/crates/nu-source/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A source string characterizer for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-source"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-derive-new = "0.5.8"
-getset = "0.1.1"
-pretty = "0.5.2"
-serde = { version="1.0", features=["derive"] }
-termcolor = "1.1.2"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu-source/README.md b/old_nushell/crates/nu-source/README.md
deleted file mode 100644
index bfdbd825d..000000000
--- a/old_nushell/crates/nu-source/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# nu-source
-
-## Overview
-
-The `nu-source` crate contains types and traits used for keeping track of _metadata_ about values being processed.
-Nu uses `Tag`s to keep track of where a value came from, an `AnchorLocation`,
-as well as positional information about the value, a `Span`.
-An `AnchorLocation` can be a `Url`, `File`, or `Source` text that a value was parsed from.
-The source `Text` is special in that it is a type similar to a `String` that comes with the ability to be cheaply cloned.
-A `Span` keeps track of a value's `start` and `end` positions.
-These types make up the metadata for a value and are wrapped up together in a `Tagged` struct,
-which holds everything needed to track and locate a value.
-
-Nu's metadata system can be seen when reporting errors.
-In the following example Nu is able to report to the user where the typo of a column originated from.
-
-```shell
-1 | ls | get typ
-  |          ^^^ did you mean 'type'?
-```
-
-In addition to metadata tracking, `nu-source` also contains types and traits
-related to debugging, tracing, and formatting the metadata and values it processes.
-
-## Other Resources
-
-- [Nushell Github Project](https://github.com/nushell):
-  Contains all projects in the Nushell ecosystem such as the source code to Nushell as well as website and books.
-- [Nushell Git Repository](https://github.com/nushell/nushell):
-  A direct link to the source git repository for Nushell
-- [Nushell Contributor Book](https://github.com/nushell/contributor-book):
-  An overview of topics about Nushell to help you get started contributing to the project.
-- [Discord Channel](https://discordapp.com/invite/NtAbbGn)
-- [Twitter](https://twitter.com/nu_shell)
diff --git a/old_nushell/crates/nu-source/src/lib.rs b/old_nushell/crates/nu-source/src/lib.rs
deleted file mode 100644
index ac4c5228d..000000000
--- a/old_nushell/crates/nu-source/src/lib.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-mod meta;
-mod pretty;
-mod term_colored;
-mod text;
-
-pub use self::meta::{
-    span_for_spanned_list, tag_for_tagged_list, AnchorLocation, HasFallibleSpan, HasSpan, HasTag,
-    IntoSpanned, Span, Spanned, SpannedItem, Tag, Tagged, TaggedItem,
-};
-pub use self::pretty::{
-    DbgDocBldr, DebugDoc, DebugDocBuilder, PrettyDebug, PrettyDebugRefineKind,
-    PrettyDebugWithSource, ShellAnnotation,
-};
-pub use self::term_colored::TermColored;
-pub use self::text::Text;
diff --git a/old_nushell/crates/nu-source/src/meta.rs b/old_nushell/crates/nu-source/src/meta.rs
deleted file mode 100644
index c2a4dda35..000000000
--- a/old_nushell/crates/nu-source/src/meta.rs
+++ /dev/null
@@ -1,841 +0,0 @@
-use crate::pretty::{DbgDocBldr, DebugDocBuilder, PrettyDebugWithSource};
-use crate::text::Text;
-
-use derive_new::new;
-use getset::Getters;
-use serde::Deserialize;
-use serde::Serialize;
-use std::cmp::Ordering;
-use std::path::{Path, PathBuf};
-
-/// Anchors represent a location that a value originated from. The value may have been loaded from a file, fetched from a website, or parsed from some text
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum AnchorLocation {
-    /// The originating site where the value was first found
-    Url(String),
-    /// The original file where the value was loaded from
-    File(String),
-    /// The text where the value was parsed from
-    Source(Text),
-}
-
-pub trait HasTag {
-    /// Get the associated metadata
-    fn tag(&self) -> Tag;
-}
-
-/// A wrapper type that attaches a Span to a value
-#[derive(new, Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, Hash)]
-pub struct Spanned<T> {
-    pub span: Span,
-    pub item: T,
-}
-
-impl<T> Spanned<T> {
-    /// Allows mapping over a Spanned value
-    pub fn map<U>(self, input: impl FnOnce(T) -> U) -> Spanned<U> {
-        let span = self.span;
-
-        let mapped = input(self.item);
-        mapped.spanned(span)
-    }
-}
-
-impl Spanned<String> {
-    /// Iterates over the contained String
-    pub fn items<'a, U>(
-        items: impl Iterator<Item = &'a Spanned<String>>,
-    ) -> impl Iterator<Item = &'a str> {
-        items.map(|item| &item.item[..])
-    }
-
-    /// Borrows the contained String
-    pub fn borrow_spanned(&self) -> Spanned<&str> {
-        let span = self.span;
-        self.item[..].spanned(span)
-    }
-
-    pub fn slice_spanned(&self, span: impl Into<Span>) -> Spanned<&str> {
-        let span = span.into();
-        let item = &self.item[span.start()..span.end()];
-        item.spanned(span)
-    }
-}
-
-pub trait SpannedItem: Sized {
-    /// Converts a value into a Spanned value
-    fn spanned(self, span: impl Into<Span>) -> Spanned<Self> {
-        Spanned {
-            item: self,
-            span: span.into(),
-        }
-    }
-
-    /// Converts a value into a Spanned value, using an unknown Span
-    fn spanned_unknown(self) -> Spanned<Self> {
-        Spanned {
-            item: self,
-            span: Span::unknown(),
-        }
-    }
-}
-impl<T> SpannedItem for T {}
-
-impl<T> std::ops::Deref for Spanned<T> {
-    type Target = T;
-
-    /// Shorthand to deref to the contained value
-    fn deref(&self) -> &T {
-        &self.item
-    }
-}
-
-/// A wrapper type that attaches a Tag to a value
-#[derive(new, Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, Hash)]
-pub struct Tagged<T> {
-    pub tag: Tag,
-    pub item: T,
-}
-
-impl Tagged<String> {
-    /// Allows borrowing the contained string slice as a spanned value
-    pub fn borrow_spanned(&self) -> Spanned<&str> {
-        let span = self.tag.span;
-        self.item[..].spanned(span)
-    }
-
-    /// Allows borrowing the contained string slice as a tagged value
-    pub fn borrow_tagged(&self) -> Tagged<&str> {
-        self.item[..].tagged(self.tag.clone())
-    }
-}
-
-impl<T> Tagged<Vec<T>> {
-    /// Iterates over the contained value(s)
-    pub fn items(&self) -> impl Iterator<Item = &T> {
-        self.item.iter()
-    }
-}
-
-impl<T> HasTag for Tagged<T> {
-    /// Helper for getting the Tag from the Tagged value
-    fn tag(&self) -> Tag {
-        self.tag.clone()
-    }
-}
-
-impl AsRef<Path> for Tagged<PathBuf> {
-    /// Gets the reference to the contained Path
-    fn as_ref(&self) -> &Path {
-        self.item.as_ref()
-    }
-}
-
-pub trait TaggedItem: Sized {
-    fn tagged(self, tag: impl Into<Tag>) -> Tagged<Self> {
-        Tagged {
-            item: self,
-            tag: tag.into(),
-        }
-    }
-
-    // For now, this is a temporary facility. In many cases, there are other useful spans that we
-    // could be using, such as the original source spans of JSON or Toml files, but we don't yet
-    // have the infrastructure to make that work.
-    fn tagged_unknown(self) -> Tagged<Self> {
-        Tagged {
-            item: self,
-            tag: Tag {
-                span: Span::unknown(),
-                anchor: None,
-            },
-        }
-    }
-}
-
-impl<T> TaggedItem for T {}
-
-impl<T> std::ops::Deref for Tagged<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        &self.item
-    }
-}
-
-impl<T> Tagged<T> {
-    pub fn map<U>(self, input: impl FnOnce(T) -> U) -> Tagged<U> {
-        let tag = self.tag();
-
-        let mapped = input(self.item);
-        mapped.tagged(tag)
-    }
-
-    pub fn map_anchored(self, anchor: &Option<AnchorLocation>) -> Tagged<T> {
-        let mut tag = self.tag;
-
-        tag.anchor = anchor.clone();
-
-        Tagged {
-            item: self.item,
-            tag,
-        }
-    }
-
-    pub fn transpose(&self) -> Tagged<&T> {
-        Tagged {
-            item: &self.item,
-            tag: self.tag.clone(),
-        }
-    }
-
-    /// Creates a new `Tag` from the current `Tag`
-    pub fn tag(&self) -> Tag {
-        self.tag.clone()
-    }
-
-    /// Retrieve the `Span` for the current `Tag`.
-    pub fn span(&self) -> Span {
-        self.tag.span
-    }
-
-    /// Returns the `AnchorLocation` of the `Tag` if there is one.
-    pub fn anchor(&self) -> Option<AnchorLocation> {
-        self.tag.anchor.clone()
-    }
-
-    /// Returns the underlying `AnchorLocation` variant type as a string.
-    pub fn anchor_name(&self) -> Option<String> {
-        match self.tag.anchor {
-            Some(AnchorLocation::File(ref file)) => Some(file.clone()),
-            Some(AnchorLocation::Url(ref url)) => Some(url.clone()),
-            _ => None,
-        }
-    }
-
-    /// Returns a reference to the current `Tag`'s item.
-    pub fn item(&self) -> &T {
-        &self.item
-    }
-
-    /// Returns a tuple of the `Tagged` item and `Tag`.
-    pub fn into_parts(self) -> (T, Tag) {
-        (self.item, self.tag)
-    }
-}
-
-impl From<&Tag> for Tag {
-    fn from(input: &Tag) -> Tag {
-        input.clone()
-    }
-}
-
-impl From<(usize, usize)> for Span {
-    fn from(input: (usize, usize)) -> Span {
-        Span::new(input.0, input.1)
-    }
-}
-
-impl From<&std::ops::Range<usize>> for Span {
-    fn from(input: &std::ops::Range<usize>) -> Span {
-        Span::new(input.start, input.end)
-    }
-}
-
-/// The set of metadata that can be associated with a value
-#[derive(
-    Debug,
-    Default,
-    Clone,
-    PartialEq,
-    Eq,
-    Ord,
-    PartialOrd,
-    Serialize,
-    Deserialize,
-    Hash,
-    Getters,
-    new,
-)]
-pub struct Tag {
-    /// The original source for this value
-    pub anchor: Option<AnchorLocation>,
-    /// The span in the source text for the command that created this value
-    pub span: Span,
-}
-
-impl From<Span> for Tag {
-    fn from(span: Span) -> Self {
-        Tag { anchor: None, span }
-    }
-}
-
-impl From<&Span> for Tag {
-    fn from(span: &Span) -> Self {
-        Tag {
-            anchor: None,
-            span: *span,
-        }
-    }
-}
-
-impl From<(usize, usize, AnchorLocation)> for Tag {
-    fn from((start, end, anchor): (usize, usize, AnchorLocation)) -> Self {
-        Tag {
-            anchor: Some(anchor),
-            span: Span::new(start, end),
-        }
-    }
-}
-
-impl From<(usize, usize, Option<AnchorLocation>)> for Tag {
-    fn from((start, end, anchor): (usize, usize, Option<AnchorLocation>)) -> Self {
-        Tag {
-            anchor,
-            span: Span::new(start, end),
-        }
-    }
-}
-
-impl From<Tag> for Span {
-    fn from(tag: Tag) -> Self {
-        tag.span
-    }
-}
-
-impl From<&Tag> for Span {
-    fn from(tag: &Tag) -> Self {
-        tag.span
-    }
-}
-
-impl Tag {
-    /// Creates a default `Tag' with unknown `Span` position and no `AnchorLocation`
-    pub fn default() -> Self {
-        Tag {
-            anchor: None,
-            span: Span::unknown(),
-        }
-    }
-
-    pub fn anchored(self, anchor: Option<AnchorLocation>) -> Tag {
-        Tag {
-            anchor,
-            span: self.span,
-        }
-    }
-
-    /// Creates a `Tag` from the given `Span` with no `AnchorLocation`
-    pub fn unknown_anchor(span: Span) -> Tag {
-        Tag { anchor: None, span }
-    }
-
-    /// Creates a `Tag` from the given `AnchorLocation` for a span with a length of 1.
-    pub fn for_char(pos: usize, anchor: AnchorLocation) -> Tag {
-        Tag {
-            anchor: Some(anchor),
-            span: Span::new(pos, pos + 1),
-        }
-    }
-
-    /// Creates a `Tag` for the given `AnchorLocation` with unknown `Span` position.
-    pub fn unknown_span(anchor: AnchorLocation) -> Tag {
-        Tag {
-            anchor: Some(anchor),
-            span: Span::unknown(),
-        }
-    }
-
-    /// Creates a `Tag` with no `AnchorLocation` and an unknown `Span` position.
-    pub fn unknown() -> Tag {
-        Tag {
-            anchor: None,
-            span: Span::unknown(),
-        }
-    }
-
-    /// Returns the `AnchorLocation` of the current `Tag`
-    pub fn anchor(&self) -> Option<AnchorLocation> {
-        self.anchor.clone()
-    }
-
-    // Merges the current `Tag` with the given `Tag`.
-    ///
-    /// Both Tags must share the same `AnchorLocation`.
-    // The resulting `Tag` will have a `Span` that starts from the current `Tag` and ends at `Span` of the given `Tag`.
-    pub fn until(&self, other: impl Into<Tag>) -> Tag {
-        let other = other.into();
-        debug_assert!(
-            self.anchor == other.anchor,
-            "Can only merge two tags with the same anchor"
-        );
-
-        Tag {
-            span: Span::new(self.span.start, other.span.end),
-            anchor: self.anchor.clone(),
-        }
-    }
-
-    /// Merges the current `Tag` with the given optional `Tag`.
-    ///
-    /// Both `Tag`s must share the same `AnchorLocation`.
-    /// The resulting `Tag` will have a `Span` that starts from the current `Tag` and ends at `Span` of the given `Tag`.
-    /// Should the `None` variant be passed in, a new `Tag` with the same `Span` and `AnchorLocation` will be returned.
-    pub fn until_option(&self, other: Option<impl Into<Tag>>) -> Tag {
-        match other {
-            Some(other) => {
-                let other = other.into();
-                debug_assert!(
-                    self.anchor == other.anchor,
-                    "Can only merge two tags with the same anchor"
-                );
-
-                Tag {
-                    span: Span::new(self.span.start, other.span.end),
-                    anchor: self.anchor.clone(),
-                }
-            }
-            None => self.clone(),
-        }
-    }
-
-    pub fn slice<'a>(&self, source: &'a str) -> &'a str {
-        self.span.slice(source)
-    }
-
-    pub fn string(&self, source: &str) -> String {
-        self.span.slice(source).to_string()
-    }
-
-    pub fn tagged_slice<'a>(&self, source: &'a str) -> Tagged<&'a str> {
-        self.span.slice(source).tagged(self)
-    }
-
-    pub fn tagged_string(&self, source: &str) -> Tagged<String> {
-        self.span.slice(source).to_string().tagged(self)
-    }
-
-    pub fn anchor_name(&self) -> Option<String> {
-        match self.anchor {
-            Some(AnchorLocation::File(ref file)) => Some(file.clone()),
-            Some(AnchorLocation::Url(ref url)) => Some(url.clone()),
-            _ => None,
-        }
-    }
-}
-
-pub fn tag_for_tagged_list(mut iter: impl Iterator<Item = Tag>) -> Tag {
-    let first = iter.next();
-
-    let first = match first {
-        None => return Tag::unknown(),
-        Some(first) => first,
-    };
-
-    let last = iter.last();
-
-    match last {
-        None => first,
-        Some(last) => first.until(last),
-    }
-}
-
-pub fn span_for_spanned_list(mut iter: impl Iterator<Item = Span>) -> Span {
-    let first = iter.next();
-
-    let first = match first {
-        None => return Span::unknown(),
-        Some(first) => first,
-    };
-
-    let last = iter.last();
-
-    match last {
-        None => first,
-        Some(last) => first.until(last),
-    }
-}
-
-/// A `Span` is metadata which indicates the start and end positions.
-///
-/// `Span`s are combined with `AnchorLocation`s to form another type of metadata, a `Tag`.
-/// A `Span`'s end position must be greater than or equal to its start position.
-#[derive(
-    Debug, Default, Clone, Copy, PartialEq, Eq, Ord, PartialOrd, Serialize, Deserialize, Hash,
-)]
-pub struct Span {
-    start: usize,
-    end: usize,
-}
-
-impl From<&Span> for Span {
-    fn from(span: &Span) -> Span {
-        *span
-    }
-}
-
-impl From<Option<Span>> for Span {
-    fn from(input: Option<Span>) -> Span {
-        input.unwrap_or_else(|| Span::new(0, 0))
-    }
-}
-
-impl From<Span> for std::ops::Range<usize> {
-    fn from(input: Span) -> std::ops::Range<usize> {
-        std::ops::Range {
-            start: input.start,
-            end: input.end,
-        }
-    }
-}
-
-impl Span {
-    /// Creates a default new `Span` that has 0 start and 0 end.
-    pub fn default() -> Self {
-        Span::unknown()
-    }
-
-    /// Creates a new `Span` that has 0 start and 0 end.
-    pub fn unknown() -> Span {
-        Span::new(0, 0)
-    }
-
-    pub fn from_list(list: &[impl HasSpan]) -> Span {
-        let mut iterator = list.iter();
-
-        match iterator.next() {
-            None => Span::new(0, 0),
-            Some(first) => {
-                let last = iterator.last().unwrap_or(first);
-
-                Span::new(first.span().start, last.span().end)
-            }
-        }
-    }
-
-    /// Creates a new `Span` from start and end inputs. The end parameter must be greater than or equal to the start parameter.
-    pub fn new(start: usize, end: usize) -> Span {
-        assert!(
-            end >= start,
-            "Can't create a Span whose end < start, start={}, end={}",
-            start,
-            end
-        );
-
-        Span { start, end }
-    }
-
-    pub fn new_option(start: usize, end: usize) -> Option<Span> {
-        if end >= start {
-            None
-        } else {
-            Some(Span { start, end })
-        }
-    }
-
-    /// Creates a `Span` with a length of 1 from the given position.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// let char_span = Span::for_char(5);
-    ///
-    /// assert_eq!(char_span.start(), 5);
-    /// assert_eq!(char_span.end(), 6);
-    /// ```
-    pub fn for_char(pos: usize) -> Span {
-        Span {
-            start: pos,
-            end: pos + 1,
-        }
-    }
-
-    /// Returns a bool indicating if the given position falls inside the current `Span`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// let span = Span::new(2, 8);
-    ///
-    /// assert_eq!(span.contains(5), true);
-    /// assert_eq!(span.contains(8), false);
-    /// assert_eq!(span.contains(100), false);
-    /// ```
-    pub fn contains(&self, pos: usize) -> bool {
-        self.start <= pos && pos < self.end
-    }
-
-    /// Returns a new Span by merging an earlier Span with the current Span.
-    ///
-    /// The resulting Span will have the same start position as the given Span and same end as the current Span.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// let original_span = Span::new(4, 6);
-    /// let earlier_span = Span::new(1, 3);
-    /// let merged_span = origin_span.since(earlier_span);
-    ///
-    /// assert_eq!(merged_span.start(), 1);
-    /// assert_eq!(merged_span.end(), 6);
-    /// ```
-    pub fn since(&self, other: impl Into<Span>) -> Span {
-        let other = other.into();
-
-        Span::new(other.start, self.end)
-    }
-
-    /// Returns a new Span by merging a later Span with the current Span.
-    ///
-    /// The resulting Span will have the same start position as the current Span and same end as the given Span.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// let original_span = Span::new(4, 6);
-    /// let later_span = Span::new(9, 11);
-    /// let merged_span = origin_span.until(later_span);
-    ///
-    /// assert_eq!(merged_span.start(), 4);
-    /// assert_eq!(merged_span.end(), 11);
-    /// ```
-    pub fn until(&self, other: impl Into<Span>) -> Span {
-        let other = other.into();
-
-        Span::new(self.start, other.end)
-    }
-
-    pub fn merge(&self, other: impl Into<Span>) -> Span {
-        let other = other.into();
-
-        if other.end < self.start {
-            other.until(self)
-        } else {
-            self.until(other)
-        }
-    }
-
-    /// Returns a new Span by merging a later Span with the current Span.
-    ///
-    /// If the given Span is of the None variant,
-    /// A Span with the same values as the current Span is returned.
-    pub fn until_option(&self, other: Option<impl Into<Span>>) -> Span {
-        match other {
-            Some(other) => {
-                let other = other.into();
-
-                Span::new(self.start, other.end)
-            }
-            None => *self,
-        }
-    }
-
-    pub fn string(&self, source: &str) -> String {
-        self.slice(source).to_string()
-    }
-
-    pub fn spanned_slice<'a>(&self, source: &'a str) -> Spanned<&'a str> {
-        self.slice(source).spanned(*self)
-    }
-
-    pub fn spanned_string(&self, source: &str) -> Spanned<String> {
-        self.slice(source).to_string().spanned(*self)
-    }
-
-    /// Returns the start position of the current Span.
-    pub fn start(&self) -> usize {
-        self.start
-    }
-
-    /// Returns the end position of the current Span.
-    pub fn end(&self) -> usize {
-        self.end
-    }
-
-    /// Returns a bool if the current Span indicates an "unknown"  position.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// let unknown_span = Span::unknown();
-    /// let known_span = Span::new(4, 6);
-    ///
-    /// assert_eq!(unknown_span.is_unknown(), true);
-    /// assert_eq!(known_span.is_unknown(), false);
-    /// ```
-    pub fn is_unknown(&self) -> bool {
-        self.start == 0 && self.end == 0
-    }
-
-    /// Returns a bool if the current Span does not cover.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// //  make clean
-    /// //  ----
-    /// //  (0,4)
-    /// //
-    /// //       ^(5,5)
-    ///
-    /// let make_span = Span::new(0,4);
-    /// let clean_span = Span::new(5,5);
-    ///
-    /// assert_eq!(make_span.is_closed(), false);
-    /// assert_eq!(clean_span.is_closed(), true);
-    /// ```
-    pub fn is_closed(&self) -> bool {
-        self.start == self.end
-    }
-
-    /// Returns a slice of the input that covers the start and end of the current Span.
-    pub fn slice<'a>(&self, source: &'a str) -> &'a str {
-        &source[self.start..self.end]
-    }
-}
-
-impl PartialOrd<usize> for Span {
-    fn partial_cmp(&self, other: &usize) -> Option<Ordering> {
-        (self.end - self.start).partial_cmp(other)
-    }
-}
-
-impl PartialEq<usize> for Span {
-    fn eq(&self, other: &usize) -> bool {
-        (self.end - self.start) == *other
-    }
-}
-
-pub trait IntoSpanned {
-    type Output: HasFallibleSpan;
-
-    fn into_spanned(self, span: impl Into<Span>) -> Self::Output;
-}
-
-impl<T: HasFallibleSpan> IntoSpanned for T {
-    type Output = T;
-    fn into_spanned(self, _span: impl Into<Span>) -> Self::Output {
-        self
-    }
-}
-
-pub trait HasSpan {
-    fn span(&self) -> Span;
-}
-
-impl<T, E> HasSpan for Result<T, E>
-where
-    T: HasSpan,
-{
-    fn span(&self) -> Span {
-        match self {
-            Result::Ok(val) => val.span(),
-            Result::Err(_) => Span::unknown(),
-        }
-    }
-}
-
-impl<T> HasSpan for Spanned<T> {
-    fn span(&self) -> Span {
-        self.span
-    }
-}
-
-pub trait HasFallibleSpan {
-    fn maybe_span(&self) -> Option<Span>;
-}
-
-impl HasFallibleSpan for bool {
-    fn maybe_span(&self) -> Option<Span> {
-        None
-    }
-}
-
-impl HasFallibleSpan for () {
-    fn maybe_span(&self) -> Option<Span> {
-        None
-    }
-}
-
-impl<T> HasFallibleSpan for T
-where
-    T: HasSpan,
-{
-    fn maybe_span(&self) -> Option<Span> {
-        Some(HasSpan::span(self))
-    }
-}
-
-impl PrettyDebugWithSource for Option<Span> {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            None => DbgDocBldr::description("no span"),
-            Some(span) => span.pretty_debug(source),
-        }
-    }
-}
-
-impl HasFallibleSpan for Option<Span> {
-    fn maybe_span(&self) -> Option<Span> {
-        *self
-    }
-}
-
-impl PrettyDebugWithSource for Span {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        DbgDocBldr::typed(
-            "span",
-            DbgDocBldr::keyword("for")
-                + DbgDocBldr::space()
-                + DbgDocBldr::description(format!("{:?}", self.slice(source))),
-        )
-    }
-}
-
-impl HasSpan for Span {
-    fn span(&self) -> Span {
-        *self
-    }
-}
-
-impl<T> PrettyDebugWithSource for Option<Spanned<T>>
-where
-    Spanned<T>: PrettyDebugWithSource,
-{
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            None => DbgDocBldr::description("nothing"),
-            Some(v) => v.pretty_debug(v.span.slice(source)),
-        }
-    }
-}
-
-impl<T> HasFallibleSpan for Option<Spanned<T>> {
-    fn maybe_span(&self) -> Option<Span> {
-        self.as_ref().map(|value| value.span)
-    }
-}
-
-impl<T> PrettyDebugWithSource for Option<Tagged<T>>
-where
-    Tagged<T>: PrettyDebugWithSource,
-{
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            None => DbgDocBldr::description("nothing"),
-            Some(d) => d.pretty_debug(source),
-        }
-    }
-}
-
-impl<T> HasFallibleSpan for Option<Tagged<T>> {
-    fn maybe_span(&self) -> Option<Span> {
-        self.as_ref().map(|value| value.tag.span)
-    }
-}
-
-impl<T> HasSpan for Tagged<T> {
-    fn span(&self) -> Span {
-        self.tag.span
-    }
-}
diff --git a/old_nushell/crates/nu-source/src/pretty.rs b/old_nushell/crates/nu-source/src/pretty.rs
deleted file mode 100644
index 170b4383f..000000000
--- a/old_nushell/crates/nu-source/src/pretty.rs
+++ /dev/null
@@ -1,534 +0,0 @@
-use crate::meta::Spanned;
-use crate::term_colored::TermColored;
-use crate::text::Text;
-use derive_new::new;
-use pretty::{BoxAllocator, DocAllocator};
-use std::hash::Hash;
-use termcolor::{Color, ColorSpec};
-
-#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Hash)]
-pub enum ShellStyle {
-    Delimiter,
-    Key,
-    Value,
-    Equals,
-    Kind,
-    Keyword,
-    Operator,
-    Variable,
-    Primitive,
-    Opaque,
-    Description,
-    Error,
-}
-
-impl From<ShellAnnotation> for ColorSpec {
-    fn from(ann: ShellAnnotation) -> ColorSpec {
-        match ann.style {
-            ShellStyle::Delimiter => ColorSpec::new()
-                .set_fg(Some(Color::White))
-                .set_intense(false)
-                .clone(),
-            ShellStyle::Key => ColorSpec::new()
-                .set_fg(Some(Color::Green))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Value => ColorSpec::new()
-                .set_fg(Some(Color::White))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Equals => ColorSpec::new()
-                .set_fg(Some(Color::Green))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Kind => ColorSpec::new().set_fg(Some(Color::Cyan)).clone(),
-            ShellStyle::Variable => ColorSpec::new()
-                .set_fg(Some(Color::Green))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Keyword => ColorSpec::new().set_fg(Some(Color::Magenta)).clone(),
-            ShellStyle::Operator => ColorSpec::new().set_fg(Some(Color::Yellow)).clone(),
-            ShellStyle::Primitive => ColorSpec::new()
-                .set_fg(Some(Color::Green))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Opaque => ColorSpec::new()
-                .set_fg(Some(Color::Yellow))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Description => ColorSpec::new()
-                .set_fg(Some(Color::Green))
-                .set_intense(true)
-                .clone(),
-            ShellStyle::Error => ColorSpec::new()
-                .set_fg(Some(Color::Red))
-                .set_intense(true)
-                .clone(),
-        }
-    }
-}
-
-#[derive(Clone, Copy, Eq, Ord, PartialEq, PartialOrd, Hash, new)]
-pub struct ShellAnnotation {
-    style: ShellStyle,
-}
-
-impl std::fmt::Debug for ShellAnnotation {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self.style)
-    }
-}
-
-impl ShellAnnotation {
-    pub fn style(style: impl Into<ShellStyle>) -> ShellAnnotation {
-        ShellAnnotation {
-            style: style.into(),
-        }
-    }
-}
-
-pub type PrettyDebugDoc =
-    pretty::Doc<'static, pretty::BoxDoc<'static, ShellAnnotation>, ShellAnnotation>;
-
-pub type PrettyDebugDocBuilder = pretty::DocBuilder<'static, pretty::BoxAllocator, ShellAnnotation>;
-
-pub use self::DebugDocBuilder as DbgDocBldr;
-
-#[derive(Clone, new)]
-pub struct DebugDocBuilder {
-    pub inner: PrettyDebugDocBuilder,
-}
-
-impl PrettyDebug for bool {
-    fn pretty(&self) -> DebugDocBuilder {
-        match self {
-            true => DbgDocBldr::primitive("true"),
-            false => DbgDocBldr::primitive("false"),
-        }
-    }
-}
-
-impl PrettyDebug for () {
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::primitive("nothing")
-    }
-}
-
-impl PrettyDebug for DebugDocBuilder {
-    fn pretty(&self) -> DebugDocBuilder {
-        self.clone()
-    }
-}
-
-impl std::ops::Add for DebugDocBuilder {
-    type Output = DebugDocBuilder;
-
-    fn add(self, rhs: DebugDocBuilder) -> DebugDocBuilder {
-        DebugDocBuilder::new(self.inner.append(rhs.inner))
-    }
-}
-
-impl DebugDocBuilder {
-    pub fn from_doc(doc: DebugDoc) -> DebugDocBuilder {
-        DebugDocBuilder {
-            inner: BoxAllocator.nil().append(doc),
-        }
-    }
-
-    pub fn blank() -> DebugDocBuilder {
-        BoxAllocator.nil().into()
-    }
-
-    pub fn delimiter(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Delimiter)
-    }
-
-    pub fn key(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Key)
-    }
-
-    pub fn value(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Value)
-    }
-
-    pub fn into_value(self) -> DebugDocBuilder {
-        self.inner
-            .annotate(ShellAnnotation::style(ShellStyle::Value))
-            .into()
-    }
-
-    pub fn equals() -> DebugDocBuilder {
-        DebugDocBuilder::styled("=", ShellStyle::Equals)
-    }
-
-    pub fn kind(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Kind)
-    }
-
-    pub fn into_kind(self) -> DebugDocBuilder {
-        self.inner
-            .annotate(ShellAnnotation::style(ShellStyle::Kind))
-            .into()
-    }
-
-    pub fn typed(kind: &str, value: DebugDocBuilder) -> DebugDocBuilder {
-        DbgDocBldr::kind(kind) + DbgDocBldr::delimit("[", value.group(), "]")
-    }
-
-    pub fn subtyped(
-        kind: &str,
-        subkind: impl std::fmt::Display,
-        value: DebugDocBuilder,
-    ) -> DebugDocBuilder {
-        DbgDocBldr::delimit(
-            "(",
-            (DbgDocBldr::kind(kind) + DbgDocBldr::delimit("[", DbgDocBldr::kind(subkind), "]"))
-                .group()
-                + DbgDocBldr::space()
-                + value.group(),
-            ")",
-        )
-        .group()
-    }
-
-    pub fn keyword(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Keyword)
-    }
-
-    pub fn var(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Variable)
-    }
-
-    pub fn operator(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Operator)
-    }
-
-    pub fn primitive(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Primitive)
-    }
-
-    pub fn opaque(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Opaque)
-    }
-
-    pub fn description(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Description)
-    }
-
-    pub fn error(string: impl std::fmt::Display) -> DebugDocBuilder {
-        DebugDocBuilder::styled(string, ShellStyle::Error)
-    }
-
-    pub fn delimit(start: &str, doc: DebugDocBuilder, end: &str) -> DebugDocBuilder {
-        DebugDocBuilder::delimiter(start) + doc + DebugDocBuilder::delimiter(end)
-    }
-
-    pub fn preceded(before: DebugDocBuilder, body: DebugDocBuilder) -> DebugDocBuilder {
-        if body.is_empty() {
-            body
-        } else {
-            before + body
-        }
-    }
-
-    pub fn surrounded_option(
-        before: Option<DebugDocBuilder>,
-        builder: Option<DebugDocBuilder>,
-        after: Option<DebugDocBuilder>,
-    ) -> DebugDocBuilder {
-        match builder {
-            None => DebugDocBuilder::blank(),
-            Some(b) => DbgDocBldr::option(before) + b + DbgDocBldr::option(after),
-        }
-    }
-
-    pub fn preceded_option(
-        before: Option<DebugDocBuilder>,
-        builder: Option<DebugDocBuilder>,
-    ) -> DebugDocBuilder {
-        DebugDocBuilder::surrounded_option(before, builder, None)
-    }
-
-    pub fn option(builder: Option<DebugDocBuilder>) -> DebugDocBuilder {
-        builder.unwrap_or_else(DebugDocBuilder::blank)
-    }
-
-    pub fn space() -> DebugDocBuilder {
-        BoxAllocator.space().into()
-    }
-
-    pub fn newline() -> DebugDocBuilder {
-        BoxAllocator.newline().into()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        matches!(&self.inner.1, pretty::Doc::Nil)
-    }
-
-    pub fn or(self, doc: DebugDocBuilder) -> DebugDocBuilder {
-        if self.is_empty() {
-            doc
-        } else {
-            self
-        }
-    }
-
-    pub fn group(self) -> DebugDocBuilder {
-        self.inner.group().into()
-    }
-
-    pub fn nest(self) -> DebugDocBuilder {
-        self.inner.nest(1).group().into()
-    }
-
-    pub fn intersperse_with_source<'a, T: PrettyDebugWithSource + 'a>(
-        list: impl IntoIterator<Item = &'a T>,
-        separator: DebugDocBuilder,
-        source: &str,
-    ) -> DebugDocBuilder {
-        BoxAllocator
-            .intersperse(
-                list.into_iter().filter_map(|item| {
-                    let item = item.pretty_debug(source);
-                    if item.is_empty() {
-                        None
-                    } else {
-                        Some(item)
-                    }
-                }),
-                separator,
-            )
-            .into()
-    }
-
-    pub fn intersperse<T: PrettyDebug>(
-        list: impl IntoIterator<Item = T>,
-        separator: DebugDocBuilder,
-    ) -> DebugDocBuilder {
-        BoxAllocator
-            .intersperse(
-                list.into_iter().filter_map(|item| {
-                    let item = item.pretty();
-                    if item.is_empty() {
-                        None
-                    } else {
-                        Some(item)
-                    }
-                }),
-                separator,
-            )
-            .into()
-    }
-
-    pub fn list(list: impl IntoIterator<Item = DebugDocBuilder>) -> DebugDocBuilder {
-        let mut result: DebugDocBuilder = BoxAllocator.nil().into();
-
-        for item in list {
-            result = result + item;
-        }
-
-        result
-    }
-
-    fn styled(string: impl std::fmt::Display, style: ShellStyle) -> DebugDocBuilder {
-        BoxAllocator
-            .text(string.to_string())
-            .annotate(ShellAnnotation::style(style))
-            .into()
-    }
-}
-
-impl std::ops::Deref for DebugDocBuilder {
-    type Target = PrettyDebugDocBuilder;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, new)]
-pub struct DebugDoc {
-    pub inner: PrettyDebugDoc,
-}
-
-#[derive(Debug, Copy, Clone)]
-pub enum PrettyDebugRefineKind {
-    ContextFree,
-    WithContext,
-}
-
-pub trait PrettyDebugWithSource: Sized {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder;
-
-    fn refined_pretty_debug(
-        &self,
-        _refine: PrettyDebugRefineKind,
-        source: &str,
-    ) -> DebugDocBuilder {
-        self.pretty_debug(source)
-    }
-
-    // This is a transitional convenience method
-    fn debug(&self, source: impl Into<Text>) -> String
-    where
-        Self: Clone,
-    {
-        self.clone().debuggable(source).display()
-    }
-
-    fn debuggable(self, source: impl Into<Text>) -> DebuggableWithSource<Self> {
-        DebuggableWithSource {
-            inner: self,
-            source: source.into(),
-        }
-    }
-}
-
-impl<T: PrettyDebug> PrettyDebug for Spanned<T> {
-    fn pretty(&self) -> DebugDocBuilder {
-        self.item.pretty()
-    }
-}
-
-impl<T: PrettyDebug> PrettyDebugWithSource for T {
-    fn pretty_debug(&self, _source: &str) -> DebugDocBuilder {
-        self.pretty()
-    }
-}
-
-impl<T: PrettyDebugWithSource, E> PrettyDebugWithSource for Result<T, E> {
-    fn pretty_debug(&self, source: &str) -> DebugDocBuilder {
-        match self {
-            Err(_) => DbgDocBldr::error("error"),
-            Ok(val) => val.pretty_debug(source),
-        }
-    }
-}
-
-pub struct DebuggableWithSource<T: PrettyDebugWithSource> {
-    inner: T,
-    source: Text,
-}
-
-impl<T> PrettyDebug for DebuggableWithSource<T>
-where
-    T: PrettyDebugWithSource,
-{
-    fn pretty(&self) -> DebugDocBuilder {
-        self.inner.pretty_debug(&self.source)
-    }
-}
-
-impl PrettyDebug for DebugDoc {
-    fn pretty(&self) -> DebugDocBuilder {
-        DebugDocBuilder::new(BoxAllocator.nil().append(self.inner.clone()))
-    }
-}
-
-pub trait PrettyDebug {
-    fn pretty(&self) -> DebugDocBuilder;
-
-    fn to_doc(&self) -> DebugDoc {
-        DebugDoc::new(self.pretty().into())
-    }
-
-    fn pretty_doc(&self) -> PrettyDebugDoc {
-        let builder = self.pretty();
-        builder.inner.into()
-    }
-
-    fn pretty_builder(&self) -> PrettyDebugDocBuilder {
-        let doc = self.pretty();
-        doc.inner
-    }
-
-    /// A convenience method that prints out the document without colors in
-    /// 70 columns. Generally, you should use plain_string or colored_string
-    /// if possible, but display() can be useful for trace lines and things
-    /// like that, where you don't have control over the terminal.
-    fn display(&self) -> String {
-        self.plain_string(70)
-    }
-
-    fn plain_string(&self, width: usize) -> String {
-        let doc = self.pretty_doc();
-        let mut buffer = termcolor::Buffer::no_color();
-
-        let _ = doc.render_raw(width, &mut TermColored::new(&mut buffer));
-
-        String::from_utf8_lossy(buffer.as_slice()).to_string()
-    }
-
-    fn colored_string(&self, width: usize) -> String {
-        let doc = self.pretty_doc();
-        let mut buffer = termcolor::Buffer::ansi();
-
-        let _ = doc.render_raw(width, &mut TermColored::new(&mut buffer));
-
-        String::from_utf8_lossy(buffer.as_slice()).to_string()
-    }
-}
-
-impl From<PrettyDebugDocBuilder> for DebugDocBuilder {
-    fn from(x: PrettyDebugDocBuilder) -> Self {
-        DebugDocBuilder { inner: x }
-    }
-}
-
-impl std::ops::Deref for DebugDoc {
-    type Target = PrettyDebugDoc;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl From<DebugDoc> for PrettyDebugDoc {
-    fn from(input: DebugDoc) -> PrettyDebugDoc {
-        input.inner
-    }
-}
-
-impl From<DebugDocBuilder> for PrettyDebugDoc {
-    fn from(x: DebugDocBuilder) -> Self {
-        x.inner.into()
-    }
-}
-
-fn hash_doc<H: std::hash::Hasher>(doc: &PrettyDebugDoc, state: &mut H) {
-    match doc {
-        pretty::Doc::Nil => 0u8.hash(state),
-        pretty::Doc::Append(a, b) => {
-            1u8.hash(state);
-            hash_doc(a, state);
-            hash_doc(b, state);
-        }
-        pretty::Doc::Group(a) => {
-            2u8.hash(state);
-            hash_doc(a, state);
-        }
-        pretty::Doc::Nest(a, b) => {
-            3u8.hash(state);
-            a.hash(state);
-            hash_doc(b, state);
-        }
-        pretty::Doc::Space => 4u8.hash(state),
-        pretty::Doc::Newline => 5u8.hash(state),
-        pretty::Doc::Text(t) => {
-            6u8.hash(state);
-            t.hash(state);
-        }
-        pretty::Doc::Annotated(a, b) => {
-            7u8.hash(state);
-            a.hash(state);
-            hash_doc(b, state);
-        }
-    }
-}
-
-#[allow(clippy::derive_hash_xor_eq)]
-impl std::hash::Hash for DebugDoc {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        hash_doc(&self.inner, state);
-    }
-}
diff --git a/old_nushell/crates/nu-source/src/term_colored.rs b/old_nushell/crates/nu-source/src/term_colored.rs
deleted file mode 100644
index 050041dad..000000000
--- a/old_nushell/crates/nu-source/src/term_colored.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::pretty::ShellAnnotation;
-use pretty::{Render, RenderAnnotated};
-use std::io;
-use termcolor::WriteColor;
-
-pub struct TermColored<'a, W> {
-    color_stack: Vec<ShellAnnotation>,
-    upstream: &'a mut W,
-}
-
-impl<'a, W> TermColored<'a, W> {
-    pub fn new(upstream: &'a mut W) -> TermColored<'a, W> {
-        TermColored {
-            color_stack: Vec::new(),
-            upstream,
-        }
-    }
-}
-
-impl<'a, W> Render for TermColored<'a, W>
-where
-    W: io::Write,
-{
-    type Error = io::Error;
-
-    fn write_str(&mut self, s: &str) -> io::Result<usize> {
-        self.upstream.write(s.as_bytes())
-    }
-
-    fn write_str_all(&mut self, s: &str) -> io::Result<()> {
-        self.upstream.write_all(s.as_bytes())
-    }
-}
-
-impl<'a, W> RenderAnnotated<ShellAnnotation> for TermColored<'a, W>
-where
-    W: WriteColor,
-{
-    fn push_annotation(&mut self, ann: &ShellAnnotation) -> Result<(), Self::Error> {
-        self.color_stack.push(*ann);
-        self.upstream.set_color(&(*ann).into())
-    }
-
-    fn pop_annotation(&mut self) -> Result<(), Self::Error> {
-        self.color_stack.pop();
-        match self.color_stack.last() {
-            Some(previous) => self.upstream.set_color(&(*previous).into()),
-            None => self.upstream.reset(),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-source/src/text.rs b/old_nushell/crates/nu-source/src/text.rs
deleted file mode 100644
index e77934f06..000000000
--- a/old_nushell/crates/nu-source/src/text.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::cmp::Ordering;
-use std::hash::Hash;
-use std::hash::Hasher;
-use std::ops::Range;
-
-/// A "Text" is like a string except that it can be cheaply cloned.
-/// You can also "extract" subtexts quite cheaply. You can also deref
-/// an `&Text` into a `&str` for interoperability.
-///
-/// Used to represent the value of an input file.
-#[derive(Clone)]
-pub struct Text {
-    pub text: String,
-    pub start: usize,
-    pub end: usize,
-}
-
-impl Text {
-    /// Modifies this restrict to a subset of its current range.
-    pub fn select(&mut self, range: Range<usize>) {
-        let len = range.end - range.start;
-        let new_start = self.start + range.start;
-        let new_end = new_start + len;
-        assert!(new_end <= self.end);
-
-        self.start = new_start;
-        self.end = new_end;
-    }
-
-    /// Extract a new `Text` that is a subset of an old `Text`
-    /// -- `text.extract(1..3)` is similar to `&foo[1..3]` except that
-    /// it gives back an owned value instead of a borrowed value.
-    pub fn slice(&self, range: Range<usize>) -> Self {
-        let mut result = self.clone();
-        result.select(range);
-        result
-    }
-}
-
-impl From<&str> for Text {
-    fn from(text: &str) -> Self {
-        let end = text.len();
-        Self {
-            text: text.to_string(),
-            start: 0,
-            end,
-        }
-    }
-}
-
-impl AsRef<str> for Text {
-    fn as_ref(&self) -> &str {
-        &*self
-    }
-}
-
-impl From<String> for Text {
-    fn from(text: String) -> Self {
-        let end = text.len();
-        Self {
-            text,
-            start: 0,
-            end,
-        }
-    }
-}
-
-impl From<&Text> for Text {
-    fn from(text: &Text) -> Self {
-        text.clone()
-    }
-}
-
-impl std::borrow::Borrow<str> for Text {
-    fn borrow(&self) -> &str {
-        &*self
-    }
-}
-
-impl std::ops::Deref for Text {
-    type Target = str;
-
-    fn deref(&self) -> &str {
-        &self.text[self.start..self.end]
-    }
-}
-
-impl std::fmt::Display for Text {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        <str as std::fmt::Display>::fmt(self, fmt)
-    }
-}
-
-impl std::fmt::Debug for Text {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        <str as std::fmt::Debug>::fmt(self, fmt)
-    }
-}
-
-impl PartialEq<Text> for Text {
-    fn eq(&self, other: &Text) -> bool {
-        let this: &str = self;
-        let other: &str = other;
-        this == other
-    }
-}
-
-impl Eq for Text {}
-
-impl PartialEq<str> for Text {
-    fn eq(&self, other: &str) -> bool {
-        let this: &str = self;
-        this == other
-    }
-}
-
-impl PartialEq<String> for Text {
-    fn eq(&self, other: &String) -> bool {
-        let this: &str = self;
-        let other: &str = other;
-        this == other
-    }
-}
-
-impl PartialEq<Text> for str {
-    fn eq(&self, other: &Text) -> bool {
-        other == self
-    }
-}
-
-impl PartialEq<Text> for String {
-    fn eq(&self, other: &Text) -> bool {
-        other == self
-    }
-}
-
-impl<T: ?Sized> PartialEq<&T> for Text
-where
-    Text: PartialEq<T>,
-{
-    fn eq(&self, other: &&T) -> bool {
-        self == *other
-    }
-}
-
-impl Hash for Text {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        <str as Hash>::hash(self, state)
-    }
-}
-
-impl PartialOrd<Text> for Text {
-    fn partial_cmp(&self, other: &Text) -> Option<Ordering> {
-        let this: &str = self;
-        let other: &str = other;
-        this.partial_cmp(other)
-    }
-}
-
-impl Ord for Text {
-    fn cmp(&self, other: &Text) -> Ordering {
-        let this: &str = self;
-        let other: &str = other;
-        this.cmp(other)
-    }
-}
-
-impl PartialOrd<str> for Text {
-    fn partial_cmp(&self, other: &str) -> Option<Ordering> {
-        let this: &str = self;
-        this.partial_cmp(other)
-    }
-}
-
-impl PartialOrd<String> for Text {
-    fn partial_cmp(&self, other: &String) -> Option<Ordering> {
-        let this: &str = self;
-        let other: &str = other;
-        this.partial_cmp(other)
-    }
-}
-
-impl PartialOrd<Text> for str {
-    fn partial_cmp(&self, other: &Text) -> Option<Ordering> {
-        other.partial_cmp(self)
-    }
-}
-
-impl PartialOrd<Text> for String {
-    fn partial_cmp(&self, other: &Text) -> Option<Ordering> {
-        other.partial_cmp(self)
-    }
-}
-
-impl<T: ?Sized> PartialOrd<&T> for Text
-where
-    Text: PartialOrd<T>,
-{
-    fn partial_cmp(&self, other: &&T) -> Option<Ordering> {
-        self.partial_cmp(*other)
-    }
-}
-
-impl Serialize for Text {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        self.as_ref().serialize(serializer)
-    }
-}
-
-impl<'de> Deserialize<'de> for Text {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        Ok(Text::from(String::deserialize(deserializer)?))
-    }
-}
diff --git a/old_nushell/crates/nu-stream/Cargo.toml b/old_nushell/crates/nu-stream/Cargo.toml
deleted file mode 100644
index d0eef7027..000000000
--- a/old_nushell/crates/nu-stream/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Nushell stream"
-edition = "2018"
-license = "MIT"
-name = "nu-stream"
-version = "0.43.0"
-
-[dependencies]
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-
-[features]
-stable = []
diff --git a/old_nushell/crates/nu-stream/src/input.rs b/old_nushell/crates/nu-stream/src/input.rs
deleted file mode 100644
index d3ff1c58b..000000000
--- a/old_nushell/crates/nu-stream/src/input.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use crate::prelude::*;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, Type, UntaggedValue, Value};
-use nu_source::{HasFallibleSpan, PrettyDebug, Tag, Tagged, TaggedItem};
-
-pub struct InputStream {
-    values: Box<dyn Iterator<Item = Value> + Send + Sync>,
-
-    // Whether or not an empty stream was explicitly requested via InputStream::empty
-    empty: bool,
-}
-
-impl Iterator for InputStream {
-    type Item = Value;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.values.next()
-    }
-}
-
-impl InputStream {
-    pub fn empty() -> InputStream {
-        InputStream {
-            values: Box::new(std::iter::empty()),
-            empty: true,
-        }
-    }
-
-    pub fn one(item: impl Into<Value>) -> InputStream {
-        InputStream {
-            values: Box::new(std::iter::once(item.into())),
-            empty: false,
-        }
-    }
-
-    pub fn into_vec(self) -> Vec<Value> {
-        self.values.collect()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.empty
-    }
-
-    pub fn drain_vec(&mut self) -> Vec<Value> {
-        let mut output = vec![];
-        for x in &mut self.values {
-            output.push(x);
-        }
-        output
-    }
-
-    pub fn from_stream(input: impl Iterator<Item = Value> + Send + Sync + 'static) -> InputStream {
-        InputStream {
-            values: Box::new(input),
-            empty: false,
-        }
-    }
-
-    pub fn collect_string(mut self, tag: Tag) -> Result<Tagged<String>, ShellError> {
-        let mut bytes = vec![];
-        let mut value_tag = tag.clone();
-
-        loop {
-            match self.values.next() {
-                Some(Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    tag: value_t,
-                }) => {
-                    value_tag = value_t;
-                    bytes.extend_from_slice(&s.into_bytes());
-                }
-                Some(Value {
-                    value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                    tag: value_t,
-                }) => {
-                    value_tag = value_t;
-                    bytes.extend_from_slice(&b);
-                }
-                Some(Value {
-                    value: UntaggedValue::Primitive(Primitive::Nothing),
-                    tag: value_t,
-                }) => {
-                    value_tag = value_t;
-                }
-                Some(Value {
-                    tag: value_tag,
-                    value,
-                }) => {
-                    return Err(ShellError::labeled_error_with_secondary(
-                        "Expected a string from pipeline",
-                        "requires string input",
-                        tag,
-                        format!(
-                            "{} originates from here",
-                            Type::from_value(&value).plain_string(100000)
-                        ),
-                        value_tag,
-                    ))
-                }
-                None => break,
-            }
-        }
-
-        match String::from_utf8(bytes) {
-            Ok(s) => Ok(s.tagged(value_tag)),
-            Err(_) => Err(ShellError::labeled_error_with_secondary(
-                "Expected a string from pipeline",
-                "requires string input",
-                tag,
-                "value originates from here",
-                value_tag,
-            )),
-        }
-    }
-
-    pub fn collect_binary(mut self, tag: Tag) -> Result<Tagged<Vec<u8>>, ShellError> {
-        let mut bytes = vec![];
-        let mut value_tag = tag.clone();
-
-        loop {
-            match self.values.next() {
-                Some(Value {
-                    value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                    tag: value_t,
-                }) => {
-                    value_tag = value_t;
-                    bytes.extend_from_slice(&b);
-                }
-                Some(Value {
-                    tag: value_tag,
-                    value: _,
-                }) => {
-                    return Err(ShellError::labeled_error_with_secondary(
-                        "Expected binary from pipeline",
-                        "requires binary input",
-                        tag,
-                        "value originates from here",
-                        value_tag,
-                    ));
-                }
-                None => break,
-            }
-        }
-
-        Ok(bytes.tagged(value_tag))
-    }
-}
-
-impl From<VecDeque<Value>> for InputStream {
-    fn from(input: VecDeque<Value>) -> InputStream {
-        InputStream {
-            values: Box::new(input.into_iter()),
-            empty: false,
-        }
-    }
-}
-
-impl From<Vec<Value>> for InputStream {
-    fn from(input: Vec<Value>) -> InputStream {
-        InputStream {
-            values: Box::new(input.into_iter()),
-            empty: false,
-        }
-    }
-}
-
-pub trait IntoInputStream {
-    fn into_input_stream(self) -> InputStream;
-}
-
-impl<T, U> IntoInputStream for T
-where
-    T: Iterator<Item = U> + Send + Sync + 'static,
-    U: Into<Result<nu_protocol::Value, nu_errors::ShellError>>,
-{
-    fn into_input_stream(self) -> InputStream {
-        InputStream {
-            empty: false,
-            values: Box::new(self.map(|item| match item.into() {
-                Ok(result) => result,
-                Err(err) => match HasFallibleSpan::maybe_span(&err) {
-                    Some(span) => nu_protocol::UntaggedValue::Error(err).into_value(span),
-                    None => nu_protocol::UntaggedValue::Error(err).into_untagged_value(),
-                },
-            })),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-stream/src/interruptible.rs b/old_nushell/crates/nu-stream/src/interruptible.rs
deleted file mode 100644
index 43b8d6bbe..000000000
--- a/old_nushell/crates/nu-stream/src/interruptible.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use crate::prelude::*;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-pub struct InterruptibleStream<V> {
-    inner: Box<dyn Iterator<Item = V> + Send + Sync>,
-    interrupt_signal: Arc<AtomicBool>,
-}
-
-impl<V> InterruptibleStream<V> {
-    pub fn new<S>(inner: S, interrupt_signal: Arc<AtomicBool>) -> InterruptibleStream<V>
-    where
-        S: Iterator<Item = V> + Send + Sync + 'static,
-    {
-        InterruptibleStream {
-            inner: Box::new(inner),
-            interrupt_signal,
-        }
-    }
-}
-
-impl<V> Iterator for InterruptibleStream<V> {
-    type Item = V;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.interrupt_signal.load(Ordering::SeqCst) {
-            None
-        } else {
-            self.inner.next()
-        }
-    }
-}
-
-pub trait Interruptible<V> {
-    fn interruptible(self, ctrl_c: Arc<AtomicBool>) -> InterruptibleStream<V>;
-}
-
-impl<S, V> Interruptible<V> for S
-where
-    S: Iterator<Item = V> + Send + Sync + 'static,
-{
-    fn interruptible(self, ctrl_c: Arc<AtomicBool>) -> InterruptibleStream<V> {
-        InterruptibleStream::new(self, ctrl_c)
-    }
-}
diff --git a/old_nushell/crates/nu-stream/src/lib.rs b/old_nushell/crates/nu-stream/src/lib.rs
deleted file mode 100644
index eb2ab37e3..000000000
--- a/old_nushell/crates/nu-stream/src/lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-mod prelude;
-
-mod input;
-mod interruptible;
-mod output;
-
-pub use input::*;
-pub use interruptible::*;
-pub use output::*;
-pub use prelude::IntoActionStream;
-pub use prelude::IntoOutputStream;
diff --git a/old_nushell/crates/nu-stream/src/output.rs b/old_nushell/crates/nu-stream/src/output.rs
deleted file mode 100644
index d7a6a68f7..000000000
--- a/old_nushell/crates/nu-stream/src/output.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use crate::prelude::*;
-use nu_protocol::{ReturnSuccess, ReturnValue, Value};
-use std::iter::IntoIterator;
-
-pub type OutputStream = InputStream;
-
-pub struct ActionStream {
-    pub values: Box<dyn Iterator<Item = ReturnValue> + Send + Sync>,
-}
-
-impl Iterator for ActionStream {
-    type Item = ReturnValue;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.values.next()
-    }
-}
-
-impl ActionStream {
-    pub fn new(values: impl Iterator<Item = ReturnValue> + Send + Sync + 'static) -> ActionStream {
-        ActionStream {
-            values: Box::new(values),
-        }
-    }
-
-    pub fn empty() -> ActionStream {
-        ActionStream {
-            values: Box::new(std::iter::empty()),
-        }
-    }
-
-    pub fn one(item: impl Into<ReturnValue>) -> ActionStream {
-        let item = item.into();
-        ActionStream {
-            values: Box::new(std::iter::once(item)),
-        }
-    }
-
-    pub fn from_input(input: impl Iterator<Item = Value> + Send + Sync + 'static) -> ActionStream {
-        ActionStream {
-            values: Box::new(input.map(ReturnSuccess::value)),
-        }
-    }
-
-    pub fn drain_vec(&mut self) -> Vec<ReturnValue> {
-        let mut output = vec![];
-
-        for x in &mut self.values {
-            output.push(x);
-        }
-
-        output
-    }
-}
-
-impl From<InputStream> for ActionStream {
-    fn from(input: InputStream) -> ActionStream {
-        ActionStream {
-            values: Box::new(input.into_iter().map(ReturnSuccess::value)),
-        }
-    }
-}
-
-// impl From<impl Iterator<Item = Value> + Send + Sync + 'static> for OutputStream {
-//     fn from(input: impl Iterator<Item = Value> + Send + Sync + 'static) -> OutputStream {
-//         OutputStream {
-//             values: Box::new(input.map(ReturnSuccess::value)),
-//         }
-//     }
-// }
-
-// impl From<BoxStream<'static, ReturnValue>> for OutputStream {
-//     fn from(input: BoxStream<'static, ReturnValue>) -> OutputStream {
-//         OutputStream { values: input }
-//     }
-// }
-
-impl From<VecDeque<ReturnValue>> for ActionStream {
-    fn from(input: VecDeque<ReturnValue>) -> ActionStream {
-        ActionStream {
-            values: Box::new(input.into_iter()),
-        }
-    }
-}
-
-impl From<VecDeque<Value>> for ActionStream {
-    fn from(input: VecDeque<Value>) -> ActionStream {
-        let stream = input.into_iter().map(ReturnSuccess::value);
-        ActionStream {
-            values: Box::new(stream),
-        }
-    }
-}
-
-impl From<Vec<ReturnValue>> for ActionStream {
-    fn from(input: Vec<ReturnValue>) -> ActionStream {
-        ActionStream {
-            values: Box::new(input.into_iter()),
-        }
-    }
-}
-
-impl From<Vec<Value>> for ActionStream {
-    fn from(input: Vec<Value>) -> ActionStream {
-        let stream = input.into_iter().map(ReturnSuccess::value);
-        ActionStream {
-            values: Box::new(stream),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-stream/src/prelude.rs b/old_nushell/crates/nu-stream/src/prelude.rs
deleted file mode 100644
index 7ff3d6dc8..000000000
--- a/old_nushell/crates/nu-stream/src/prelude.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-#[macro_export]
-macro_rules! return_err {
-    ($expr:expr) => {
-        match $expr {
-            Err(_) => return,
-            Ok(expr) => expr,
-        };
-    };
-}
-
-#[macro_export]
-macro_rules! trace_out_stream {
-    (target: $target:tt, $desc:tt = $expr:expr) => {{
-        if log::log_enabled!(target: $target, log::Level::Trace) {
-            let objects = $expr.inspect(move |o| {
-                trace!(
-                    target: $target,
-                    "{} = {}",
-                    $desc,
-                    match o {
-                        Err(err) => format!("{:?}", err),
-                        Ok(value) => value.display(),
-                    }
-                );
-            });
-
-            $crate::stream::OutputStream::new(objects)
-        } else {
-            $expr
-        }
-    }};
-}
-
-pub(crate) use std::collections::VecDeque;
-pub(crate) use std::sync::Arc;
-
-use nu_protocol::Value;
-
-pub(crate) use crate::{ActionStream, InputStream, OutputStream};
-
-pub trait IntoOutputStream {
-    fn into_output_stream(self) -> OutputStream;
-}
-
-impl<T> IntoOutputStream for T
-where
-    T: Iterator<Item = Value> + Send + Sync + 'static,
-{
-    fn into_output_stream(self) -> OutputStream {
-        OutputStream::from_stream(self)
-    }
-}
-
-pub trait IntoActionStream {
-    fn into_action_stream(self) -> ActionStream;
-}
-
-impl<T, U> IntoActionStream for T
-where
-    T: Iterator<Item = U> + Send + Sync + 'static,
-    U: Into<nu_protocol::ReturnValue>,
-{
-    fn into_action_stream(self) -> ActionStream {
-        ActionStream {
-            values: Box::new(self.map(|item| item.into())),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-table/.gitignore b/old_nushell/crates/nu-table/.gitignore
deleted file mode 100644
index 4c234e523..000000000
--- a/old_nushell/crates/nu-table/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-/target
-/scratch
-**/*.rs.bk
-history.txt
-tests/fixtures/nuplayground
-crates/*/target
-
-# Debian/Ubuntu
-debian/.debhelper/
-debian/debhelper-build-stamp
-debian/files
-debian/nu.substvars
-debian/nu/
-
-# macOS junk
-.DS_Store
-
-# JetBrains' IDE items
-.idea/*
-
-# VSCode's IDE items
-.vscode/*
diff --git a/old_nushell/crates/nu-table/Cargo.toml b/old_nushell/crates/nu-table/Cargo.toml
deleted file mode 100644
index 1a6e2565a..000000000
--- a/old_nushell/crates/nu-table/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Nushell table printing"
-edition = "2018"
-license = "MIT"
-name = "nu-table"
-version = "0.43.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[[bin]]
-name = "table"
-path = "src/main.rs"
-
-[dependencies]
-atty = "0.2.14"
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-
-regex = "1.4"
-strip-ansi-escapes = "0.1.1"
-unicode-width = "0.1.8"
diff --git a/old_nushell/crates/nu-table/src/lib.rs b/old_nushell/crates/nu-table/src/lib.rs
deleted file mode 100644
index 661d7ddde..000000000
--- a/old_nushell/crates/nu-table/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod table;
-mod wrap;
-
-pub use table::{draw_table, StyledString, Table, TextStyle, Theme};
-pub use wrap::Alignment;
diff --git a/old_nushell/crates/nu-table/src/main.rs b/old_nushell/crates/nu-table/src/main.rs
deleted file mode 100644
index bb464ca06..000000000
--- a/old_nushell/crates/nu-table/src/main.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use nu_table::{draw_table, StyledString, Table, TextStyle, Theme};
-use std::collections::HashMap;
-
-fn main() {
-    let args: Vec<_> = std::env::args().collect();
-    let mut width = 0;
-
-    if args.len() > 1 {
-        // Width in terminal characters
-        width = args[1].parse::<usize>().expect("Need a width in columns");
-    }
-
-    if width < 4 {
-        println!("Width must be greater than or equal to 4, setting width to 80");
-        width = 80;
-    }
-
-    // The mocked up table data
-    let (table_headers, row_data) = make_table_data();
-    // The table headers
-    let headers = vec_of_str_to_vec_of_styledstr(&table_headers, true);
-    // The table rows
-    let rows = vec_of_str_to_vec_of_styledstr(&row_data, false);
-    // The table itself
-    let table = Table::new(headers, vec![rows; 3], Theme::rounded());
-    // FIXME: Config isn't available from here so just put these here to compile
-    let color_hm: HashMap<String, nu_ansi_term::Style> = HashMap::new();
-    // Capture the table as a string
-    let output_table = draw_table(&table, width, &color_hm);
-
-    if atty::is(atty::Stream::Stdout) {
-        // Draw the table with ansi colors
-        println!("{}", output_table)
-    } else {
-        // Draw the table without ansi colors
-        if let Ok(bytes) = strip_ansi_escapes::strip(&output_table) {
-            println!("{}", String::from_utf8_lossy(&bytes))
-        } else {
-            println!("{}", output_table)
-        }
-    }
-}
-
-fn make_table_data() -> (Vec<&'static str>, Vec<&'static str>) {
-    let table_headers = vec![
-        "category",
-        "description",
-        "emoji",
-        "ios_version",
-        "unicode_version",
-        "aliases",
-        "tags",
-        "category2",
-        "description2",
-        "emoji2",
-        "ios_version2",
-        "unicode_version2",
-        "aliases2",
-        "tags2",
-    ];
-
-    let row_data = vec![
-        "Smileys & Emotion",
-        "grinning face",
-        "😀",
-        "6",
-        "6.1",
-        "grinning",
-        "smile",
-        "Smileys & Emotion",
-        "grinning face",
-        "😀",
-        "6",
-        "6.1",
-        "grinning",
-        "smile",
-    ];
-
-    (table_headers, row_data)
-}
-
-fn vec_of_str_to_vec_of_styledstr(data: &[&str], is_header: bool) -> Vec<StyledString> {
-    let mut v = vec![];
-
-    for x in data {
-        if is_header {
-            v.push(StyledString::new(
-                String::from(*x),
-                TextStyle::default_header(),
-            ))
-        } else {
-            v.push(StyledString::new(String::from(*x), TextStyle::basic_left()))
-        }
-    }
-    v
-}
diff --git a/old_nushell/crates/nu-table/src/table.rs b/old_nushell/crates/nu-table/src/table.rs
deleted file mode 100644
index 38f826552..000000000
--- a/old_nushell/crates/nu-table/src/table.rs
+++ /dev/null
@@ -1,1269 +0,0 @@
-use crate::wrap::{column_width, split_sublines, wrap, Alignment, Subline, WrappedCell};
-use nu_ansi_term::{Color, Style};
-use std::collections::HashMap;
-use std::fmt::Write;
-
-enum SeparatorPosition {
-    Top,
-    Middle,
-    Bottom,
-}
-
-#[derive(Debug)]
-pub struct Table {
-    pub headers: Vec<StyledString>,
-    pub data: Vec<Vec<StyledString>>,
-    pub theme: Theme,
-}
-
-#[derive(Debug, Clone)]
-pub struct StyledString {
-    pub contents: String,
-    pub style: TextStyle,
-}
-
-impl StyledString {
-    pub fn new(contents: String, style: TextStyle) -> StyledString {
-        StyledString { contents, style }
-    }
-
-    pub fn set_style(&mut self, style: TextStyle) {
-        self.style = style;
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-pub struct TextStyle {
-    pub alignment: Alignment,
-    pub color_style: Option<Style>,
-}
-
-impl TextStyle {
-    pub fn new() -> TextStyle {
-        TextStyle {
-            alignment: Alignment::Left,
-            color_style: Some(Style::default()),
-        }
-    }
-
-    pub fn bold(&self, bool_value: Option<bool>) -> TextStyle {
-        let bv = bool_value.unwrap_or(false);
-
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_bold: bv,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_bold(&self) -> bool {
-        self.color_style.unwrap_or_default().is_bold
-    }
-
-    pub fn dimmed(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_dimmed: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_dimmed(&self) -> bool {
-        self.color_style.unwrap_or_default().is_dimmed
-    }
-
-    pub fn italic(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_italic: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_italic(&self) -> bool {
-        self.color_style.unwrap_or_default().is_italic
-    }
-
-    pub fn underline(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_underline: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_underline(&self) -> bool {
-        self.color_style.unwrap_or_default().is_underline
-    }
-
-    pub fn blink(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_blink: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_blink(&self) -> bool {
-        self.color_style.unwrap_or_default().is_blink
-    }
-
-    pub fn reverse(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_reverse: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_reverse(&self) -> bool {
-        self.color_style.unwrap_or_default().is_reverse
-    }
-
-    pub fn hidden(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_hidden: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_hidden(&self) -> bool {
-        self.color_style.unwrap_or_default().is_hidden
-    }
-
-    pub fn strikethrough(&self) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                is_strikethrough: true,
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn is_strikethrough(&self) -> bool {
-        self.color_style.unwrap_or_default().is_strikethrough
-    }
-
-    pub fn fg(&self, foreground: Color) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                foreground: Some(foreground),
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn on(&self, background: Color) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                background: Some(background),
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn bg(&self, background: Color) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                background: Some(background),
-                ..self.color_style.unwrap_or_default()
-            }),
-        }
-    }
-
-    pub fn alignment(&self, align: Alignment) -> TextStyle {
-        TextStyle {
-            alignment: align,
-            color_style: self.color_style,
-        }
-    }
-
-    pub fn style(&self, style: Style) -> TextStyle {
-        TextStyle {
-            alignment: self.alignment,
-            color_style: Some(Style {
-                foreground: style.foreground,
-                background: style.background,
-                is_bold: style.is_bold,
-                is_dimmed: style.is_dimmed,
-                is_italic: style.is_italic,
-                is_underline: style.is_underline,
-                is_blink: style.is_blink,
-                is_reverse: style.is_reverse,
-                is_hidden: style.is_hidden,
-                is_strikethrough: style.is_strikethrough,
-            }),
-        }
-    }
-
-    pub fn basic_center() -> TextStyle {
-        TextStyle::new()
-            .alignment(Alignment::Center)
-            .style(Style::default())
-    }
-
-    pub fn basic_right() -> TextStyle {
-        TextStyle::new()
-            .alignment(Alignment::Right)
-            .style(Style::default())
-    }
-
-    pub fn basic_left() -> TextStyle {
-        TextStyle::new()
-            .alignment(Alignment::Left)
-            .style(Style::default())
-    }
-
-    pub fn default_header() -> TextStyle {
-        TextStyle::new()
-            .alignment(Alignment::Center)
-            .fg(Color::Green)
-            .bold(Some(true))
-    }
-
-    pub fn with_attributes(bo: bool, al: Alignment, co: Color) -> TextStyle {
-        TextStyle::new().alignment(al).fg(co).bold(Some(bo))
-    }
-
-    pub fn with_style(al: Alignment, style: Style) -> TextStyle {
-        TextStyle::new().alignment(al).style(Style {
-            foreground: style.foreground,
-            background: style.background,
-            is_bold: style.is_bold,
-            is_dimmed: style.is_dimmed,
-            is_italic: style.is_italic,
-            is_underline: style.is_underline,
-            is_blink: style.is_blink,
-            is_reverse: style.is_reverse,
-            is_hidden: style.is_hidden,
-            is_strikethrough: style.is_strikethrough,
-        })
-    }
-}
-
-impl Default for TextStyle {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Theme {
-    pub top_left: char,
-    pub middle_left: char,
-    pub bottom_left: char,
-    pub top_center: char,
-    pub center: char,
-    pub bottom_center: char,
-    pub top_right: char,
-    pub middle_right: char,
-    pub bottom_right: char,
-    pub top_horizontal: char,
-    pub middle_horizontal: char,
-    pub bottom_horizontal: char,
-    pub left_vertical: char,
-    pub center_vertical: char,
-    pub right_vertical: char,
-
-    pub separate_header: bool,
-    pub separate_rows: bool,
-
-    pub print_left_border: bool,
-    pub print_right_border: bool,
-    pub print_top_border: bool,
-    pub print_bottom_border: bool,
-}
-
-impl Theme {
-    #[allow(unused)]
-    pub fn basic() -> Theme {
-        Theme {
-            top_left: '+',
-            middle_left: '+',
-            bottom_left: '+',
-            top_center: '+',
-            center: '+',
-            bottom_center: '+',
-            top_right: '+',
-            middle_right: '+',
-            bottom_right: '+',
-            top_horizontal: '-',
-            middle_horizontal: '-',
-            bottom_horizontal: '-',
-            left_vertical: '|',
-            center_vertical: '|',
-            right_vertical: '|',
-
-            separate_header: true,
-            separate_rows: true,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn thin() -> Theme {
-        Theme {
-            top_left: '┌',
-            middle_left: '├',
-            bottom_left: '└',
-            top_center: '┬',
-            center: '┼',
-            bottom_center: '┴',
-            top_right: '┐',
-            middle_right: '┤',
-            bottom_right: '┘',
-
-            top_horizontal: '─',
-            middle_horizontal: '─',
-            bottom_horizontal: '─',
-
-            left_vertical: '│',
-            center_vertical: '│',
-            right_vertical: '│',
-
-            separate_header: true,
-            separate_rows: true,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn light() -> Theme {
-        Theme {
-            top_left: ' ',
-            middle_left: '─',
-            bottom_left: ' ',
-            top_center: ' ',
-            center: '─',
-            bottom_center: ' ',
-            top_right: ' ',
-            middle_right: '─',
-            bottom_right: ' ',
-
-            top_horizontal: ' ',
-            middle_horizontal: '─',
-            bottom_horizontal: ' ',
-
-            left_vertical: ' ',
-            center_vertical: ' ',
-            right_vertical: ' ',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: false,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn compact() -> Theme {
-        Theme {
-            top_left: '─',
-            middle_left: '─',
-            bottom_left: '─',
-            top_center: '┬',
-            center: '┼',
-            bottom_center: '┴',
-            top_right: '─',
-            middle_right: '─',
-            bottom_right: '─',
-            top_horizontal: '─',
-            middle_horizontal: '─',
-            bottom_horizontal: '─',
-
-            left_vertical: ' ',
-            center_vertical: '│',
-            right_vertical: ' ',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: false,
-            print_right_border: false,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn with_love() -> Theme {
-        Theme {
-            top_left: '❤',
-            middle_left: '❤',
-            bottom_left: '❤',
-            top_center: '❤',
-            center: '❤',
-            bottom_center: '❤',
-            top_right: '❤',
-            middle_right: '❤',
-            bottom_right: '❤',
-            top_horizontal: '❤',
-            middle_horizontal: '❤',
-            bottom_horizontal: '❤',
-
-            left_vertical: ' ',
-            center_vertical: '❤',
-            right_vertical: ' ',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: false,
-            print_right_border: false,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn compact_double() -> Theme {
-        Theme {
-            top_left: '═',
-            middle_left: '═',
-            bottom_left: '═',
-            top_center: '╦',
-            center: '╬',
-            bottom_center: '╩',
-            top_right: '═',
-            middle_right: '═',
-            bottom_right: '═',
-            top_horizontal: '═',
-            middle_horizontal: '═',
-            bottom_horizontal: '═',
-
-            left_vertical: ' ',
-            center_vertical: '║',
-            right_vertical: ' ',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: false,
-            print_right_border: false,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn rounded() -> Theme {
-        Theme {
-            top_left: '╭',
-            middle_left: '├',
-            bottom_left: '╰',
-            top_center: '┬',
-            center: '┼',
-            bottom_center: '┴',
-            top_right: '╮',
-            middle_right: '┤',
-            bottom_right: '╯',
-            top_horizontal: '─',
-            middle_horizontal: '─',
-            bottom_horizontal: '─',
-
-            left_vertical: '│',
-            center_vertical: '│',
-            right_vertical: '│',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn reinforced() -> Theme {
-        Theme {
-            top_left: '┏',
-            middle_left: '├',
-            bottom_left: '┗',
-            top_center: '┬',
-            center: '┼',
-            bottom_center: '┴',
-            top_right: '┓',
-            middle_right: '┤',
-            bottom_right: '┛',
-            top_horizontal: '─',
-            middle_horizontal: '─',
-            bottom_horizontal: '─',
-
-            left_vertical: '│',
-            center_vertical: '│',
-            right_vertical: '│',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-
-    #[allow(unused)]
-    pub fn heavy() -> Theme {
-        Theme {
-            top_left: '┏',
-            middle_left: '┣',
-            bottom_left: '┗',
-            top_center: '┳',
-            center: '╋',
-            bottom_center: '┻',
-            top_right: '┓',
-            middle_right: '┫',
-            bottom_right: '┛',
-            top_horizontal: '━',
-            middle_horizontal: '━',
-            bottom_horizontal: '━',
-
-            left_vertical: '┃',
-            center_vertical: '┃',
-            right_vertical: '┃',
-
-            separate_header: true,
-            separate_rows: false,
-
-            print_left_border: true,
-            print_right_border: true,
-            print_top_border: true,
-            print_bottom_border: true,
-        }
-    }
-    #[allow(unused)]
-    pub fn none() -> Theme {
-        Theme {
-            top_left: ' ',
-            middle_left: ' ',
-            bottom_left: ' ',
-            top_center: ' ',
-            center: ' ',
-            bottom_center: ' ',
-            top_right: ' ',
-            middle_right: ' ',
-            bottom_right: ' ',
-
-            top_horizontal: ' ',
-            middle_horizontal: ' ',
-            bottom_horizontal: ' ',
-
-            left_vertical: ' ',
-            center_vertical: ' ',
-            right_vertical: ' ',
-
-            separate_header: false,
-            separate_rows: false,
-
-            print_left_border: false,
-            print_right_border: false,
-            print_top_border: false,
-            print_bottom_border: false,
-        }
-    }
-}
-
-impl Table {
-    pub fn new(headers: Vec<StyledString>, data: Vec<Vec<StyledString>>, theme: Theme) -> Table {
-        Table {
-            headers,
-            data,
-            theme,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ProcessedTable<'a> {
-    pub headers: Vec<ProcessedCell<'a>>,
-    pub data: Vec<Vec<ProcessedCell<'a>>>,
-    pub theme: Theme,
-}
-
-#[derive(Debug)]
-pub struct ProcessedCell<'a> {
-    pub contents: Vec<Vec<Subline<'a>>>,
-    pub style: TextStyle,
-}
-
-#[derive(Debug)]
-pub struct WrappedTable {
-    pub column_widths: Vec<usize>,
-    pub headers: Vec<WrappedCell>,
-    pub data: Vec<Vec<WrappedCell>>,
-    pub theme: Theme,
-}
-
-impl WrappedTable {
-    fn print_separator(
-        &self,
-        separator_position: SeparatorPosition,
-        color_hm: &HashMap<String, Style>,
-    ) -> String {
-        let column_count = self.column_widths.len();
-        let mut output = String::new();
-        let sep_color = color_hm
-            .get("separator_color")
-            .unwrap_or(&Style::default())
-            .to_owned();
-
-        match separator_position {
-            SeparatorPosition::Top => {
-                for column in self.column_widths.iter().enumerate() {
-                    if column.0 == 0 && self.theme.print_left_border {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.top_left.to_string())
-                                .to_string(),
-                        );
-                    }
-
-                    for _ in 0..*column.1 {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.top_horizontal.to_string())
-                                .to_string(),
-                        );
-                    }
-
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.top_horizontal.to_string())
-                            .to_string(),
-                    );
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.top_horizontal.to_string())
-                            .to_string(),
-                    );
-                    if column.0 == column_count - 1 {
-                        if self.theme.print_right_border {
-                            output.push_str(
-                                &sep_color
-                                    .paint(&self.theme.top_right.to_string())
-                                    .to_string(),
-                            );
-                        }
-                    } else {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.top_center.to_string())
-                                .to_string(),
-                        );
-                    }
-                }
-            }
-            SeparatorPosition::Middle => {
-                for column in self.column_widths.iter().enumerate() {
-                    if column.0 == 0 && self.theme.print_left_border {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.middle_left.to_string())
-                                .to_string(),
-                        );
-                    }
-
-                    for _ in 0..*column.1 {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.middle_horizontal.to_string())
-                                .to_string(),
-                        );
-                    }
-
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.middle_horizontal.to_string())
-                            .to_string(),
-                    );
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.middle_horizontal.to_string())
-                            .to_string(),
-                    );
-
-                    if column.0 == column_count - 1 {
-                        if self.theme.print_right_border {
-                            output.push_str(
-                                &sep_color
-                                    .paint(&self.theme.middle_right.to_string())
-                                    .to_string(),
-                            );
-                        }
-                    } else {
-                        output
-                            .push_str(&sep_color.paint(&self.theme.center.to_string()).to_string());
-                    }
-                }
-            }
-            SeparatorPosition::Bottom => {
-                for column in self.column_widths.iter().enumerate() {
-                    if column.0 == 0 && self.theme.print_left_border {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.bottom_left.to_string())
-                                .to_string(),
-                        );
-                    }
-                    for _ in 0..*column.1 {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.bottom_horizontal.to_string())
-                                .to_string(),
-                        );
-                    }
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.bottom_horizontal.to_string())
-                            .to_string(),
-                    );
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.bottom_horizontal.to_string())
-                            .to_string(),
-                    );
-
-                    if column.0 == column_count - 1 {
-                        if self.theme.print_right_border {
-                            output.push_str(
-                                &sep_color
-                                    .paint(&self.theme.bottom_right.to_string())
-                                    .to_string(),
-                            );
-                        }
-                    } else {
-                        output.push_str(
-                            &sep_color
-                                .paint(&self.theme.bottom_center.to_string())
-                                .to_string(),
-                        );
-                    }
-                }
-            }
-        }
-        output.push('\n');
-        output
-    }
-
-    fn print_cell_contents(
-        &self,
-        cells: &[WrappedCell],
-        color_hm: &HashMap<String, Style>,
-    ) -> String {
-        let sep_color = color_hm
-            .get("separator_color")
-            .unwrap_or(&Style::default())
-            .to_owned();
-
-        let mut total_output = String::new();
-
-        for current_line in 0.. {
-            let mut lines_printed = 0;
-
-            let mut output = String::new();
-            if self.theme.print_left_border {
-                output.push_str(
-                    &sep_color
-                        .paint(&self.theme.left_vertical.to_string())
-                        .to_string(),
-                );
-            }
-
-            for column in cells.iter().enumerate() {
-                if let Some(line) = (column.1).lines.get(current_line) {
-                    let remainder = self.column_widths[column.0] - line.width;
-                    output.push(' ');
-
-                    match column.1.style.alignment {
-                        Alignment::Left => {
-                            if let Some(color) = column.1.style.color_style {
-                                output.push_str(&color.paint(&line.line).to_string());
-                            } else {
-                                output.push_str(&line.line);
-                            }
-                            for _ in 0..remainder {
-                                output.push(' ');
-                            }
-                        }
-                        Alignment::Center => {
-                            for _ in 0..remainder / 2 {
-                                output.push(' ');
-                            }
-                            if let Some(color) = column.1.style.color_style {
-                                output.push_str(&color.paint(&line.line).to_string());
-                            } else {
-                                output.push_str(&line.line);
-                            }
-                            for _ in 0..(remainder / 2 + remainder % 2) {
-                                output.push(' ');
-                            }
-                        }
-                        Alignment::Right => {
-                            for _ in 0..remainder {
-                                output.push(' ');
-                            }
-                            if let Some(color) = column.1.style.color_style {
-                                output.push_str(&color.paint(&line.line).to_string());
-                            } else {
-                                output.push_str(&line.line);
-                            }
-                        }
-                    }
-                    output.push(' ');
-                    lines_printed += 1;
-                } else {
-                    for _ in 0..self.column_widths[column.0] + 2 {
-                        output.push(' ');
-                    }
-                }
-                if column.0 < cells.len() - 1 {
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.center_vertical.to_string())
-                            .to_string(),
-                    );
-                } else if self.theme.print_right_border {
-                    output.push_str(
-                        &sep_color
-                            .paint(&self.theme.right_vertical.to_string())
-                            .to_string(),
-                    );
-                }
-            }
-
-            if lines_printed == 0 {
-                break;
-            }
-
-            writeln!(&mut total_output, "{}", output).unwrap();
-        }
-        total_output
-    }
-
-    fn print_table(&self, color_hm: &HashMap<String, Style>) -> String {
-        let mut output = String::new();
-
-        #[cfg(windows)]
-        {
-            let _ = nu_ansi_term::enable_ansi_support();
-        }
-
-        if self.data.is_empty() {
-            return output;
-        }
-
-        if self.theme.print_top_border {
-            output.push_str(&self.print_separator(SeparatorPosition::Top, color_hm));
-        }
-
-        let skip_headers = (self.headers.len() == 2 && self.headers[1].max_width == 0)
-            || (self.headers.len() == 1 && self.headers[0].max_width == 0);
-
-        if !self.headers.is_empty() && !skip_headers {
-            output.push_str(&self.print_cell_contents(&self.headers, color_hm));
-        }
-
-        let mut first_row = true;
-
-        for row in &self.data {
-            if !first_row {
-                if self.theme.separate_rows {
-                    output.push_str(&self.print_separator(SeparatorPosition::Middle, color_hm));
-                }
-            } else {
-                first_row = false;
-
-                if self.theme.separate_header && !self.headers.is_empty() && !skip_headers {
-                    output.push_str(&self.print_separator(SeparatorPosition::Middle, color_hm));
-                }
-            }
-
-            output.push_str(&self.print_cell_contents(row, color_hm));
-        }
-
-        if self.theme.print_bottom_border {
-            output.push_str(&self.print_separator(SeparatorPosition::Bottom, color_hm));
-        }
-
-        if atty::is(atty::Stream::Stdout) {
-            // Draw the table with ansi colors
-            output
-        } else {
-            // Draw the table without ansi colors
-            if let Ok(bytes) = strip_ansi_escapes::strip(&output) {
-                String::from_utf8_lossy(&bytes).to_string()
-            } else {
-                output
-            }
-        }
-    }
-}
-
-fn process_table(table: &Table) -> ProcessedTable {
-    let mut processed_data = vec![];
-    for row in &table.data {
-        let mut out_row = vec![];
-        for column in row {
-            out_row.push(ProcessedCell {
-                contents: split_sublines(&column.contents),
-                style: column.style,
-            });
-        }
-        processed_data.push(out_row);
-    }
-
-    let mut processed_headers = vec![];
-    for header in &table.headers {
-        processed_headers.push(ProcessedCell {
-            contents: split_sublines(&header.contents),
-            style: header.style,
-        });
-    }
-
-    ProcessedTable {
-        headers: processed_headers,
-        data: processed_data,
-        theme: table.theme.clone(),
-    }
-}
-
-fn get_max_column_widths(processed_table: &ProcessedTable) -> Vec<usize> {
-    use std::cmp::max;
-
-    let mut max_num_columns = 0;
-
-    max_num_columns = max(max_num_columns, processed_table.headers.len());
-
-    for row in &processed_table.data {
-        max_num_columns = max(max_num_columns, row.len());
-    }
-
-    let mut output = vec![0; max_num_columns];
-
-    for column in processed_table.headers.iter().enumerate() {
-        output[column.0] = max(output[column.0], column_width(&column.1.contents));
-    }
-
-    for row in &processed_table.data {
-        for column in row.iter().enumerate() {
-            output[column.0] = max(output[column.0], column_width(&column.1.contents));
-        }
-    }
-
-    output
-}
-
-pub fn maybe_truncate_columns(termwidth: usize, processed_table: &mut ProcessedTable) {
-    // Make sure we have enough space for the columns we have
-    let max_num_of_columns = termwidth / 10;
-
-    // If we have too many columns, truncate the table
-    if max_num_of_columns < processed_table.headers.len() {
-        processed_table.headers.truncate(max_num_of_columns);
-
-        for entry in processed_table.data.iter_mut() {
-            entry.truncate(max_num_of_columns);
-        }
-
-        processed_table.headers.push(ProcessedCell {
-            contents: vec![vec![Subline {
-                subline: "...",
-                width: 3,
-            }]],
-            style: TextStyle::basic_center(),
-        });
-
-        for entry in processed_table.data.iter_mut() {
-            entry.push(ProcessedCell {
-                contents: vec![vec![Subline {
-                    subline: "...",
-                    width: 3,
-                }]],
-                style: TextStyle::basic_center(),
-            }); // ellipsis is centred
-        }
-    }
-}
-
-pub fn draw_table(table: &Table, termwidth: usize, color_hm: &HashMap<String, Style>) -> String {
-    // Remove the edges, if used
-    let termwidth = if table.theme.print_left_border && table.theme.print_right_border {
-        termwidth - 2
-    } else if table.theme.print_left_border || table.theme.print_right_border {
-        termwidth - 1
-    } else {
-        termwidth
-    };
-
-    let mut processed_table = process_table(table);
-
-    let max_per_column = get_max_column_widths(&processed_table);
-
-    maybe_truncate_columns(termwidth, &mut processed_table);
-
-    let headers_len = processed_table.headers.len();
-
-    // fix the length of the table if there are no headers:
-    let headers_len = if headers_len == 0 {
-        if !table.data.is_empty() && !table.data[0].is_empty() {
-            table.data[0].len()
-        } else {
-            return String::new();
-        }
-    } else {
-        headers_len
-    };
-
-    // Measure how big our columns need to be (accounting for separators also)
-    let max_naive_column_width = (termwidth - 3 * (headers_len - 1)) / headers_len;
-
-    let column_space = ColumnSpace::measure(&max_per_column, max_naive_column_width, headers_len);
-
-    // This gives us the max column width
-    let max_column_width = column_space.max_width(termwidth);
-
-    // This width isn't quite right, as we're rounding off some of our space
-    let column_space = column_space.fix_almost_column_width(
-        &max_per_column,
-        max_naive_column_width,
-        max_column_width,
-        headers_len,
-    );
-
-    // This should give us the final max column width
-    let max_column_width = column_space.max_width(termwidth);
-    let re_leading =
-        regex::Regex::new(r"(?P<beginsp>^\s+)").expect("error with leading space regex");
-    let re_trailing =
-        regex::Regex::new(r"(?P<endsp>\s+$)").expect("error with trailing space regex");
-
-    let wrapped_table = wrap_cells(
-        processed_table,
-        max_column_width,
-        color_hm,
-        &re_leading,
-        &re_trailing,
-    );
-
-    wrapped_table.print_table(color_hm)
-}
-
-fn wrap_cells(
-    processed_table: ProcessedTable,
-    max_column_width: usize,
-    color_hm: &HashMap<String, Style>,
-    re_leading: &regex::Regex,
-    re_trailing: &regex::Regex,
-) -> WrappedTable {
-    let mut column_widths = vec![
-        0;
-        std::cmp::max(
-            processed_table.headers.len(),
-            if !processed_table.data.is_empty() {
-                processed_table.data[0].len()
-            } else {
-                0
-            }
-        )
-    ];
-    let mut output_headers = vec![];
-    for header in processed_table.headers.into_iter().enumerate() {
-        let mut wrapped = WrappedCell {
-            lines: vec![],
-            max_width: 0,
-            style: header.1.style,
-        };
-
-        for contents in header.1.contents.into_iter() {
-            let (mut lines, inner_max_width) = wrap(
-                max_column_width,
-                contents.into_iter(),
-                color_hm,
-                re_leading,
-                re_trailing,
-            );
-            wrapped.lines.append(&mut lines);
-            if inner_max_width > wrapped.max_width {
-                wrapped.max_width = inner_max_width;
-            }
-        }
-        if column_widths[header.0] < wrapped.max_width {
-            column_widths[header.0] = wrapped.max_width;
-        }
-        output_headers.push(wrapped);
-    }
-
-    let mut output_data = vec![];
-    for row in processed_table.data.into_iter() {
-        let mut output_row = vec![];
-        for column in row.into_iter().enumerate() {
-            let mut wrapped = WrappedCell {
-                lines: vec![],
-                max_width: 0,
-                style: column.1.style,
-            };
-            for contents in column.1.contents.into_iter() {
-                let (mut lines, inner_max_width) = wrap(
-                    max_column_width,
-                    contents.into_iter(),
-                    color_hm,
-                    re_leading,
-                    re_trailing,
-                );
-                wrapped.lines.append(&mut lines);
-                if inner_max_width > wrapped.max_width {
-                    wrapped.max_width = inner_max_width;
-                }
-            }
-            if column_widths[column.0] < wrapped.max_width {
-                column_widths[column.0] = wrapped.max_width;
-            }
-            output_row.push(wrapped);
-        }
-        output_data.push(output_row);
-    }
-
-    WrappedTable {
-        column_widths,
-        headers: output_headers,
-        data: output_data,
-        theme: processed_table.theme,
-    }
-}
-
-struct ColumnSpace {
-    num_overages: usize,
-    underage_sum: usize,
-    overage_separator_sum: usize,
-}
-
-impl ColumnSpace {
-    /// Measure how much space we have once we subtract off the columns who are small enough
-    fn measure(
-        max_per_column: &[usize],
-        max_naive_column_width: usize,
-        headers_len: usize,
-    ) -> ColumnSpace {
-        let mut num_overages = 0;
-        let mut underage_sum = 0;
-        let mut overage_separator_sum = 0;
-        let iter = max_per_column.iter().enumerate().take(headers_len);
-
-        for (i, &column_max) in iter {
-            if column_max > max_naive_column_width {
-                num_overages += 1;
-                if i != (headers_len - 1) {
-                    overage_separator_sum += 3;
-                }
-                if i == 0 {
-                    overage_separator_sum += 1;
-                }
-            } else {
-                underage_sum += column_max;
-                // if column isn't last, add 3 for its separator
-                if i != (headers_len - 1) {
-                    underage_sum += 3;
-                }
-                if i == 0 {
-                    underage_sum += 1;
-                }
-            }
-        }
-
-        ColumnSpace {
-            num_overages,
-            underage_sum,
-            overage_separator_sum,
-        }
-    }
-
-    fn fix_almost_column_width(
-        self,
-        max_per_column: &[usize],
-        max_naive_column_width: usize,
-        max_column_width: usize,
-        headers_len: usize,
-    ) -> ColumnSpace {
-        let mut num_overages = 0;
-        let mut overage_separator_sum = 0;
-        let mut underage_sum = self.underage_sum;
-        let iter = max_per_column.iter().enumerate().take(headers_len);
-
-        for (i, &column_max) in iter {
-            if column_max > max_naive_column_width {
-                if column_max <= max_column_width {
-                    underage_sum += column_max;
-                    // if column isn't last, add 3 for its separator
-                    if i != (headers_len - 1) {
-                        underage_sum += 3;
-                    }
-                    if i == 0 {
-                        underage_sum += 1;
-                    }
-                } else {
-                    // Column is still too large, so let's count it
-                    num_overages += 1;
-                    if i != (headers_len - 1) {
-                        overage_separator_sum += 3;
-                    }
-                    if i == 0 {
-                        overage_separator_sum += 1;
-                    }
-                }
-            }
-        }
-
-        ColumnSpace {
-            num_overages,
-            underage_sum,
-            overage_separator_sum,
-        }
-    }
-
-    fn max_width(&self, termwidth: usize) -> usize {
-        let ColumnSpace {
-            num_overages,
-            underage_sum,
-            overage_separator_sum,
-        } = self;
-
-        if *num_overages > 0 {
-            (termwidth - 1 - *underage_sum - *overage_separator_sum) / *num_overages
-        } else {
-            99999
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-table/src/wrap.rs b/old_nushell/crates/nu-table/src/wrap.rs
deleted file mode 100644
index 2bdb97eda..000000000
--- a/old_nushell/crates/nu-table/src/wrap.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-use crate::table::TextStyle;
-use nu_ansi_term::Style;
-use std::collections::HashMap;
-use std::{fmt::Display, iter::Iterator};
-use unicode_width::UnicodeWidthStr;
-
-#[derive(Debug, Clone, Copy)]
-pub enum Alignment {
-    Left,
-    Center,
-    Right,
-}
-
-#[derive(Debug)]
-pub struct Subline<'a> {
-    pub subline: &'a str,
-    pub width: usize,
-}
-
-#[derive(Debug)]
-pub struct Line<'a> {
-    pub sublines: Vec<Subline<'a>>,
-    pub width: usize,
-}
-
-#[derive(Debug)]
-pub struct WrappedLine {
-    pub line: String,
-    pub width: usize,
-}
-
-#[derive(Debug)]
-pub struct WrappedCell {
-    pub lines: Vec<WrappedLine>,
-    pub max_width: usize,
-
-    pub style: TextStyle,
-}
-
-impl<'a> Display for Line<'a> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let mut first = true;
-        for subline in &self.sublines {
-            if !first {
-                write!(f, " ")?;
-            } else {
-                first = false;
-            }
-            write!(f, "{}", subline.subline)?;
-        }
-        Ok(())
-    }
-}
-
-pub fn split_sublines(input: &str) -> Vec<Vec<Subline>> {
-    input
-        .split_terminator('\n')
-        .map(|line| {
-            line.split_terminator(' ')
-                .map(|x| Subline {
-                    subline: x,
-                    width: {
-                        // We've tried UnicodeWidthStr::width(x), UnicodeSegmentation::graphemes(x, true).count()
-                        // and x.chars().count() with all types of combinations. Currently, it appears that
-                        // getting the max of char count and Unicode width seems to produce the best layout.
-                        // However, it's not perfect.
-                        let c = x.chars().count();
-                        let u = UnicodeWidthStr::width(x);
-                        std::cmp::max(c, u)
-                    },
-                })
-                .collect::<Vec<_>>()
-        })
-        .collect::<Vec<_>>()
-}
-
-pub fn column_width(input: &[Vec<Subline>]) -> usize {
-    let mut max = 0;
-
-    for line in input {
-        let mut total = 0;
-
-        let mut first = true;
-        for inp in line {
-            if !first {
-                // Account for the space
-                total += 1;
-            } else {
-                first = false;
-            }
-
-            total += inp.width;
-        }
-
-        if total > max {
-            max = total;
-        }
-    }
-
-    max
-}
-
-fn split_word(cell_width: usize, word: &str) -> Vec<Subline> {
-    use unicode_width::UnicodeWidthChar;
-
-    let mut output = vec![];
-    let mut current_width = 0;
-    let mut start_index = 0;
-    let mut end_index;
-
-    for c in word.char_indices() {
-        if let Some(width) = c.1.width() {
-            end_index = c.0;
-            if current_width + width > cell_width {
-                output.push(Subline {
-                    subline: &word[start_index..end_index],
-                    width: current_width,
-                });
-
-                start_index = c.0;
-                current_width = width;
-            } else {
-                current_width += width;
-            }
-        }
-    }
-
-    if start_index != word.len() {
-        output.push(Subline {
-            subline: &word[start_index..],
-            width: current_width,
-        });
-    }
-
-    output
-}
-
-pub fn wrap<'a>(
-    cell_width: usize,
-    mut input: impl Iterator<Item = Subline<'a>>,
-    color_hm: &HashMap<String, Style>,
-    re_leading: &regex::Regex,
-    re_trailing: &regex::Regex,
-) -> (Vec<WrappedLine>, usize) {
-    let mut lines = vec![];
-    let mut current_line: Vec<Subline> = vec![];
-    let mut current_width = 0;
-    let mut first = true;
-    let mut max_width = 0;
-    let lead_trail_space_bg_color = color_hm
-        .get("leading_trailing_space_bg")
-        .unwrap_or(&Style::default())
-        .to_owned();
-
-    loop {
-        match input.next() {
-            Some(item) => {
-                if !first {
-                    current_width += 1;
-                } else {
-                    first = false;
-                }
-
-                if item.width + current_width > cell_width {
-                    // If this is a really long single word, we need to split the word
-                    if current_line.len() == 1 && current_width > cell_width {
-                        max_width = cell_width;
-                        let sublines = split_word(cell_width, current_line[0].subline);
-                        for subline in sublines {
-                            let width = subline.width;
-                            lines.push(Line {
-                                sublines: vec![subline],
-                                width,
-                            });
-                        }
-
-                        first = true;
-
-                        current_width = item.width;
-                        current_line = vec![item];
-                    } else {
-                        if !current_line.is_empty() {
-                            lines.push(Line {
-                                sublines: current_line,
-                                width: current_width,
-                            });
-                        }
-
-                        first = true;
-
-                        current_width = item.width;
-                        current_line = vec![item];
-                        max_width = std::cmp::max(max_width, current_width);
-                    }
-                } else {
-                    current_width += item.width;
-                    current_line.push(item);
-                }
-            }
-            None => {
-                if current_width > cell_width {
-                    // We need to break up the last word
-                    let sublines = split_word(cell_width, current_line[0].subline);
-                    for subline in sublines {
-                        let width = subline.width;
-                        lines.push(Line {
-                            sublines: vec![subline],
-                            width,
-                        });
-                    }
-                } else if current_width > 0 {
-                    lines.push(Line {
-                        sublines: current_line,
-                        width: current_width,
-                    });
-                }
-                break;
-            }
-        }
-    }
-
-    let mut current_max = 0;
-    let mut output = vec![];
-
-    for line in lines {
-        let mut current_line_width = 0;
-        let mut first = true;
-        let mut current_line = String::new();
-
-        for subline in line.sublines {
-            if !first {
-                current_line_width += 1 + subline.width;
-                current_line.push(' ');
-            } else {
-                first = false;
-                current_line_width = subline.width;
-            }
-            current_line.push_str(subline.subline);
-        }
-
-        if current_line_width > current_max {
-            current_max = current_line_width;
-        }
-
-        // highlight leading and trailing spaces so they stand out.
-        let mut bg_color_string = Style::default().prefix().to_string();
-        // right now config settings can only set foreground colors so, in this
-        // instance we take the foreground color and make it a background color
-        if let Some(bg) = lead_trail_space_bg_color.foreground {
-            bg_color_string = Style::default().on(bg).prefix().to_string()
-        };
-
-        if let Some(leading_match) = re_leading.find(&current_line.clone()) {
-            String::insert_str(
-                &mut current_line,
-                leading_match.end(),
-                nu_ansi_term::ansi::RESET,
-            );
-            String::insert_str(&mut current_line, leading_match.start(), &bg_color_string);
-        }
-
-        if let Some(trailing_match) = re_trailing.find(&current_line.clone()) {
-            String::insert_str(&mut current_line, trailing_match.start(), &bg_color_string);
-            current_line += nu_ansi_term::ansi::RESET;
-        }
-
-        output.push(WrappedLine {
-            line: current_line,
-            width: current_line_width,
-        });
-    }
-
-    (output, current_max)
-}
diff --git a/old_nushell/crates/nu-test-support/Cargo.toml b/old_nushell/crates/nu-test-support/Cargo.toml
deleted file mode 100644
index d53734b91..000000000
--- a/old_nushell/crates/nu-test-support/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Support for writing Nushell tests"
-edition = "2018"
-license = "MIT"
-name = "nu-test-support"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-path = { version = "0.43.0", path="../nu-path" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-chrono = "0.4.19"
-getset = "0.1.1"
-glob = "0.3.0"
-indexmap = { version="1.6.1", features=["serde-1"] }
-num-bigint = { version="0.4.3", features=["serde"] }
-tempfile = "3.2.0"
-hamcrest2 = "0.3.0"
diff --git a/old_nushell/crates/nu-test-support/src/commands.rs b/old_nushell/crates/nu-test-support/src/commands.rs
deleted file mode 100644
index 18ec95264..000000000
--- a/old_nushell/crates/nu-test-support/src/commands.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use nu_protocol::hir::{Expression, ExternalArgs, ExternalCommand, SpannedExpression};
-use nu_source::{Span, SpannedItem, Tag};
-
-pub struct ExternalBuilder {
-    name: String,
-    args: Vec<String>,
-}
-
-impl ExternalBuilder {
-    pub fn for_name(name: &str) -> ExternalBuilder {
-        ExternalBuilder {
-            name: name.to_string(),
-            args: vec![],
-        }
-    }
-
-    pub fn arg(&mut self, value: &str) -> &mut Self {
-        self.args.push(value.to_string());
-        self
-    }
-
-    pub fn build(&mut self) -> ExternalCommand {
-        let mut path = crate::fs::binaries();
-        path.push(&self.name);
-
-        let name = path.to_string_lossy().to_string().spanned(Span::unknown());
-
-        let args = self
-            .args
-            .iter()
-            .map(|arg| SpannedExpression {
-                expr: Expression::string(arg.to_string()),
-                span: Span::unknown(),
-            })
-            .collect::<Vec<_>>();
-
-        ExternalCommand {
-            name: name.to_string(),
-            name_tag: Tag::unknown(),
-            args: ExternalArgs {
-                list: args,
-                span: name.span,
-            },
-        }
-    }
-}
diff --git a/old_nushell/crates/nu-test-support/src/fs.rs b/old_nushell/crates/nu-test-support/src/fs.rs
deleted file mode 100644
index bf7d87df7..000000000
--- a/old_nushell/crates/nu-test-support/src/fs.rs
+++ /dev/null
@@ -1,277 +0,0 @@
-use std::io::Read;
-use std::ops::Div;
-use std::path::{Path, PathBuf};
-
-pub struct AbsoluteFile {
-    inner: PathBuf,
-}
-
-impl AbsoluteFile {
-    pub fn new(path: impl AsRef<Path>) -> AbsoluteFile {
-        let path = path.as_ref();
-
-        if !path.is_absolute() {
-            panic!(
-                "AbsoluteFile::new must take an absolute path :: {}",
-                path.display()
-            )
-        } else if path.is_dir() {
-            // At the moment, this is not an invariant, but rather a way to catch bugs
-            // in tests.
-            panic!(
-                "AbsoluteFile::new must not take a directory :: {}",
-                path.display()
-            )
-        } else {
-            AbsoluteFile {
-                inner: path.to_path_buf(),
-            }
-        }
-    }
-
-    pub fn dir(&self) -> AbsolutePath {
-        AbsolutePath::new(if let Some(parent) = self.inner.parent() {
-            parent
-        } else {
-            unreachable!("Internal error: could not get parent in dir")
-        })
-    }
-}
-
-impl From<AbsoluteFile> for PathBuf {
-    fn from(file: AbsoluteFile) -> Self {
-        file.inner
-    }
-}
-
-pub struct AbsolutePath {
-    pub inner: PathBuf,
-}
-
-impl AbsolutePath {
-    pub fn new(path: impl AsRef<Path>) -> AbsolutePath {
-        let path = path.as_ref();
-
-        if path.is_absolute() {
-            AbsolutePath {
-                inner: path.to_path_buf(),
-            }
-        } else {
-            panic!("AbsolutePath::new must take an absolute path")
-        }
-    }
-}
-
-impl Div<&str> for &AbsolutePath {
-    type Output = AbsolutePath;
-
-    fn div(self, rhs: &str) -> Self::Output {
-        let parts = rhs.split('/');
-        let mut result = self.inner.clone();
-
-        for part in parts {
-            result = result.join(part);
-        }
-
-        AbsolutePath::new(result)
-    }
-}
-
-impl AsRef<Path> for AbsolutePath {
-    fn as_ref(&self) -> &Path {
-        self.inner.as_path()
-    }
-}
-
-pub struct RelativePath {
-    inner: PathBuf,
-}
-
-impl RelativePath {
-    pub fn new(path: impl Into<PathBuf>) -> RelativePath {
-        let path = path.into();
-
-        if path.is_relative() {
-            RelativePath { inner: path }
-        } else {
-            panic!("RelativePath::new must take a relative path")
-        }
-    }
-}
-
-impl<T: AsRef<str>> Div<T> for &RelativePath {
-    type Output = RelativePath;
-
-    fn div(self, rhs: T) -> Self::Output {
-        let parts = rhs.as_ref().split('/');
-        let mut result = self.inner.clone();
-
-        for part in parts {
-            result = result.join(part);
-        }
-
-        RelativePath::new(result)
-    }
-}
-pub trait DisplayPath {
-    fn display_path(&self) -> String;
-}
-
-impl DisplayPath for AbsolutePath {
-    fn display_path(&self) -> String {
-        self.inner.display().to_string()
-    }
-}
-
-impl DisplayPath for PathBuf {
-    fn display_path(&self) -> String {
-        self.display().to_string()
-    }
-}
-
-impl DisplayPath for str {
-    fn display_path(&self) -> String {
-        self.to_string()
-    }
-}
-
-impl DisplayPath for &str {
-    fn display_path(&self) -> String {
-        (*self).to_string()
-    }
-}
-
-impl DisplayPath for String {
-    fn display_path(&self) -> String {
-        self.clone()
-    }
-}
-
-impl DisplayPath for &String {
-    fn display_path(&self) -> String {
-        (*self).to_string()
-    }
-}
-pub enum Stub<'a> {
-    FileWithContent(&'a str, &'a str),
-    FileWithContentToBeTrimmed(&'a str, &'a str),
-    EmptyFile(&'a str),
-}
-
-pub fn file_contents(full_path: impl AsRef<Path>) -> String {
-    let mut file = std::fs::File::open(full_path.as_ref()).expect("can not open file");
-    let mut contents = String::new();
-    file.read_to_string(&mut contents)
-        .expect("can not read file");
-    contents
-}
-
-pub fn file_contents_binary(full_path: impl AsRef<Path>) -> Vec<u8> {
-    let mut file = std::fs::File::open(full_path.as_ref()).expect("can not open file");
-    let mut contents = Vec::new();
-    file.read_to_end(&mut contents).expect("can not read file");
-    contents
-}
-
-pub fn line_ending() -> String {
-    #[cfg(windows)]
-    {
-        String::from("\r\n")
-    }
-
-    #[cfg(not(windows))]
-    {
-        String::from("\n")
-    }
-}
-
-pub fn delete_file_at(full_path: impl AsRef<Path>) {
-    let full_path = full_path.as_ref();
-
-    if full_path.exists() {
-        std::fs::remove_file(full_path).expect("can not delete file");
-    }
-}
-
-pub fn create_file_at(full_path: impl AsRef<Path>) -> Result<(), std::io::Error> {
-    let full_path = full_path.as_ref();
-
-    if full_path.parent().is_some() {
-        panic!("path exists");
-    }
-
-    std::fs::write(full_path, b"fake data")
-}
-
-pub fn copy_file_to(source: &str, destination: &str) {
-    std::fs::copy(source, destination).expect("can not copy file");
-}
-
-pub fn files_exist_at(files: Vec<impl AsRef<Path>>, path: impl AsRef<Path>) -> bool {
-    files.iter().all(|f| {
-        let mut loc = PathBuf::from(path.as_ref());
-        loc.push(f);
-        loc.exists()
-    })
-}
-
-pub fn delete_directory_at(full_path: &str) {
-    std::fs::remove_dir_all(PathBuf::from(full_path)).expect("can not remove directory");
-}
-
-pub fn executable_path() -> PathBuf {
-    let mut path = binaries();
-    path.push("nu");
-    path
-}
-
-pub fn root() -> PathBuf {
-    let manifest_dir = if let Ok(manifest_dir) = std::env::var("CARGO_MANIFEST_DIR") {
-        PathBuf::from(manifest_dir)
-    } else {
-        PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-    };
-
-    let test_path = manifest_dir.join("Cargo.lock");
-    if test_path.exists() {
-        manifest_dir
-    } else {
-        manifest_dir
-            .parent()
-            .expect("Couldn't find the debug binaries directory")
-            .parent()
-            .expect("Couldn't find the debug binaries directory")
-            .to_path_buf()
-    }
-}
-
-pub fn binaries() -> PathBuf {
-    let mut build_type = "debug";
-    if !cfg!(debug_assertions) {
-        build_type = "release"
-    }
-
-    std::env::var("CARGO_TARGET_DIR")
-        .ok()
-        .map(|target_dir| PathBuf::from(target_dir).join(&build_type))
-        .unwrap_or_else(|| root().join(format!("target/{}", &build_type)))
-}
-
-pub fn fixtures() -> PathBuf {
-    root().join("tests/fixtures")
-}
-
-pub fn assets() -> PathBuf {
-    root().join("tests/assets")
-}
-
-pub fn in_directory(str: impl AsRef<Path>) -> String {
-    let path = str.as_ref();
-    let path = if path.is_relative() {
-        root().join(path)
-    } else {
-        path.to_path_buf()
-    };
-
-    path.display().to_string()
-}
diff --git a/old_nushell/crates/nu-test-support/src/lib.rs b/old_nushell/crates/nu-test-support/src/lib.rs
deleted file mode 100644
index 3e4988c4d..000000000
--- a/old_nushell/crates/nu-test-support/src/lib.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-pub mod commands;
-pub mod fs;
-pub mod macros;
-pub mod playground;
-pub mod value;
-
-pub struct Outcome {
-    pub out: String,
-    pub err: String,
-}
-
-#[cfg(windows)]
-pub const NATIVE_PATH_ENV_VAR: &str = "Path";
-#[cfg(not(windows))]
-pub const NATIVE_PATH_ENV_VAR: &str = "PATH";
-
-#[cfg(windows)]
-pub const NATIVE_PATH_ENV_SEPARATOR: char = ';';
-#[cfg(not(windows))]
-pub const NATIVE_PATH_ENV_SEPARATOR: char = ':';
-
-impl Outcome {
-    pub fn new(out: String, err: String) -> Outcome {
-        Outcome { out, err }
-    }
-}
-
-pub fn pipeline(commands: &str) -> String {
-    commands
-        .lines()
-        .skip(1)
-        .map(|line| line.trim())
-        .collect::<Vec<&str>>()
-        .join(" ")
-        .trim_end()
-        .to_string()
-}
-
-pub fn shell_os_paths() -> Vec<std::path::PathBuf> {
-    let mut original_paths = vec![];
-
-    if let Some(paths) = std::env::var_os(NATIVE_PATH_ENV_VAR) {
-        original_paths = std::env::split_paths(&paths).collect::<Vec<_>>();
-    }
-
-    original_paths
-}
-
-#[cfg(test)]
-mod tests {
-    use super::pipeline;
-
-    #[test]
-    fn constructs_a_pipeline() {
-        let actual = pipeline(
-            r#"
-                open los_tres_amigos.txt
-                | from-csv
-                | get rusty_luck
-                | str to-int
-                | math sum
-                | echo "$it"
-            "#,
-        );
-
-        assert_eq!(
-            actual,
-            r#"open los_tres_amigos.txt | from-csv | get rusty_luck | str to-int | math sum | echo "$it""#
-        );
-    }
-}
diff --git a/old_nushell/crates/nu-test-support/src/macros.rs b/old_nushell/crates/nu-test-support/src/macros.rs
deleted file mode 100644
index 268148405..000000000
--- a/old_nushell/crates/nu-test-support/src/macros.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-#[macro_export]
-macro_rules! nu {
-    (cwd: $cwd:expr, $path:expr, $($part:expr),*) => {{
-        use $crate::fs::DisplayPath;
-
-        let path = format!($path, $(
-            $part.display_path()
-        ),*);
-
-        nu!($cwd, &path)
-    }};
-
-    (cwd: $cwd:expr, $path:expr) => {{
-        nu!($cwd, $path)
-    }};
-
-    ($cwd:expr, $path:expr) => {{
-        pub use std::error::Error;
-        pub use std::io::prelude::*;
-        pub use std::process::{Command, Stdio};
-        pub use $crate::NATIVE_PATH_ENV_VAR;
-
-        let commands = &*format!(
-            "
-                            cd \"{}\"
-                            {}
-                            exit",
-            $crate::fs::in_directory($cwd),
-            $crate::fs::DisplayPath::display_path(&$path)
-        );
-
-        let test_bins = $crate::fs::binaries();
-        let test_bins = nu_path::canonicalize(&test_bins).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize dummy binaries path {}: {:?}",
-                test_bins.display(),
-                e
-            )
-        });
-
-        let mut paths = $crate::shell_os_paths();
-        paths.insert(0, test_bins);
-
-        let paths_joined = match std::env::join_paths(paths) {
-            Ok(all) => all,
-            Err(_) => panic!("Couldn't join paths for PATH var."),
-        };
-
-        let mut process = match Command::new($crate::fs::executable_path())
-            .env(NATIVE_PATH_ENV_VAR, paths_joined)
-            .arg("--skip-plugins")
-            .arg("--no-history")
-            .arg("--config-file")
-            .arg($crate::fs::DisplayPath::display_path(&$crate::fs::fixtures().join("playground/config/default.toml")))
-            .stdout(Stdio::piped())
-            .stdin(Stdio::piped())
-            .stderr(Stdio::piped())
-            .spawn()
-        {
-            Ok(child) => child,
-            Err(why) => panic!("Can't run test {}", why.to_string()),
-        };
-
-        let stdin = process.stdin.as_mut().expect("couldn't open stdin");
-        stdin
-            .write_all(commands.as_bytes())
-            .expect("couldn't write to stdin");
-
-        let output = process
-            .wait_with_output()
-            .expect("couldn't read from stdout/stderr");
-
-        let out = $crate::macros::read_std(&output.stdout);
-        let err = String::from_utf8_lossy(&output.stderr);
-
-            println!("=== stderr\n{}", err);
-
-        $crate::Outcome::new(out,err.into_owned())
-    }};
-}
-
-#[macro_export]
-macro_rules! nu_with_plugins {
-    (cwd: $cwd:expr, $path:expr, $($part:expr),*) => {{
-        use $crate::fs::DisplayPath;
-
-        let path = format!($path, $(
-            $part.display_path()
-        ),*);
-
-        nu_with_plugins!($cwd, &path)
-    }};
-
-    (cwd: $cwd:expr, $path:expr) => {{
-        nu_with_plugins!($cwd, $path)
-    }};
-
-    ($cwd:expr, $path:expr) => {{
-        pub use std::error::Error;
-        pub use std::io::prelude::*;
-        pub use std::process::{Command, Stdio};
-        pub use crate::NATIVE_PATH_ENV_VAR;
-
-        let commands = &*format!(
-            "
-                            cd \"{}\"
-                            {}
-                            exit",
-            $crate::fs::in_directory($cwd),
-            $crate::fs::DisplayPath::display_path(&$path)
-        );
-
-        let test_bins = $crate::fs::binaries();
-        let test_bins = nu_path::canonicalize(&test_bins).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize dummy binaries path {}: {:?}",
-                test_bins.display(),
-                e
-            )
-        });
-
-        let mut paths = $crate::shell_os_paths();
-        paths.insert(0, test_bins);
-
-        let paths_joined = match std::env::join_paths(paths) {
-            Ok(all) => all,
-            Err(_) => panic!("Couldn't join paths for PATH var."),
-        };
-
-        let mut process = match Command::new($crate::fs::executable_path())
-            .env(NATIVE_PATH_ENV_VAR, paths_joined)
-            .stdout(Stdio::piped())
-            .stdin(Stdio::piped())
-            .stderr(Stdio::piped())
-            .spawn()
-        {
-            Ok(child) => child,
-            Err(why) => panic!("Can't run test {}", why.to_string()),
-        };
-
-        let stdin = process.stdin.as_mut().expect("couldn't open stdin");
-        stdin
-            .write_all(commands.as_bytes())
-            .expect("couldn't write to stdin");
-
-        let output = process
-            .wait_with_output()
-            .expect("couldn't read from stdout/stderr");
-
-        let out = $crate::macros::read_std(&output.stdout);
-        let err = String::from_utf8_lossy(&output.stderr);
-
-            println!("=== stderr\n{}", err);
-
-        $crate::Outcome::new(out,err.into_owned())
-    }};
-}
-
-pub fn read_std(std: &[u8]) -> String {
-    let out = String::from_utf8_lossy(std);
-    let out = out.lines().collect::<Vec<_>>().join("\n");
-    let out = out.replace("\r\n", "");
-    out.replace("\n", "")
-}
diff --git a/old_nushell/crates/nu-test-support/src/playground.rs b/old_nushell/crates/nu-test-support/src/playground.rs
deleted file mode 100644
index caeb4f26c..000000000
--- a/old_nushell/crates/nu-test-support/src/playground.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-mod director;
-pub mod matchers;
-pub mod nu_process;
-mod play;
-
-#[cfg(test)]
-mod tests;
-
-pub use director::Director;
-pub use matchers::says;
-pub use nu_process::{Executable, NuProcess, NuResult, Outcome};
-pub use play::{Dirs, EnvironmentVariable, Playground};
diff --git a/old_nushell/crates/nu-test-support/src/playground/director.rs b/old_nushell/crates/nu-test-support/src/playground/director.rs
deleted file mode 100644
index ba8b9922f..000000000
--- a/old_nushell/crates/nu-test-support/src/playground/director.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use super::nu_process::*;
-use super::EnvironmentVariable;
-use std::ffi::OsString;
-use std::fmt;
-
-#[derive(Default, Debug)]
-pub struct Director {
-    pub cwd: Option<OsString>,
-    pub environment_vars: Vec<EnvironmentVariable>,
-    pub config: Option<OsString>,
-    pub pipeline: Option<Vec<String>>,
-    pub executable: Option<NuProcess>,
-}
-
-impl Director {
-    pub fn cococo(&self, arg: &str) -> Self {
-        let mut process = NuProcess {
-            environment_vars: self.environment_vars.clone(),
-            ..Default::default()
-        };
-
-        process.args(&["--testbin", "cococo", arg]);
-        Director {
-            config: self.config.clone(),
-            executable: Some(process),
-            environment_vars: self.environment_vars.clone(),
-            ..Default::default()
-        }
-    }
-
-    pub fn and_then(&mut self, commands: &str) -> &mut Self {
-        let commands = commands.to_string();
-
-        if let Some(ref mut pipeline) = self.pipeline {
-            pipeline.push(commands);
-        } else {
-            self.pipeline = Some(vec![commands]);
-        }
-
-        self
-    }
-
-    pub fn pipeline(&self, commands: &str) -> Self {
-        let mut director = Director {
-            pipeline: if commands.is_empty() {
-                None
-            } else {
-                Some(vec![commands.to_string()])
-            },
-            ..Default::default()
-        };
-
-        let mut process = NuProcess {
-            environment_vars: self.environment_vars.clone(),
-            ..Default::default()
-        };
-
-        if let Some(working_directory) = &self.cwd {
-            process.cwd(working_directory);
-        }
-
-        process.arg("--skip-plugins");
-        process.arg("--no-history");
-        if let Some(config_file) = self.config.as_ref() {
-            process.args(&[
-                "--config-file",
-                config_file.to_str().expect("failed to convert."),
-            ]);
-        }
-        process.arg("--perf");
-
-        director.executable = Some(process);
-        director
-    }
-
-    pub fn executable(&self) -> Option<&NuProcess> {
-        if let Some(binary) = &self.executable {
-            Some(binary)
-        } else {
-            None
-        }
-    }
-}
-
-impl Executable for Director {
-    fn execute(&mut self) -> NuResult {
-        use std::io::Write;
-        use std::process::Stdio;
-
-        match self.executable() {
-            Some(binary) => {
-                let mut process = match binary
-                    .construct()
-                    .stdout(Stdio::piped())
-                    .stdin(Stdio::piped())
-                    .stderr(Stdio::piped())
-                    .spawn()
-                {
-                    Ok(child) => child,
-                    Err(why) => panic!("Can't run test {}", why),
-                };
-
-                if let Some(pipelines) = &self.pipeline {
-                    let child = process.stdin.as_mut().expect("Failed to open stdin");
-
-                    for pipeline in pipelines {
-                        child
-                            .write_all(format!("{}\n", pipeline).as_bytes())
-                            .expect("Could not write to");
-                    }
-
-                    child.write_all(b"exit\n").expect("Could not write to");
-                }
-
-                process
-                    .wait_with_output()
-                    .map_err(|_| {
-                        let reason = format!(
-                            "could not execute process {} ({})",
-                            binary, "No execution took place"
-                        );
-
-                        NuError {
-                            desc: reason,
-                            exit: None,
-                            output: None,
-                        }
-                    })
-                    .and_then(|process| {
-                        let out =
-                            Outcome::new(&read_std(&process.stdout), &read_std(&process.stderr));
-
-                        match process.status.success() {
-                            true => Ok(out),
-                            false => Err(NuError {
-                                desc: String::new(),
-                                exit: Some(process.status),
-                                output: Some(out),
-                            }),
-                        }
-                    })
-            }
-            None => Err(NuError {
-                desc: String::from("err"),
-                exit: None,
-                output: None,
-            }),
-        }
-    }
-}
-
-impl fmt::Display for Director {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "director")
-    }
-}
-
-fn read_std(std: &[u8]) -> Vec<u8> {
-    let out = String::from_utf8_lossy(std);
-    let out = out.lines().collect::<Vec<_>>().join("\n");
-    let out = out.replace("\r\n", "");
-    out.replace("\n", "").into_bytes()
-}
diff --git a/old_nushell/crates/nu-test-support/src/playground/matchers.rs b/old_nushell/crates/nu-test-support/src/playground/matchers.rs
deleted file mode 100644
index 7c36489e2..000000000
--- a/old_nushell/crates/nu-test-support/src/playground/matchers.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use hamcrest2::core::{MatchResult, Matcher};
-use std::fmt;
-use std::str;
-
-use super::nu_process::Outcome;
-use super::{Director, Executable};
-
-#[derive(Clone)]
-pub struct Play {
-    stdout_expectation: Option<String>,
-}
-
-impl fmt::Display for Play {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "play")
-    }
-}
-
-impl fmt::Debug for Play {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "play")
-    }
-}
-
-pub fn says() -> Play {
-    Play {
-        stdout_expectation: None,
-    }
-}
-
-trait CheckerMatchers {
-    fn output(&self, actual: &Outcome) -> MatchResult;
-    fn std(&self, actual: &[u8], expected: Option<&String>, description: &str) -> MatchResult;
-    fn stdout(&self, actual: &Outcome) -> MatchResult;
-}
-
-impl CheckerMatchers for Play {
-    fn output(&self, actual: &Outcome) -> MatchResult {
-        self.stdout(actual)
-    }
-
-    fn stdout(&self, actual: &Outcome) -> MatchResult {
-        self.std(&actual.out, self.stdout_expectation.as_ref(), "stdout")
-    }
-
-    fn std(&self, actual: &[u8], expected: Option<&String>, description: &str) -> MatchResult {
-        let out = match expected {
-            Some(out) => out,
-            None => return Ok(()),
-        };
-        let actual = match str::from_utf8(actual) {
-            Err(..) => return Err(format!("{} was not utf8 encoded", description)),
-            Ok(actual) => actual,
-        };
-
-        if actual != *out {
-            return Err(format!(
-                "not equal:\n    actual: {}\n  expected: {}\n\n",
-                actual, out
-            ));
-        }
-
-        Ok(())
-    }
-}
-
-impl Matcher<Outcome> for Play {
-    fn matches(&self, output: Outcome) -> MatchResult {
-        self.output(&output)
-    }
-}
-
-impl Matcher<Director> for Play {
-    fn matches(&self, mut director: Director) -> MatchResult {
-        self.matches(&mut director)
-    }
-}
-
-impl<'a> Matcher<&'a mut Director> for Play {
-    fn matches(&self, director: &'a mut Director) -> MatchResult {
-        if director.executable().is_none() {
-            return Err(format!("no such process {}", director));
-        }
-
-        let res = director.execute();
-
-        match res {
-            Ok(out) => self.output(&out),
-            Err(err) => {
-                if let Some(out) = &err.output {
-                    return self.output(out);
-                }
-
-                Err(format!("could not exec process {}: {:?}", director, err))
-            }
-        }
-    }
-}
-
-impl Play {
-    pub fn stdout(mut self, expected: &str) -> Self {
-        self.stdout_expectation = Some(expected.to_string());
-        self
-    }
-}
diff --git a/old_nushell/crates/nu-test-support/src/playground/nu_process.rs b/old_nushell/crates/nu-test-support/src/playground/nu_process.rs
deleted file mode 100644
index ffb3271ac..000000000
--- a/old_nushell/crates/nu-test-support/src/playground/nu_process.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use super::EnvironmentVariable;
-use crate::fs::{binaries as test_bins_path, executable_path};
-use std::ffi::{OsStr, OsString};
-use std::fmt;
-use std::path::Path;
-use std::process::{Command, ExitStatus};
-
-pub trait Executable {
-    fn execute(&mut self) -> NuResult;
-}
-
-#[derive(Clone, Debug)]
-pub struct Outcome {
-    pub out: Vec<u8>,
-    pub err: Vec<u8>,
-}
-
-impl Outcome {
-    pub fn new(out: &[u8], err: &[u8]) -> Outcome {
-        Outcome {
-            out: out.to_vec(),
-            err: err.to_vec(),
-        }
-    }
-}
-
-pub type NuResult = Result<Outcome, NuError>;
-
-#[derive(Debug)]
-pub struct NuError {
-    pub desc: String,
-    pub exit: Option<ExitStatus>,
-    pub output: Option<Outcome>,
-}
-
-#[derive(Clone, Debug, Default)]
-pub struct NuProcess {
-    pub arguments: Vec<OsString>,
-    pub environment_vars: Vec<EnvironmentVariable>,
-    pub cwd: Option<OsString>,
-}
-
-impl fmt::Display for NuProcess {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "`nu")?;
-
-        for arg in &self.arguments {
-            write!(f, " {}", arg.to_string_lossy())?;
-        }
-
-        write!(f, "`")
-    }
-}
-
-impl NuProcess {
-    pub fn arg<T: AsRef<OsStr>>(&mut self, arg: T) -> &mut Self {
-        self.arguments.push(arg.as_ref().to_os_string());
-        self
-    }
-
-    pub fn args<T: AsRef<OsStr>>(&mut self, arguments: &[T]) -> &mut NuProcess {
-        self.arguments
-            .extend(arguments.iter().map(|t| t.as_ref().to_os_string()));
-        self
-    }
-
-    pub fn cwd<T: AsRef<OsStr>>(&mut self, path: T) -> &mut NuProcess {
-        self.cwd = Some(path.as_ref().to_os_string());
-        self
-    }
-
-    pub fn get_cwd(&self) -> Option<&Path> {
-        self.cwd.as_ref().map(Path::new)
-    }
-
-    pub fn construct(&self) -> Command {
-        let mut command = Command::new(&executable_path());
-
-        if let Some(cwd) = self.get_cwd() {
-            command.current_dir(cwd);
-        }
-
-        command.env_clear();
-
-        let paths = vec![test_bins_path()];
-
-        let paths_joined = match std::env::join_paths(&paths) {
-            Ok(all) => all,
-            Err(_) => panic!("Couldn't join paths for PATH var."),
-        };
-
-        command.env(crate::NATIVE_PATH_ENV_VAR, paths_joined);
-
-        for env_var in &self.environment_vars {
-            command.env(&env_var.name, &env_var.value);
-        }
-
-        for arg in &self.arguments {
-            command.arg(arg);
-        }
-
-        command
-    }
-}
diff --git a/old_nushell/crates/nu-test-support/src/playground/play.rs b/old_nushell/crates/nu-test-support/src/playground/play.rs
deleted file mode 100644
index e75f02b6b..000000000
--- a/old_nushell/crates/nu-test-support/src/playground/play.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use super::Director;
-use crate::fs;
-use crate::fs::Stub;
-use getset::Getters;
-use glob::glob;
-use std::path::{Path, PathBuf};
-use std::str;
-use tempfile::{tempdir, TempDir};
-
-#[derive(Default, Clone, Debug)]
-pub struct EnvironmentVariable {
-    pub name: String,
-    pub value: String,
-}
-
-impl EnvironmentVariable {
-    fn new(name: &str, value: &str) -> Self {
-        Self {
-            name: name.to_string(),
-            value: value.to_string(),
-        }
-    }
-}
-
-pub struct Playground<'a> {
-    root: TempDir,
-    tests: String,
-    cwd: PathBuf,
-    config: PathBuf,
-    environment_vars: Vec<EnvironmentVariable>,
-    dirs: &'a Dirs,
-}
-
-#[derive(Default, Getters, Clone)]
-#[get = "pub"]
-pub struct Dirs {
-    pub root: PathBuf,
-    pub test: PathBuf,
-    pub fixtures: PathBuf,
-}
-
-impl Dirs {
-    pub fn formats(&self) -> PathBuf {
-        self.fixtures.join("formats")
-    }
-
-    pub fn config_fixtures(&self) -> PathBuf {
-        self.fixtures.join("playground/config")
-    }
-}
-
-impl<'a> Playground<'a> {
-    pub fn root(&self) -> &Path {
-        self.root.path()
-    }
-
-    pub fn cwd(&self) -> &Path {
-        &self.cwd
-    }
-
-    pub fn back_to_playground(&mut self) -> &mut Self {
-        self.cwd = PathBuf::from(self.root()).join(self.tests.clone());
-        self
-    }
-
-    pub fn play(&mut self) -> &mut Self {
-        self
-    }
-
-    pub fn setup(topic: &str, block: impl FnOnce(Dirs, &mut Playground)) {
-        let root = tempdir().expect("Couldn't create a tempdir");
-        let nuplay_dir = root.path().join(topic);
-
-        if PathBuf::from(&nuplay_dir).exists() {
-            std::fs::remove_dir_all(PathBuf::from(&nuplay_dir)).expect("can not remove directory");
-        }
-
-        std::fs::create_dir(PathBuf::from(&nuplay_dir)).expect("can not create directory");
-
-        let fixtures = fs::fixtures();
-        let fixtures = nu_path::canonicalize(fixtures.clone()).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize fixtures path {}: {:?}",
-                fixtures.display(),
-                e
-            )
-        });
-
-        let mut playground = Playground {
-            root,
-            tests: topic.to_string(),
-            cwd: nuplay_dir,
-            config: fixtures.join("playground/config/default.toml"),
-            environment_vars: Vec::default(),
-            dirs: &Dirs::default(),
-        };
-
-        let playground_root = playground.root.path();
-
-        let test = nu_path::canonicalize(playground_root.join(topic)).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize test path {}: {:?}",
-                playground_root.join(topic).display(),
-                e
-            )
-        });
-
-        let root = nu_path::canonicalize(playground_root).unwrap_or_else(|e| {
-            panic!(
-                "Couldn't canonicalize tests root path {}: {:?}",
-                playground_root.display(),
-                e
-            )
-        });
-
-        let dirs = Dirs {
-            root,
-            test,
-            fixtures,
-        };
-
-        playground.dirs = &dirs;
-
-        block(dirs.clone(), &mut playground);
-    }
-
-    pub fn with_config(&mut self, source_file: impl AsRef<Path>) -> &mut Self {
-        self.config = source_file.as_ref().to_path_buf();
-        self
-    }
-
-    pub fn with_env(&mut self, name: &str, value: &str) -> &mut Self {
-        self.environment_vars
-            .push(EnvironmentVariable::new(name, value));
-        self
-    }
-
-    pub fn get_config(&self) -> &str {
-        self.config.to_str().expect("could not convert path.")
-    }
-
-    pub fn build(&mut self) -> Director {
-        Director {
-            cwd: Some(self.dirs.test().into()),
-            config: Some(self.config.clone().into()),
-            environment_vars: self.environment_vars.clone(),
-            ..Default::default()
-        }
-    }
-
-    pub fn cococo(&mut self, arg: &str) -> Director {
-        self.build().cococo(arg)
-    }
-
-    pub fn pipeline(&mut self, commands: &str) -> Director {
-        self.build().pipeline(commands)
-    }
-
-    pub fn mkdir(&mut self, directory: &str) -> &mut Self {
-        self.cwd.push(directory);
-        std::fs::create_dir_all(&self.cwd).expect("can not create directory");
-        self.back_to_playground();
-        self
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn symlink(&mut self, from: impl AsRef<Path>, to: impl AsRef<Path>) -> &mut Self {
-        let from = self.cwd.join(from);
-        let to = self.cwd.join(to);
-
-        let create_symlink = {
-            #[cfg(unix)]
-            {
-                std::os::unix::fs::symlink
-            }
-
-            #[cfg(windows)]
-            {
-                if from.is_file() {
-                    std::os::windows::fs::symlink_file
-                } else if from.is_dir() {
-                    std::os::windows::fs::symlink_dir
-                } else {
-                    panic!("symlink from must be a file or dir")
-                }
-            }
-        };
-
-        create_symlink(from, to).expect("can not create symlink");
-        self.back_to_playground();
-        self
-    }
-
-    pub fn with_files(&mut self, files: Vec<Stub>) -> &mut Self {
-        let endl = fs::line_ending();
-
-        files
-            .iter()
-            .map(|f| {
-                let mut path = PathBuf::from(&self.cwd);
-
-                let (file_name, contents) = match *f {
-                    Stub::EmptyFile(name) => (name, "fake data".to_string()),
-                    Stub::FileWithContent(name, content) => (name, content.to_string()),
-                    Stub::FileWithContentToBeTrimmed(name, content) => (
-                        name,
-                        content
-                            .lines()
-                            .skip(1)
-                            .map(|line| line.trim())
-                            .collect::<Vec<&str>>()
-                            .join(&endl),
-                    ),
-                };
-
-                path.push(file_name);
-
-                std::fs::write(path, contents.as_bytes()).expect("can not create file");
-            })
-            .for_each(drop);
-        self.back_to_playground();
-        self
-    }
-
-    pub fn within(&mut self, directory: &str) -> &mut Self {
-        self.cwd.push(directory);
-        std::fs::create_dir(&self.cwd).expect("can not create directory");
-        self
-    }
-
-    pub fn glob_vec(pattern: &str) -> Vec<PathBuf> {
-        let glob = glob(pattern);
-
-        glob.expect("invalid pattern")
-            .map(|path| {
-                if let Ok(path) = path {
-                    path
-                } else {
-                    unreachable!()
-                }
-            })
-            .collect()
-    }
-}
diff --git a/old_nushell/crates/nu-test-support/src/playground/tests.rs b/old_nushell/crates/nu-test-support/src/playground/tests.rs
deleted file mode 100644
index 4786cccc1..000000000
--- a/old_nushell/crates/nu-test-support/src/playground/tests.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use crate::playground::Playground;
-use std::path::{Path, PathBuf};
-
-use super::matchers::says;
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-fn path(p: &Path) -> PathBuf {
-    nu_path::canonicalize(p)
-        .unwrap_or_else(|e| panic!("Couldn't canonicalize path {}: {:?}", p.display(), e))
-}
-
-#[test]
-fn asserts_standard_out_expectation_from_nu_executable() {
-    Playground::setup("topic", |_, nu| {
-        assert_that!(nu.cococo("andres"), says().stdout("andres"));
-    })
-}
-
-#[test]
-fn asserts_standard_out_expectation_from_nu_executable_pipeline_fed() {
-    Playground::setup("topic", |_, nu| {
-        assert_that!(nu.pipeline("echo 'andres'"), says().stdout("andres"));
-    })
-}
-
-#[test]
-fn current_working_directory_in_sandbox_directory_created() {
-    Playground::setup("topic", |dirs, nu| {
-        let original_cwd = dirs.test();
-        nu.within("some_directory_within");
-
-        assert_eq!(path(nu.cwd()), original_cwd.join("some_directory_within"));
-    })
-}
-
-#[test]
-fn current_working_directory_back_to_root_from_anywhere() {
-    Playground::setup("topic", |dirs, nu| {
-        let original_cwd = dirs.test();
-
-        nu.within("some_directory_within");
-        nu.back_to_playground();
-
-        assert_eq!(path(nu.cwd()), *original_cwd);
-    })
-}
diff --git a/old_nushell/crates/nu-test-support/src/value.rs b/old_nushell/crates/nu-test-support/src/value.rs
deleted file mode 100644
index faab4f193..000000000
--- a/old_nushell/crates/nu-test-support/src/value.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use bigdecimal::BigDecimal;
-use chrono::{DateTime, NaiveDate, Utc};
-use indexmap::IndexMap;
-use nu_errors::ShellError;
-use nu_protocol::{PathMember, Primitive, UntaggedValue, Value};
-use nu_source::{Span, TaggedItem};
-use num_bigint::BigInt;
-
-pub fn big_int(s: impl Into<BigInt>) -> Value {
-    UntaggedValue::big_int(s).into_untagged_value()
-}
-
-pub fn int(s: impl Into<i64>) -> Value {
-    UntaggedValue::int(s).into_untagged_value()
-}
-
-pub fn decimal(s: BigDecimal) -> Value {
-    UntaggedValue::Primitive(Primitive::Decimal(s)).into_untagged_value()
-}
-
-pub fn decimal_from_float(f: f64) -> Value {
-    UntaggedValue::decimal_from_float(f, Span::unknown()).into_untagged_value()
-}
-
-pub fn string(input: impl Into<String>) -> Value {
-    UntaggedValue::string(input.into()).into_untagged_value()
-}
-
-pub fn row(entries: IndexMap<String, Value>) -> Value {
-    UntaggedValue::row(entries).into_untagged_value()
-}
-
-pub fn nothing() -> Value {
-    UntaggedValue::nothing().into_untagged_value()
-}
-
-pub fn table(list: &[Value]) -> Value {
-    UntaggedValue::table(list).into_untagged_value()
-}
-
-pub fn date(input: impl Into<String>) -> Value {
-    let key = input.into().tagged_unknown();
-
-    let date = NaiveDate::parse_from_str(key.borrow_tagged().item, "%Y-%m-%d")
-        .expect("date from string failed");
-
-    UntaggedValue::Primitive(Primitive::Date(
-        DateTime::<Utc>::from_utc(date.and_hms(12, 34, 56), Utc).into(),
-    ))
-    .into_untagged_value()
-}
-
-pub fn column_path(paths: &str) -> Value {
-    UntaggedValue::column_path(paths, Span::unknown()).into_untagged_value()
-}
-
-pub fn error_callback(
-    reason: &'static str,
-) -> impl FnOnce(&Value, &PathMember, ShellError) -> ShellError {
-    move |_obj_source, _column_path_tried, _err| ShellError::unimplemented(reason)
-}
diff --git a/old_nushell/crates/nu-value-ext/Cargo.toml b/old_nushell/crates/nu-value-ext/Cargo.toml
deleted file mode 100644
index c00b5e9f9..000000000
--- a/old_nushell/crates/nu-value-ext/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Extension traits for values in Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu-value-ext"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-
-indexmap = { version="1.6.1", features=["serde-1"] }
-itertools = "0.10.0"
-num-traits = "0.2.14"
-
-[features]
-dataframe = ["nu-protocol/dataframe"]
diff --git a/old_nushell/crates/nu-value-ext/src/lib.rs b/old_nushell/crates/nu-value-ext/src/lib.rs
deleted file mode 100644
index 43e259372..000000000
--- a/old_nushell/crates/nu-value-ext/src/lib.rs
+++ /dev/null
@@ -1,836 +0,0 @@
-use indexmap::indexmap;
-use indexmap::set::IndexSet;
-use itertools::Itertools;
-use nu_errors::{ExpectedRange, ShellError};
-use nu_protocol::{
-    ColumnPath, MaybeOwned, PathMember, Primitive, ShellTypeName, SpannedTypeName,
-    UnspannedPathMember, UntaggedValue, Value,
-};
-use nu_source::{
-    HasFallibleSpan, HasSpan, PrettyDebug, Span, Spanned, SpannedItem, Tag, Tagged, TaggedItem,
-};
-use num_traits::cast::ToPrimitive;
-
-#[cfg(feature = "dataframe")]
-use nu_protocol::dataframe::NuDataFrame;
-
-pub trait ValueExt {
-    fn into_parts(self) -> (UntaggedValue, Tag);
-    fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value>;
-    fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value>;
-    fn get_data_by_member(&self, name: &PathMember) -> Result<Value, ShellError>;
-    fn get_data_by_column_path(
-        &self,
-        path: &ColumnPath,
-        callback: Box<dyn FnOnce(&Value, &PathMember, ShellError) -> ShellError>,
-    ) -> Result<Value, ShellError>;
-    fn swap_data_by_column_path(
-        &self,
-        path: &ColumnPath,
-        callback: Box<dyn FnOnce(&Value) -> Result<Value, ShellError>>,
-    ) -> Result<Value, ShellError>;
-    fn insert_data_at_path(&self, path: &str, new_value: Value) -> Option<Value>;
-    fn insert_data_at_member(
-        &mut self,
-        member: &PathMember,
-        new_value: Value,
-    ) -> Result<(), ShellError>;
-    fn forgiving_insert_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        new_value: Value,
-    ) -> Result<Value, ShellError>;
-    fn insert_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        new_value: Value,
-    ) -> Result<Value, ShellError>;
-    fn replace_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        replaced_value: Value,
-    ) -> Option<Value>;
-    fn as_column_path(&self) -> Result<Tagged<ColumnPath>, ShellError>;
-    fn as_path_member(&self) -> Result<PathMember, ShellError>;
-    fn as_string(&self) -> Result<String, ShellError>;
-}
-
-impl ValueExt for Value {
-    fn into_parts(self) -> (UntaggedValue, Tag) {
-        (self.value, self.tag)
-    }
-
-    fn get_data(&self, desc: &str) -> MaybeOwned<'_, Value> {
-        get_data(self, desc)
-    }
-
-    fn get_data_by_key(&self, name: Spanned<&str>) -> Option<Value> {
-        get_data_by_key(self, name)
-    }
-
-    fn get_data_by_member(&self, name: &PathMember) -> Result<Value, ShellError> {
-        get_data_by_member(self, name)
-    }
-
-    fn get_data_by_column_path(
-        &self,
-        path: &ColumnPath,
-        get_error: Box<dyn FnOnce(&Value, &PathMember, ShellError) -> ShellError>,
-    ) -> Result<Value, ShellError> {
-        get_data_by_column_path(self, path, get_error)
-    }
-
-    fn swap_data_by_column_path(
-        &self,
-        path: &ColumnPath,
-        callback: Box<dyn FnOnce(&Value) -> Result<Value, ShellError>>,
-    ) -> Result<Value, ShellError> {
-        swap_data_by_column_path(self, path, callback)
-    }
-
-    fn insert_data_at_path(&self, path: &str, new_value: Value) -> Option<Value> {
-        insert_data_at_path(self, path, new_value)
-    }
-
-    fn insert_data_at_member(
-        &mut self,
-        member: &PathMember,
-        new_value: Value,
-    ) -> Result<(), ShellError> {
-        insert_data_at_member(self, member, new_value)
-    }
-
-    fn forgiving_insert_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        new_value: Value,
-    ) -> Result<Value, ShellError> {
-        forgiving_insert_data_at_column_path(self, split_path, new_value)
-    }
-
-    fn insert_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        new_value: Value,
-    ) -> Result<Value, ShellError> {
-        insert_data_at_column_path(self, split_path, new_value)
-    }
-
-    fn replace_data_at_column_path(
-        &self,
-        split_path: &ColumnPath,
-        replaced_value: Value,
-    ) -> Option<Value> {
-        replace_data_at_column_path(self, split_path, replaced_value)
-    }
-
-    fn as_column_path(&self) -> Result<Tagged<ColumnPath>, ShellError> {
-        as_column_path(self)
-    }
-
-    fn as_path_member(&self) -> Result<PathMember, ShellError> {
-        as_path_member(self)
-    }
-
-    fn as_string(&self) -> Result<String, ShellError> {
-        as_string(self)
-    }
-}
-
-pub fn get_data_by_member(value: &Value, name: &PathMember) -> Result<Value, ShellError> {
-    match &value.value {
-        // If the value is a row, the member is a column name
-        UntaggedValue::Row(o) => match &name.unspanned {
-            // If the member is a string, get the data
-            UnspannedPathMember::String(string) => o
-                .get_data_by_key(string[..].spanned(name.span))
-                .ok_or_else(|| {
-                    ShellError::missing_property(
-                        "row".spanned(value.tag.span),
-                        string.spanned(name.span),
-                    )
-                }),
-
-            // If the member is a number, it's an error
-            UnspannedPathMember::Int(_) => Err(ShellError::invalid_integer_index(
-                "row".spanned(value.tag.span),
-                name.span,
-            )),
-        },
-
-        // If the value is a table
-        UntaggedValue::Table(l) => {
-            match &name.unspanned {
-                // If the member is a string, map over the member
-                UnspannedPathMember::String(string) => {
-                    let mut out = vec![];
-
-                    for item in l {
-                        if let Value {
-                            value: UntaggedValue::Row(o),
-                            ..
-                        } = item
-                        {
-                            if let Some(v) = o.get_data_by_key(string[..].spanned(name.span)) {
-                                out.push(v)
-                            }
-                        }
-                    }
-
-                    if out.is_empty() {
-                        Err(ShellError::missing_property(
-                            "table".spanned(value.tag.span),
-                            string.spanned(name.span),
-                        ))
-                    } else {
-                        Ok(UntaggedValue::Table(out)
-                            .into_value(Tag::new(value.anchor(), name.span)))
-                    }
-                }
-                UnspannedPathMember::Int(int) => {
-                    let index = int.to_usize().ok_or_else(|| {
-                        ShellError::range_error(
-                            ExpectedRange::Usize,
-                            &"massive integer".spanned(name.span),
-                            "indexing",
-                        )
-                    })?;
-
-                    get_data_by_index(value, index.spanned(value.tag.span)).ok_or_else(|| {
-                        ShellError::range_error(0..(l.len()), &int.spanned(name.span), "indexing")
-                    })
-                }
-            }
-        }
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(df) => match &name.unspanned {
-            UnspannedPathMember::String(string) => {
-                let column = df.as_ref().select(string.as_str()).map_err(|e| {
-                    ShellError::labeled_error("Dataframe error", e.to_string(), &name.span)
-                })?;
-
-                Ok(NuDataFrame::dataframe_to_value(
-                    column,
-                    Tag::new(value.anchor(), name.span),
-                ))
-            }
-            UnspannedPathMember::Int(int) => {
-                if df.is_series() {
-                    df.get_value(*int as usize, name.span)
-                } else {
-                    Err(ShellError::labeled_error(
-                        "Column not found",
-                        "Column name not found in the dataframe",
-                        name.span,
-                    ))
-                }
-            }
-        },
-        other => Err(ShellError::type_error(
-            "row or table",
-            other.type_name().spanned(value.tag.span),
-        )),
-    }
-}
-
-pub fn get_data_by_column_path<F>(
-    value: &Value,
-    path: &ColumnPath,
-    get_error: F,
-) -> Result<Value, ShellError>
-where
-    F: FnOnce(&Value, &PathMember, ShellError) -> ShellError,
-{
-    let mut current = value.clone();
-
-    for p in path {
-        let value = get_data_by_member(&current, p);
-
-        match value {
-            Ok(v) => current = v.clone(),
-            Err(e) => return Err(get_error(&current, p, e)),
-        }
-    }
-
-    Ok(current)
-}
-
-pub fn swap_data_by_column_path<F>(
-    value: &Value,
-    path: &ColumnPath,
-    callback: F,
-) -> Result<Value, ShellError>
-where
-    F: FnOnce(&Value) -> Result<Value, ShellError>,
-{
-    let fields = path.clone();
-
-    let to_replace =
-        get_data_by_column_path(value, path, move |obj_source, column_path_tried, error| {
-            let path_members_span = fields.maybe_span().unwrap_or_else(Span::unknown);
-
-            match &obj_source.value {
-                UntaggedValue::Table(rows) => match column_path_tried {
-                    PathMember {
-                        unspanned: UnspannedPathMember::String(column),
-                        ..
-                    } => {
-                        let primary_label = format!("There isn't a column named '{}'", &column);
-
-                        let suggestions: IndexSet<_> = rows
-                            .iter()
-                            .filter_map(|r| {
-                                nu_protocol::did_you_mean(r, column_path_tried.as_string())
-                            })
-                            .map(|s| s[0].to_owned())
-                            .collect();
-                        let mut existing_columns: IndexSet<_> = IndexSet::default();
-                        let mut names: Vec<String> = vec![];
-
-                        for row in rows {
-                            for field in row.data_descriptors() {
-                                if !existing_columns.contains(&field[..]) {
-                                    existing_columns.insert(field.clone());
-                                    names.push(field);
-                                }
-                            }
-                        }
-
-                        if names.is_empty() {
-                            return ShellError::labeled_error_with_secondary(
-                                "Unknown column",
-                                primary_label,
-                                column_path_tried.span,
-                                "Appears to contain rows. Try indexing instead.",
-                                column_path_tried.span.since(path_members_span),
-                            );
-                        } else {
-                            return ShellError::labeled_error_with_secondary(
-                                "Unknown column",
-                                primary_label,
-                                column_path_tried.span,
-                                format!(
-                                    "Perhaps you meant '{}'? Columns available: {}",
-                                    suggestions
-                                        .iter()
-                                        .map(|x| x.to_owned())
-                                        .collect::<Vec<String>>()
-                                        .join(","),
-                                    names.join(", ")
-                                ),
-                                column_path_tried.span.since(path_members_span),
-                            );
-                        };
-                    }
-                    PathMember {
-                        unspanned: UnspannedPathMember::Int(idx),
-                        ..
-                    } => {
-                        let total = rows.len();
-
-                        let secondary_label = if total == 1 {
-                            "The table only has 1 row".to_owned()
-                        } else {
-                            format!("The table only has {} rows (0 to {})", total, total - 1)
-                        };
-
-                        return ShellError::labeled_error_with_secondary(
-                            "Row not found",
-                            format!("There isn't a row indexed at {}", idx),
-                            column_path_tried.span,
-                            secondary_label,
-                            column_path_tried.span.since(path_members_span),
-                        );
-                    }
-                },
-                UntaggedValue::Row(columns) => match column_path_tried {
-                    PathMember {
-                        unspanned: UnspannedPathMember::String(column),
-                        ..
-                    } => {
-                        let primary_label = format!("There isn't a column named '{}'", &column);
-
-                        if let Some(suggestions) =
-                            nu_protocol::did_you_mean(obj_source, column_path_tried.as_string())
-                        {
-                            return ShellError::labeled_error_with_secondary(
-                                "Unknown column",
-                                primary_label,
-                                column_path_tried.span,
-                                format!(
-                                    "Perhaps you meant '{}'? Columns available: {}",
-                                    suggestions[0],
-                                    &obj_source.data_descriptors().join(",")
-                                ),
-                                column_path_tried.span.since(path_members_span),
-                            );
-                        }
-                    }
-                    PathMember {
-                        unspanned: UnspannedPathMember::Int(idx),
-                        ..
-                    } => {
-                        return ShellError::labeled_error_with_secondary(
-                            "No rows available",
-                            format!("A row at '{}' can't be indexed.", &idx),
-                            column_path_tried.span,
-                            format!(
-                                "Appears to contain columns. Columns available: {}",
-                                columns.keys().join(",")
-                            ),
-                            column_path_tried.span.since(path_members_span),
-                        )
-                    }
-                },
-                _ => {}
-            }
-
-            if let Some(suggestions) =
-                nu_protocol::did_you_mean(obj_source, column_path_tried.as_string())
-            {
-                return ShellError::labeled_error(
-                    "Unknown column",
-                    format!("did you mean '{}'?", suggestions[0]),
-                    column_path_tried.span.since(path_members_span),
-                );
-            }
-
-            error
-        });
-
-    let old_value = to_replace?;
-    let replacement = callback(&old_value)?;
-
-    value
-        .replace_data_at_column_path(path, replacement)
-        .ok_or_else(|| {
-            ShellError::labeled_error("missing column-path", "missing column-path", value.tag.span)
-        })
-}
-
-pub fn insert_data_at_path(value: &Value, path: &str, new_value: Value) -> Option<Value> {
-    let mut new_obj = value.clone();
-
-    let split_path: Vec<_> = path.split('.').collect();
-
-    if let UntaggedValue::Row(ref mut o) = new_obj.value {
-        let mut current = o;
-
-        if split_path.len() == 1 {
-            // Special case for inserting at the top level
-            current
-                .entries
-                .insert(path.to_string(), new_value.value.into_value(&value.tag));
-            return Some(new_obj);
-        }
-
-        for idx in 0..split_path.len() {
-            match current.entries.get_mut(split_path[idx]) {
-                Some(next) => {
-                    if idx == (split_path.len() - 2) {
-                        if let UntaggedValue::Row(o) = &mut next.value {
-                            o.entries.insert(
-                                split_path[idx + 1].to_string(),
-                                new_value.value.into_value(&value.tag),
-                            );
-                        }
-                        return Some(new_obj.clone());
-                    } else {
-                        match next.value {
-                            UntaggedValue::Row(ref mut o) => {
-                                current = o;
-                            }
-                            _ => return None,
-                        }
-                    }
-                }
-                _ => return None,
-            }
-        }
-    }
-
-    None
-}
-
-pub fn insert_data_at_member(
-    value: &mut Value,
-    member: &PathMember,
-    new_value: Value,
-) -> Result<(), ShellError> {
-    match &mut value.value {
-        UntaggedValue::Row(dict) => match &member.unspanned {
-            UnspannedPathMember::String(key) => {
-                dict.insert_data_at_key(key, new_value);
-                Ok(())
-            }
-            UnspannedPathMember::Int(_) => Err(ShellError::type_error(
-                "column name",
-                "integer".spanned(member.span),
-            )),
-        },
-        UntaggedValue::Table(array) => match &member.unspanned {
-            UnspannedPathMember::String(_) => Err(ShellError::type_error(
-                "list index",
-                "string".spanned(member.span),
-            )),
-            UnspannedPathMember::Int(int) => {
-                let int = int.to_usize().ok_or_else(|| {
-                    ShellError::range_error(
-                        ExpectedRange::Usize,
-                        &"bigger number".spanned(member.span),
-                        "inserting into a list",
-                    )
-                })?;
-
-                insert_data_at_index(array, int.tagged(member.span), new_value)?;
-                Ok(())
-            }
-        },
-        other => match &member.unspanned {
-            UnspannedPathMember::String(_) => Err(ShellError::type_error(
-                "row",
-                other.type_name().spanned(value.span()),
-            )),
-            UnspannedPathMember::Int(_) => Err(ShellError::type_error(
-                "table",
-                other.type_name().spanned(value.span()),
-            )),
-        },
-    }
-}
-
-pub fn missing_path_members_by_column_path(value: &Value, path: &ColumnPath) -> Option<usize> {
-    let mut current = value.clone();
-
-    for (idx, p) in path.iter().enumerate() {
-        if let Ok(value) = get_data_by_member(&current, p) {
-            current = value;
-        } else {
-            return Some(idx);
-        }
-    }
-
-    None
-}
-
-pub fn forgiving_insert_data_at_column_path(
-    value: &Value,
-    split_path: &ColumnPath,
-    new_value: Value,
-) -> Result<Value, ShellError> {
-    let mut original = value.clone();
-
-    if let Some(missed_at) = missing_path_members_by_column_path(value, split_path) {
-        let mut paths = split_path.iter().skip(missed_at + 1).collect::<Vec<_>>();
-        paths.reverse();
-
-        let mut candidate = new_value;
-
-        for member in &paths {
-            match &member.unspanned {
-                UnspannedPathMember::String(column_name) => {
-                    candidate =
-                        UntaggedValue::row(indexmap! { column_name.into() => candidate.clone()})
-                            .into_value(&candidate.tag)
-                }
-                UnspannedPathMember::Int(int) => {
-                    let mut rows = vec![];
-                    let size = int.to_usize().unwrap_or(0);
-
-                    for _ in 0..=size {
-                        rows.push(
-                            UntaggedValue::Primitive(Primitive::Nothing).into_value(&candidate.tag),
-                        );
-                    }
-                    rows.push(candidate.clone());
-                    candidate = UntaggedValue::Table(rows).into_value(&candidate.tag);
-                }
-            }
-        }
-
-        let cp = ColumnPath::new(
-            split_path
-                .iter()
-                .cloned()
-                .take(split_path.members().len() - missed_at + 1)
-                .collect::<Vec<_>>(),
-        );
-
-        if missed_at == 0 {
-            let current: &mut Value = &mut original;
-            insert_data_at_member(current, &cp.members()[0], candidate)?;
-            return Ok(original);
-        }
-
-        if value
-            .get_data_by_column_path(&cp, Box::new(move |_, _, err| err))
-            .is_ok()
-        {
-            return insert_data_at_column_path(value, &cp, candidate);
-        } else if let Some((last, front)) = cp.split_last() {
-            let mut current: &mut Value = &mut original;
-
-            for member in front {
-                let type_name = current.spanned_type_name();
-
-                current = get_mut_data_by_member(current, member).ok_or_else(|| {
-                    ShellError::missing_property(
-                        member.plain_string(std::usize::MAX).spanned(member.span),
-                        type_name,
-                    )
-                })?
-            }
-
-            insert_data_at_member(current, last, candidate)?;
-
-            return Ok(original);
-        } else {
-            return Err(ShellError::untagged_runtime_error(
-                "Internal error: could not split column path correctly",
-            ));
-        }
-    }
-
-    insert_data_at_column_path(value, split_path, new_value)
-}
-
-pub fn insert_data_at_column_path(
-    value: &Value,
-    split_path: &ColumnPath,
-    new_value: Value,
-) -> Result<Value, ShellError> {
-    if let Some((last, front)) = split_path.split_last() {
-        let mut original = value.clone();
-
-        let mut current: &mut Value = &mut original;
-
-        for member in front {
-            let type_name = current.spanned_type_name();
-
-            current = get_mut_data_by_member(current, member).ok_or_else(|| {
-                ShellError::missing_property(
-                    member.plain_string(std::usize::MAX).spanned(member.span),
-                    type_name,
-                )
-            })?
-        }
-
-        insert_data_at_member(current, last, new_value)?;
-
-        Ok(original)
-    } else {
-        Err(ShellError::untagged_runtime_error(
-            "Internal error: could not split column path correctly",
-        ))
-    }
-}
-
-pub fn replace_data_at_column_path(
-    value: &Value,
-    split_path: &ColumnPath,
-    replaced_value: Value,
-) -> Option<Value> {
-    let mut new_obj: Value = value.clone();
-    let mut current = &mut new_obj;
-    let split_path = split_path.members();
-
-    for idx in 0..split_path.len() {
-        match get_mut_data_by_member(current, &split_path[idx]) {
-            Some(next) => {
-                if idx == (split_path.len() - 1) {
-                    *next = replaced_value.value.into_value(&value.tag);
-                    return Some(new_obj);
-                } else {
-                    current = next;
-                }
-            }
-            None => {
-                return None;
-            }
-        }
-    }
-
-    None
-}
-
-pub fn as_column_path(value: &Value) -> Result<Tagged<ColumnPath>, ShellError> {
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => {
-            let s = s.to_string().spanned(value.tag.span);
-
-            Ok(ColumnPath::build(&s).tagged(&value.tag))
-        }
-
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => {
-            Ok(path.clone().tagged(value.tag.clone()))
-        }
-
-        other => Err(ShellError::type_error(
-            "column path",
-            other.type_name().spanned(value.span()),
-        )),
-    }
-}
-
-pub fn as_path_member(value: &Value) -> Result<PathMember, ShellError> {
-    match &value.value {
-        UntaggedValue::Primitive(primitive) => match primitive {
-            Primitive::Int(int) => Ok(PathMember::int(*int, value.tag.span)),
-            Primitive::String(string) => Ok(PathMember::string(string, value.tag.span)),
-            other => Err(ShellError::type_error(
-                "path member",
-                other.type_name().spanned(value.span()),
-            )),
-        },
-        other => Err(ShellError::type_error(
-            "path member",
-            other.type_name().spanned(value.span()),
-        )),
-    }
-}
-
-pub fn as_string(value: &Value) -> Result<String, ShellError> {
-    match &value.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => Ok(s.clone()),
-        UntaggedValue::Primitive(Primitive::Date(dt)) => Ok(dt.format("%Y-%m-%d").to_string()),
-        UntaggedValue::Primitive(Primitive::Boolean(x)) => Ok(x.to_string()),
-        UntaggedValue::Primitive(Primitive::Decimal(x)) => Ok(x.to_string()),
-        UntaggedValue::Primitive(Primitive::Int(x)) => Ok(x.to_string()),
-        UntaggedValue::Primitive(Primitive::Filesize(x)) => Ok(x.to_string()),
-        UntaggedValue::Primitive(Primitive::FilePath(x)) => Ok(x.display().to_string()),
-        UntaggedValue::Primitive(Primitive::BigInt(x)) => Ok(x.to_string()),
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => Ok(path
-            .iter()
-            .map(|member| match &member.unspanned {
-                UnspannedPathMember::String(name) => name.to_string(),
-                UnspannedPathMember::Int(n) => n.to_string(),
-            })
-            .join(".")),
-
-        // TODO: this should definitely be more general with better errors
-        other => Err(ShellError::labeled_error(
-            "Expected string",
-            other.type_name(),
-            &value.tag,
-        )),
-    }
-}
-
-fn insert_data_at_index(
-    list: &mut Vec<Value>,
-    index: Tagged<usize>,
-    new_value: Value,
-) -> Result<(), ShellError> {
-    if index.item >= list.len() {
-        if index.item == list.len() {
-            list.push(new_value);
-            return Ok(());
-        }
-
-        let mut idx = list.len();
-
-        loop {
-            list.push(UntaggedValue::Primitive(Primitive::Nothing).into_value(&new_value.tag));
-
-            idx += 1;
-
-            if idx == index.item {
-                list.push(new_value);
-                return Ok(());
-            }
-        }
-    } else {
-        list[index.item] = new_value;
-        Ok(())
-    }
-}
-
-pub fn get_data<'value>(value: &'value Value, desc: &str) -> MaybeOwned<'value, Value> {
-    match &value.value {
-        UntaggedValue::Primitive(_) => MaybeOwned::Borrowed(value),
-        UntaggedValue::Row(o) => o.get_data(desc),
-        UntaggedValue::Block(_) | UntaggedValue::Table(_) | UntaggedValue::Error(_) => {
-            MaybeOwned::Owned(UntaggedValue::nothing().into_untagged_value())
-        }
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => {
-            MaybeOwned::Owned(UntaggedValue::nothing().into_untagged_value())
-        }
-    }
-}
-
-pub(crate) fn get_data_by_index(value: &Value, idx: Spanned<usize>) -> Option<Value> {
-    match &value.value {
-        UntaggedValue::Table(value_set) => {
-            let value = value_set.get(idx.item)?;
-            Some(
-                value
-                    .value
-                    .clone()
-                    .into_value(Tag::new(value.anchor(), idx.span)),
-            )
-        }
-        _ => None,
-    }
-}
-
-pub fn get_data_by_key(value: &Value, name: Spanned<&str>) -> Option<Value> {
-    match &value.value {
-        UntaggedValue::Row(o) => o.get_data_by_key(name),
-        UntaggedValue::Table(l) => {
-            let mut out = vec![];
-            for item in l {
-                match item {
-                    Value {
-                        value: UntaggedValue::Row(o),
-                        ..
-                    } => match o.get_data_by_key(name) {
-                        Some(v) => out.push(v),
-                        None => out.push(UntaggedValue::nothing().into_untagged_value()),
-                    },
-                    _ => out.push(UntaggedValue::nothing().into_untagged_value()),
-                }
-            }
-
-            if !out.is_empty() {
-                Some(UntaggedValue::Table(out).into_value(name.span))
-            } else {
-                None
-            }
-        }
-        _ => None,
-    }
-}
-
-pub(crate) fn get_mut_data_by_member<'value>(
-    value: &'value mut Value,
-    name: &PathMember,
-) -> Option<&'value mut Value> {
-    match &mut value.value {
-        UntaggedValue::Row(o) => match &name.unspanned {
-            UnspannedPathMember::String(string) => o.get_mut_data_by_key(string),
-            UnspannedPathMember::Int(_) => None,
-        },
-        UntaggedValue::Table(l) => match &name.unspanned {
-            UnspannedPathMember::String(string) => {
-                for item in l {
-                    if let Value {
-                        value: UntaggedValue::Row(o),
-                        ..
-                    } = item
-                    {
-                        if let Some(v) = o.get_mut_data_by_key(string) {
-                            return Some(v);
-                        }
-                    }
-                }
-                None
-            }
-            UnspannedPathMember::Int(int) => {
-                let index = int.to_usize()?;
-                l.get_mut(index)
-            }
-        },
-        _ => None,
-    }
-}
diff --git a/old_nushell/crates/nu-value-ext/src/tests.rs b/old_nushell/crates/nu-value-ext/src/tests.rs
deleted file mode 100644
index 7dd85ee0e..000000000
--- a/old_nushell/crates/nu-value-ext/src/tests.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use super::*;
-use nu_test_support::value::*;
-
-use indexmap::indexmap;
-
-#[test]
-fn forgiving_insertion_test_1() {
-    let field_path = column_path("crate.version").as_column_path().unwrap();
-
-    let version = string("nuno");
-
-    let value = UntaggedValue::row(indexmap! {
-        "package".into() =>
-            row(indexmap! {
-                "name".into()    =>     string("nu"),
-                "version".into() =>  string("0.20.0")
-            })
-    });
-
-    assert_eq!(
-        *value
-            .into_untagged_value()
-            .forgiving_insert_data_at_column_path(&field_path.item, version)
-            .unwrap()
-            .get_data_by_column_path(&field_path, Box::new(error_callback("crate.version")))
-            .unwrap(),
-        *string("nuno")
-    );
-}
-
-#[test]
-fn forgiving_insertion_test_2() {
-    let field_path = column_path("things.0").as_column_path().unwrap();
-
-    let version = string("arepas");
-
-    let value = UntaggedValue::row(indexmap! {
-        "pivot_mode".into() => string("never"),
-        "things".into() => table(&[string("frijoles de Andrés"), int(1)]),
-        "color_config".into() =>
-            row(indexmap! {
-                "header_align".into()    =>     string("left"),
-                "index_color".into() =>  string("cyan_bold")
-            })
-    });
-
-    assert_eq!(
-        *value
-            .into_untagged_value()
-            .forgiving_insert_data_at_column_path(&field_path.item, version)
-            .unwrap()
-            .get_data_by_column_path(&field_path, Box::new(error_callback("things.0")))
-            .unwrap(),
-        *string("arepas")
-    );
-}
-
-#[test]
-fn forgiving_insertion_test_3() {
-    let field_path = column_path("color_config.arepa_color")
-        .as_column_path()
-        .unwrap();
-    let pizza_path = column_path("things.0").as_column_path().unwrap();
-
-    let entry = string("amarillo");
-
-    let value = UntaggedValue::row(indexmap! {
-        "pivot_mode".into() => string("never"),
-        "things".into() => table(&[string("Arepas de Yehuda"), int(1)]),
-        "color_config".into() =>
-            row(indexmap! {
-                "header_align".into()    =>     string("left"),
-                "index_color".into() =>  string("cyan_bold")
-            })
-    });
-
-    assert_eq!(
-        *value
-            .clone()
-            .into_untagged_value()
-            .forgiving_insert_data_at_column_path(&field_path, entry.clone())
-            .unwrap()
-            .get_data_by_column_path(
-                &field_path.item,
-                Box::new(error_callback("color_config.arepa_color"))
-            )
-            .unwrap(),
-        *string("amarillo")
-    );
-
-    assert_eq!(
-        *value
-            .into_untagged_value()
-            .forgiving_insert_data_at_column_path(&field_path.item, entry)
-            .unwrap()
-            .get_data_by_column_path(&pizza_path, Box::new(error_callback("things.0")))
-            .unwrap(),
-        *string("Arepas de Yehuda")
-    );
-}
-
-#[test]
-fn get_row_data_by_key() {
-    let row = row(indexmap! {
-            "lines".to_string() => int(0),
-            "words".to_string() => int(7),
-    });
-    assert_eq!(
-        row.get_data_by_key("lines".spanned_unknown()).unwrap(),
-        int(0)
-    );
-    assert!(row.get_data_by_key("chars".spanned_unknown()).is_none());
-}
-
-#[test]
-fn get_table_data_by_key() {
-    let row1 = row(indexmap! {
-            "lines".to_string() => int(0),
-            "files".to_string() => int(10),
-    });
-
-    let row2 = row(indexmap! {
-            "files".to_string() => int(1)
-    });
-
-    let table_value = table(&[row1, row2]);
-    assert_eq!(
-        table_value
-            .get_data_by_key("files".spanned_unknown())
-            .unwrap(),
-        table(&[int(10), int(1)])
-    );
-    assert_eq!(
-        table_value
-            .get_data_by_key("chars".spanned_unknown())
-            .unwrap(),
-        table(&[nothing(), nothing()])
-    );
-}
\ No newline at end of file
diff --git a/old_nushell/crates/nu_plugin_binaryview/Cargo.toml b/old_nushell/crates/nu_plugin_binaryview/Cargo.toml
deleted file mode 100644
index 0c4b10460..000000000
--- a/old_nushell/crates/nu_plugin_binaryview/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A binary viewer plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_binaryview"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-crossterm = "0.19"
-image = { version = "0.23.14", default_features = false, features = ["png", "jpeg"] }
-neso = "0.5.0"
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-nu-ansi-term = { version = "0.43.0", path="../nu-ansi-term" }
-nu-pretty-hex = { version = "0.43.0", path="../nu-pretty-hex" }
-rawkey = "0.1.3"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_binaryview/src/binaryview.rs b/old_nushell/crates/nu_plugin_binaryview/src/binaryview.rs
deleted file mode 100644
index 995c003d9..000000000
--- a/old_nushell/crates/nu_plugin_binaryview/src/binaryview.rs
+++ /dev/null
@@ -1,415 +0,0 @@
-use crossterm::{style::Attribute, ExecutableCommand};
-use nu_pretty_hex::*;
-use nu_protocol::outln;
-use nu_source::AnchorLocation;
-
-#[derive(Default)]
-pub struct BinaryView;
-
-impl BinaryView {
-    pub fn new() -> BinaryView {
-        BinaryView
-    }
-}
-
-pub fn view_binary(
-    b: &[u8],
-    source: Option<&AnchorLocation>,
-    lores_mode: bool,
-) -> Result<(), Box<dyn std::error::Error>> {
-    if b.len() > 3 {
-        if let (0x4e, 0x45, 0x53) = (b[0], b[1], b[2]) {
-            view_contents_interactive(b, source, lores_mode)?;
-            return Ok(());
-        }
-    }
-
-    view_contents(b, source, lores_mode)?;
-    Ok(())
-}
-
-pub struct RenderContext {
-    pub width: usize,
-    pub height: usize,
-    pub frame_buffer: Vec<(u8, u8, u8)>,
-    pub since_last_button: Vec<usize>,
-    pub lores_mode: bool,
-}
-
-impl RenderContext {
-    pub fn blank(lores_mode: bool) -> RenderContext {
-        RenderContext {
-            width: 0,
-            height: 0,
-            frame_buffer: vec![],
-            since_last_button: vec![0; 8],
-            lores_mode,
-        }
-    }
-    pub fn clear(&mut self) {
-        self.frame_buffer = vec![(0, 0, 0); self.width * self.height as usize];
-    }
-
-    fn render_to_screen_lores(&mut self) {
-        let mut prev_color: Option<(u8, u8, u8)> = None;
-        let mut prev_count = 1;
-
-        let _ = std::io::stdout().execute(crossterm::cursor::MoveTo(0, 0));
-
-        for pixel in &self.frame_buffer {
-            match prev_color {
-                Some(c) if c == *pixel => {
-                    prev_count += 1;
-                }
-                Some(c) => {
-                    print!(
-                        "{}",
-                        nu_ansi_term::Color::Rgb(c.0, c.1, c.2)
-                            .paint((0..prev_count).map(|_| "█").collect::<String>())
-                    );
-                    prev_color = Some(*pixel);
-                    prev_count = 1;
-                }
-                _ => {
-                    prev_color = Some(*pixel);
-                    prev_count = 1;
-                }
-            }
-        }
-
-        if prev_count > 0 {
-            if let Some(color) = prev_color {
-                print!(
-                    "{}",
-                    nu_ansi_term::Color::Rgb(color.0, color.1, color.2)
-                        .paint((0..prev_count).map(|_| "█").collect::<String>())
-                );
-            }
-        }
-        outln!("{}", Attribute::Reset);
-    }
-    fn render_to_screen_hires(&mut self) {
-        let mut prev_fg: Option<(u8, u8, u8)> = None;
-        let mut prev_bg: Option<(u8, u8, u8)> = None;
-        let mut prev_count = 1;
-
-        let mut pos = 0;
-        let fb_len = self.frame_buffer.len();
-
-        let _ = std::io::stdout().execute(crossterm::cursor::MoveTo(0, 0));
-
-        while pos < (fb_len - self.width) {
-            let top_pixel = self.frame_buffer[pos];
-            let bottom_pixel = self.frame_buffer[pos + self.width];
-
-            match (prev_fg, prev_bg) {
-                (Some(c), Some(d)) if c == top_pixel && d == bottom_pixel => {
-                    prev_count += 1;
-                }
-                (Some(c), Some(d)) => {
-                    print!(
-                        "{}",
-                        nu_ansi_term::Color::Rgb(c.0, c.1, c.2)
-                            .on(nu_ansi_term::Color::Rgb(d.0, d.1, d.2,))
-                            .paint((0..prev_count).map(|_| "▀").collect::<String>())
-                    );
-                    prev_fg = Some(top_pixel);
-                    prev_bg = Some(bottom_pixel);
-                    prev_count = 1;
-                }
-                _ => {
-                    prev_fg = Some(top_pixel);
-                    prev_bg = Some(bottom_pixel);
-                    prev_count = 1;
-                }
-            }
-            pos += 1;
-            if pos % self.width == 0 {
-                pos += self.width;
-            }
-        }
-        if prev_count > 0 {
-            if let (Some(c), Some(d)) = (prev_fg, prev_bg) {
-                print!(
-                    "{}",
-                    nu_ansi_term::Color::Rgb(c.0, c.1, c.2)
-                        .on(nu_ansi_term::Color::Rgb(d.0, d.1, d.2,))
-                        .paint((0..prev_count).map(|_| "▀").collect::<String>())
-                );
-            }
-        }
-        outln!("{}", Attribute::Reset);
-    }
-    pub fn flush(&mut self) {
-        if self.lores_mode {
-            self.render_to_screen_lores()
-        } else {
-            self.render_to_screen_hires()
-        }
-    }
-    pub fn update(&mut self) -> Result<(), Box<dyn std::error::Error>> {
-        let terminal_size = crossterm::terminal::size().unwrap_or((80, 24));
-
-        if (self.width != terminal_size.0 as usize) || (self.height != terminal_size.1 as usize) {
-            let _ = std::io::stdout().execute(crossterm::cursor::Hide);
-
-            self.width = terminal_size.0 as usize;
-            self.height = if self.lores_mode {
-                terminal_size.1 as usize - 1
-            } else {
-                (terminal_size.1 as usize - 1) * 2
-            };
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-struct RawImageBuffer {
-    dimensions: (u32, u32),
-    colortype: image::ColorType,
-    buffer: Vec<u8>,
-}
-
-fn load_from_png_buffer(buffer: &[u8]) -> Result<RawImageBuffer, Box<dyn std::error::Error>> {
-    use image::ImageDecoder;
-
-    let decoder = image::codecs::png::PngDecoder::new(buffer)?;
-
-    let dimensions = decoder.dimensions();
-    let colortype = decoder.color_type();
-    let mut buffer: Vec<u8> = vec![0; decoder.total_bytes() as usize];
-    decoder.read_image(&mut buffer)?;
-
-    Ok(RawImageBuffer {
-        dimensions,
-        colortype,
-        buffer,
-    })
-}
-
-fn load_from_jpg_buffer(buffer: &[u8]) -> Result<RawImageBuffer, Box<dyn std::error::Error>> {
-    use image::ImageDecoder;
-
-    let decoder = image::codecs::jpeg::JpegDecoder::new(buffer)?;
-
-    let dimensions = decoder.dimensions();
-    let colortype = decoder.color_type();
-    let mut buffer: Vec<u8> = vec![0; decoder.total_bytes() as usize];
-    decoder.read_image(&mut buffer)?;
-
-    Ok(RawImageBuffer {
-        dimensions,
-        colortype,
-        buffer,
-    })
-}
-
-pub fn view_contents(
-    buffer: &[u8],
-    _source: Option<&AnchorLocation>,
-    lores_mode: bool,
-) -> Result<(), Box<dyn std::error::Error>> {
-    // Some 'bad actor' binaries turn off ansi support so we need to make sure
-    // that ansi support is enabled in windows
-    #[cfg(windows)]
-    {
-        let _ = nu_ansi_term::enable_ansi_support();
-    }
-
-    // we never use skip and length here because the composable pipeline should do that part
-    let hex_config = HexConfig {
-        title: true,
-        ascii: true,
-        width: 16,
-        group: 4,
-        chunk: 1,
-        skip: None,
-        length: None,
-    };
-
-    let mut raw_image_buffer = load_from_png_buffer(buffer);
-
-    if raw_image_buffer.is_err() {
-        raw_image_buffer = load_from_jpg_buffer(buffer);
-    }
-
-    if raw_image_buffer.is_err() {
-        //Not yet supported
-        outln!("{}", config_hex(&buffer, hex_config));
-        return Ok(());
-    }
-    let raw_image_buffer = raw_image_buffer?;
-
-    let mut render_context: RenderContext = RenderContext::blank(lores_mode);
-    let _ = render_context.update();
-    render_context.clear();
-
-    match raw_image_buffer.colortype {
-        image::ColorType::Rgba8 => {
-            let img = image::ImageBuffer::<image::Rgba<u8>, Vec<u8>>::from_vec(
-                raw_image_buffer.dimensions.0 as u32,
-                raw_image_buffer.dimensions.1 as u32,
-                raw_image_buffer.buffer,
-            )
-            .ok_or("Cannot convert image data")?;
-
-            let resized_img = image::imageops::resize(
-                &img,
-                render_context.width as u32,
-                render_context.height as u32,
-                image::imageops::FilterType::Lanczos3,
-            );
-
-            for (count, pixel) in resized_img.pixels().enumerate() {
-                use image::Pixel;
-                let rgb = pixel.to_rgb();
-                render_context.frame_buffer[count] = (rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        image::ColorType::Rgb8 => {
-            let img = image::ImageBuffer::<image::Rgb<u8>, Vec<u8>>::from_vec(
-                raw_image_buffer.dimensions.0 as u32,
-                raw_image_buffer.dimensions.1 as u32,
-                raw_image_buffer.buffer,
-            )
-            .ok_or("Cannot convert image data")?;
-
-            let resized_img = image::imageops::resize(
-                &img,
-                render_context.width as u32,
-                render_context.height as u32,
-                image::imageops::FilterType::Lanczos3,
-            );
-
-            for (count, pixel) in resized_img.pixels().enumerate() {
-                use image::Pixel;
-                let rgb = pixel.to_rgb();
-                render_context.frame_buffer[count] = (rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        _ => {
-            //Not yet supported
-            outln!("{}", config_hex(&buffer, hex_config));
-            return Ok(());
-        }
-    }
-
-    render_context.flush();
-
-    let _ = std::io::stdout().execute(crossterm::cursor::Show);
-
-    let _ = crossterm::terminal::disable_raw_mode();
-
-    Ok(())
-}
-
-pub fn view_contents_interactive(
-    buffer: &[u8],
-    source: Option<&AnchorLocation>,
-    lores_mode: bool,
-) -> Result<(), Box<dyn std::error::Error>> {
-    use rawkey::{KeyCode, RawKey};
-
-    let sav_path = if let Some(AnchorLocation::File(f)) = source {
-        let mut path = std::path::PathBuf::from(f);
-        path.set_extension("sav");
-        Some(path)
-    } else {
-        None
-    };
-
-    let mut nes = neso::Nes::new(0.0);
-    let rawkey = RawKey::new();
-    nes.load_rom(buffer);
-
-    if let Some(ref sav_path) = sav_path {
-        if let Ok(contents) = std::fs::read(sav_path) {
-            let _ = nes.load_state(&contents);
-        }
-    }
-
-    nes.reset();
-
-    if let Ok(_raw) = crossterm::terminal::enable_raw_mode() {
-        let mut render_context: RenderContext = RenderContext::blank(lores_mode);
-
-        let buttons = vec![
-            KeyCode::Alt,
-            KeyCode::LeftControl,
-            KeyCode::Tab,
-            KeyCode::BackSpace,
-            KeyCode::UpArrow,
-            KeyCode::DownArrow,
-            KeyCode::LeftArrow,
-            KeyCode::RightArrow,
-        ];
-
-        let _ = std::io::stdout().execute(crossterm::cursor::Hide);
-
-        'gameloop: loop {
-            let _ = render_context.update();
-            nes.step_frame();
-
-            let image_buffer = nes.image_buffer();
-
-            let slice = unsafe { std::slice::from_raw_parts(image_buffer, 256 * 240 * 4) };
-            let img = image::ImageBuffer::<image::Rgba<u8>, &[u8]>::from_raw(256, 240, slice)
-                .ok_or("Cannot convert image data")?;
-            let resized_img = image::imageops::resize(
-                &img,
-                render_context.width as u32,
-                render_context.height as u32,
-                image::imageops::FilterType::Lanczos3,
-            );
-
-            render_context.clear();
-
-            for (count, pixel) in resized_img.pixels().enumerate() {
-                use image::Pixel;
-                let rgb = pixel.to_rgb();
-
-                render_context.frame_buffer[count] = (rgb[0], rgb[1], rgb[2]);
-            }
-            render_context.flush();
-
-            if rawkey.is_pressed(rawkey::KeyCode::Escape) {
-                break 'gameloop;
-            } else {
-                for (idx, button) in buttons.iter().enumerate() {
-                    if rawkey.is_pressed(*button) {
-                        nes.press_button(0, idx as u8);
-                    } else {
-                        nes.release_button(0, idx as u8);
-                    }
-                }
-                loop {
-                    let x = crossterm::event::poll(std::time::Duration::from_secs(0));
-                    match x {
-                        Ok(true) => {
-                            // Swallow the events so we don't queue them into the line editor
-                            let _ = crossterm::event::read();
-                        }
-                        _ => {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if let Some(ref sav_path) = sav_path {
-        let buffer = nes.save_state();
-        if let Ok(buffer) = buffer {
-            let _ = std::fs::write(sav_path, buffer);
-        }
-    }
-
-    let _ = std::io::stdout().execute(crossterm::cursor::Show);
-
-    let _screen = crossterm::terminal::disable_raw_mode();
-
-    Ok(())
-}
diff --git a/old_nushell/crates/nu_plugin_binaryview/src/lib.rs b/old_nushell/crates/nu_plugin_binaryview/src/lib.rs
deleted file mode 100644
index 2519aeccf..000000000
--- a/old_nushell/crates/nu_plugin_binaryview/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod binaryview;
-mod nu;
-
-pub use binaryview::BinaryView;
diff --git a/old_nushell/crates/nu_plugin_binaryview/src/main.rs b/old_nushell/crates/nu_plugin_binaryview/src/main.rs
deleted file mode 100644
index e56c48557..000000000
--- a/old_nushell/crates/nu_plugin_binaryview/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_binaryview::BinaryView;
-
-fn main() {
-    serve_plugin(&mut BinaryView::new())
-}
diff --git a/old_nushell/crates/nu_plugin_binaryview/src/nu/mod.rs b/old_nushell/crates/nu_plugin_binaryview/src/nu/mod.rs
deleted file mode 100644
index 933803ed7..000000000
--- a/old_nushell/crates/nu_plugin_binaryview/src/nu/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-
-use crate::binaryview::view_binary;
-use crate::BinaryView;
-
-impl Plugin for BinaryView {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("binaryview")
-            .desc("Autoview of binary data.")
-            .switch("lores", "use low resolution output mode", Some('l'))
-            .named(
-                "skip",
-                SyntaxShape::Int,
-                "skip x number of bytes",
-                Some('s'),
-            )
-            .named(
-                "bytes",
-                SyntaxShape::Int,
-                "show y number of bytes",
-                Some('b'),
-            ))
-    }
-
-    fn sink(&mut self, call_info: CallInfo, input: Vec<Value>) {
-        for v in input {
-            let value_anchor = v.anchor();
-            if let UntaggedValue::Primitive(Primitive::Binary(b)) = &v.value {
-                let low_res = call_info.args.has("lores");
-                let _ = view_binary(b, value_anchor.as_ref(), low_res);
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_chart/Cargo.toml b/old_nushell/crates/nu_plugin_chart/Cargo.toml
deleted file mode 100644
index 43f5a34e3..000000000
--- a/old_nushell/crates/nu_plugin_chart/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A plugin to display charts"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_chart"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-data = { path="../nu-data", version = "0.43.0" }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-nu-value-ext = { path="../nu-value-ext", version = "0.43.0" }
-
-crossterm = "0.19.0"
-tui = { version="0.15.0", default-features=false, features=["crossterm"] }
diff --git a/old_nushell/crates/nu_plugin_chart/src/bar.rs b/old_nushell/crates/nu_plugin_chart/src/bar.rs
deleted file mode 100644
index 4a77d0eca..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/bar.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use nu_data::utils::Model;
-use nu_errors::ShellError;
-
-use tui::{
-    layout::{Constraint, Direction, Layout},
-    style::{Color, Modifier, Style},
-    widgets::BarChart,
-};
-
-const DEFAULT_COLOR: Color = Color::Green;
-
-pub struct Bar<'a> {
-    pub title: &'a str,
-    pub data: Vec<(&'a str, u64)>,
-    pub enhanced_graphics: bool,
-}
-
-impl<'a> Bar<'a> {
-    pub fn from_model(model: &'a Model) -> Result<Bar<'a>, ShellError> {
-        let mut data = Vec::new();
-        let mut data_points = Vec::new();
-
-        for percentages in model
-            .percentages
-            .table_entries()
-            .cloned()
-            .collect::<Vec<_>>()
-        {
-            let mut percentages_collected = vec![];
-
-            for percentage in percentages.table_entries().cloned().collect::<Vec<_>>() {
-                percentages_collected.push(percentage.as_u64()?);
-            }
-
-            data_points.push(percentages_collected);
-        }
-
-        let mark_in = if model.labels.y.len() <= 1 {
-            0
-        } else {
-            (model.labels.y.len() as f64 / 2.0).floor() as usize
-        };
-
-        for idx in 0..model.labels.x.len() {
-            let mut current = 0;
-
-            loop {
-                let label = if current == mark_in {
-                    model
-                        .labels
-                        .at(idx)
-                        .ok_or_else(|| ShellError::untagged_runtime_error("Could not load data"))?
-                } else {
-                    ""
-                };
-
-                let percentages_collected = data_points
-                    .get(current)
-                    .ok_or_else(|| ShellError::untagged_runtime_error("Could not load data"))?;
-
-                data.push((
-                    label,
-                    *percentages_collected
-                        .get(idx)
-                        .ok_or_else(|| ShellError::untagged_runtime_error("Could not load data"))?,
-                ));
-
-                current += 1;
-
-                if current == model.labels.y.len() {
-                    break;
-                }
-            }
-        }
-
-        Ok(Bar {
-            title: "Bar Chart",
-            data: (&data[..]).to_vec(),
-            enhanced_graphics: true,
-        })
-    }
-
-    pub fn draw<T>(&mut self, ui: &mut tui::Terminal<T>) -> std::io::Result<()>
-    where
-        T: tui::backend::Backend,
-    {
-        ui.draw(|f| {
-            let chunks = Layout::default()
-                .direction(Direction::Vertical)
-                .margin(0)
-                .constraints([Constraint::Percentage(100)].as_ref())
-                .split(f.size());
-
-            let barchart = BarChart::default()
-                .data(&self.data)
-                .bar_width(9)
-                .bar_style(Style::default().fg(DEFAULT_COLOR))
-                .value_style(
-                    Style::default()
-                        .bg(Color::Black)
-                        .add_modifier(Modifier::BOLD),
-                );
-
-            f.render_widget(barchart, chunks[0]);
-        })?;
-        Ok(())
-    }
-
-    pub fn on_right(&mut self) {
-        let one_bar = self.data.remove(0);
-        self.data.push(one_bar);
-    }
-
-    pub fn on_left(&mut self) {
-        if let Some(one_bar) = self.data.pop() {
-            self.data.insert(0, one_bar);
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_bar.rs b/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_bar.rs
deleted file mode 100644
index 20ada9666..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_bar.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_chart::ChartBar;
-
-fn main() {
-    serve_plugin(&mut ChartBar::new());
-}
diff --git a/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_line.rs b/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_line.rs
deleted file mode 100644
index 82ae4a00d..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/bin/nu_plugin_chart_line.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_chart::ChartLine;
-
-fn main() {
-    serve_plugin(&mut ChartLine::new());
-}
diff --git a/old_nushell/crates/nu_plugin_chart/src/lib.rs b/old_nushell/crates/nu_plugin_chart/src/lib.rs
deleted file mode 100644
index 747c5bdcd..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod bar;
-mod line;
-mod nu;
-
-pub use nu::{ChartBar, ChartLine};
diff --git a/old_nushell/crates/nu_plugin_chart/src/line.rs b/old_nushell/crates/nu_plugin_chart/src/line.rs
deleted file mode 100644
index 53088a70d..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/line.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use nu_data::utils::Model;
-use nu_errors::ShellError;
-
-use tui::{
-    layout::{Constraint, Direction, Layout},
-    style::{Color, Modifier, Style},
-    symbols,
-    text::Span,
-    widgets::{Axis, Chart, Dataset, GraphType},
-};
-
-const DEFAULT_COLOR: Color = Color::Green;
-
-const DEFAULT_LINE_COLORS: [Color; 5] = [
-    Color::Green,
-    Color::Cyan,
-    Color::Magenta,
-    Color::Yellow,
-    Color::Red,
-];
-
-#[derive(Debug)]
-pub struct Line {
-    x_labels: Vec<String>,
-    x_range: [f64; 2],
-    y_range: [f64; 2],
-    datasets_names: Vec<String>,
-    data: Vec<Vec<(f64, f64)>>,
-}
-
-impl<'a> Line {
-    pub fn from_model(model: &'a Model) -> Result<Line, ShellError> {
-        Ok(Line {
-            x_labels: model.labels.x.to_vec(),
-            x_range: [
-                model.ranges.0.start.as_u64()? as f64,
-                model.labels.x.len() as f64,
-            ],
-            y_range: [
-                model.ranges.1.start.as_u64()? as f64,
-                model.ranges.1.end.as_u64()? as f64,
-            ],
-            datasets_names: if model.labels.y.len() == 1 {
-                vec!["".to_string()]
-            } else {
-                model.labels.y.to_vec()
-            },
-            data: model
-                .data
-                .table_entries()
-                .collect::<Vec<_>>()
-                .iter()
-                .map(|subset| {
-                    subset
-                        .table_entries()
-                        .enumerate()
-                        .map(|(idx, data_point)| {
-                            (
-                                idx as f64,
-                                if let Ok(point) = data_point.as_u64() {
-                                    point as f64
-                                } else {
-                                    0.0
-                                },
-                            )
-                        })
-                        .collect::<Vec<_>>()
-                })
-                .collect::<Vec<_>>(),
-        })
-    }
-
-    pub fn draw<T>(&mut self, ui: &mut tui::Terminal<T>) -> std::io::Result<()>
-    where
-        T: tui::backend::Backend,
-    {
-        ui.draw(|f| {
-            let chunks = Layout::default()
-                .direction(Direction::Vertical)
-                .margin(1)
-                .constraints([Constraint::Percentage(100)].as_ref())
-                .split(f.size());
-
-            let x_labels = self
-                .x_labels
-                .iter()
-                .map(move |label| {
-                    Span::styled(label, Style::default().add_modifier(Modifier::BOLD))
-                })
-                .collect::<Vec<_>>();
-
-            let y_labels = vec![
-                Span::styled(
-                    self.y_range[0].to_string(),
-                    Style::default().add_modifier(Modifier::BOLD),
-                ),
-                Span::raw(((self.y_range[0] + self.y_range[1]) / 2.0).to_string()),
-                Span::styled(
-                    self.y_range[1].to_string(),
-                    Style::default().add_modifier(Modifier::BOLD),
-                ),
-            ];
-
-            let marker = if x_labels.len() > 60 {
-                symbols::Marker::Braille
-            } else {
-                symbols::Marker::Dot
-            };
-
-            let datasets = self
-                .data
-                .iter()
-                .enumerate()
-                .map(|(idx, data_series)| {
-                    Dataset::default()
-                        .name(&self.datasets_names[idx])
-                        .marker(marker)
-                        .graph_type(GraphType::Line)
-                        .style(
-                            Style::default()
-                                .fg(*DEFAULT_LINE_COLORS.get(idx).unwrap_or(&DEFAULT_COLOR)),
-                        )
-                        .data(data_series)
-                })
-                .collect();
-
-            let chart = Chart::new(datasets)
-                .x_axis(
-                    Axis::default()
-                        .style(Style::default().fg(Color::Gray))
-                        .labels(x_labels)
-                        .bounds(self.x_range),
-                )
-                .y_axis(
-                    Axis::default()
-                        .style(Style::default().fg(Color::Gray))
-                        .labels(y_labels)
-                        .bounds(self.y_range),
-                );
-            f.render_widget(chart, chunks[0]);
-        })?;
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_chart/src/nu.rs b/old_nushell/crates/nu_plugin_chart/src/nu.rs
deleted file mode 100644
index 7b472a167..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/nu.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod bar;
-mod line;
-
-pub use bar::SubCommand as ChartBar;
-pub use line::SubCommand as ChartLine;
diff --git a/old_nushell/crates/nu_plugin_chart/src/nu/bar.rs b/old_nushell/crates/nu_plugin_chart/src/nu/bar.rs
deleted file mode 100644
index 4a47fc0e6..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/nu/bar.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-use nu_data::utils::{report as build_report, Model};
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::{Tagged, TaggedItem};
-use nu_value_ext::ValueExt;
-
-use crate::bar::Bar;
-
-use std::{
-    error::Error,
-    io::stdout,
-    sync::mpsc,
-    thread,
-    time::{Duration, Instant},
-};
-
-use crossterm::{
-    event::{self, DisableMouseCapture, EnableMouseCapture, Event as CEvent, KeyCode},
-    execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
-};
-
-use tui::{backend::CrosstermBackend, Terminal};
-
-enum Event<I> {
-    Input(I),
-    Tick,
-}
-
-pub enum Columns {
-    One(Tagged<String>),
-    Two(Tagged<String>, Tagged<String>),
-    None,
-}
-
-#[allow(clippy::type_complexity)]
-pub struct SubCommand {
-    pub reduction: nu_data::utils::Reduction,
-    pub columns: Columns,
-    pub eval: Option<Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send>>,
-    pub format: Option<String>,
-}
-
-impl Default for SubCommand {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SubCommand {
-    pub fn new() -> SubCommand {
-        SubCommand {
-            reduction: nu_data::utils::Reduction::Count,
-            columns: Columns::None,
-            eval: None,
-            format: None,
-        }
-    }
-}
-
-fn display(model: &Model) -> Result<(), Box<dyn Error>> {
-    let mut app = Bar::from_model(model)?;
-
-    enable_raw_mode()?;
-
-    let mut stdout = stdout();
-    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
-
-    let backend = CrosstermBackend::new(stdout);
-
-    let mut terminal = Terminal::new(backend)?;
-
-    let (tx, rx) = mpsc::channel();
-
-    let tick_rate = Duration::from_millis(250);
-    thread::spawn(move || {
-        let mut last_tick = Instant::now();
-        loop {
-            if event::poll(tick_rate - last_tick.elapsed()).is_ok() {
-                if let Ok(CEvent::Key(key)) = event::read() {
-                    let _ = tx.send(Event::Input(key));
-                }
-            }
-            if last_tick.elapsed() >= tick_rate {
-                let _ = tx.send(Event::Tick);
-                last_tick = Instant::now();
-            }
-        }
-    });
-
-    terminal.clear()?;
-
-    loop {
-        app.draw(&mut terminal)?;
-
-        match rx.recv()? {
-            Event::Input(event) => match event.code {
-                KeyCode::Left => app.on_left(),
-                KeyCode::Right => app.on_right(),
-                KeyCode::Char('q') => {
-                    disable_raw_mode()?;
-                    execute!(
-                        terminal.backend_mut(),
-                        LeaveAlternateScreen,
-                        DisableMouseCapture
-                    )?;
-                    terminal.show_cursor()?;
-                    break;
-                }
-                _ => {
-                    disable_raw_mode()?;
-                    execute!(
-                        terminal.backend_mut(),
-                        LeaveAlternateScreen,
-                        DisableMouseCapture
-                    )?;
-                    terminal.show_cursor()?;
-                    break;
-                }
-            },
-            Event::Tick => {}
-        }
-    }
-
-    Ok(())
-}
-
-impl Plugin for SubCommand {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("chart bar")
-            .desc("Bar charts")
-            .switch("acc", "accumulate values", Some('a'))
-            .optional(
-                "columns",
-                SyntaxShape::Any,
-                "the columns to chart [x-axis y-axis]",
-            )
-            .named(
-                "use",
-                SyntaxShape::ColumnPath,
-                "column to use for evaluation",
-                Some('u'),
-            )
-            .named(
-                "format",
-                SyntaxShape::String,
-                "Specify date and time formatting",
-                Some('f'),
-            ))
-    }
-
-    fn sink(&mut self, call_info: CallInfo, input: Vec<Value>) {
-        if let Some(Value {
-            value: UntaggedValue::Primitive(Primitive::Boolean(true)),
-            ..
-        }) = call_info.args.get("acc")
-        {
-            self.reduction = nu_data::utils::Reduction::Accumulate;
-        }
-
-        let _ = self.run(call_info, input);
-    }
-}
-
-impl SubCommand {
-    fn run(&mut self, call_info: CallInfo, input: Vec<Value>) -> Result<(), ShellError> {
-        let args = call_info.args;
-        let name = call_info.name_tag;
-
-        self.eval = if let Some(path) = args.get("use") {
-            Some(evaluator(path.as_column_path()?.item))
-        } else {
-            None
-        };
-
-        self.format = if let Some(fmt) = args.get("format") {
-            Some(fmt.as_string()?)
-        } else {
-            None
-        };
-
-        for arg in args.positional_iter() {
-            match arg {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(column)),
-                    tag,
-                } => {
-                    let column = column.clone();
-                    self.columns = Columns::One(column.tagged(tag));
-                }
-                Value {
-                    value: UntaggedValue::Table(arguments),
-                    tag,
-                } => {
-                    if arguments.len() > 1 {
-                        let col1 = arguments
-                            .get(0)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        let col2 = arguments
-                            .get(1)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        self.columns = Columns::Two(col1, col2);
-                    } else {
-                        let col1 = arguments
-                            .get(0)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        self.columns = Columns::One(col1);
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        let data = UntaggedValue::table(&input).into_value(&name);
-
-        match &self.columns {
-            Columns::Two(col1, col2) => {
-                let key = col1.clone();
-                let fmt = self.format.clone();
-
-                let grouper = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-                    let fmt = fmt.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => {
-                            if let Some(fmt) = fmt {
-                                let callback = nu_data::utils::helpers::date_formatter(fmt);
-                                callback(&key, "nothing".to_string())
-                            } else {
-                                nu_value_ext::as_string(&key)
-                            }
-                        }
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let key = col2.clone();
-                let splitter = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => nu_value_ext::as_string(&key),
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let formatter = if self.format.is_some() {
-                    let default = String::from("%b-%Y");
-
-                    let string_fmt = self.format.as_ref().unwrap_or(&default);
-
-                    Some(nu_data::utils::helpers::date_formatter(
-                        string_fmt.to_string(),
-                    ))
-                } else {
-                    None
-                };
-
-                let options = nu_data::utils::Operation {
-                    grouper: Some(grouper),
-                    splitter: Some(splitter),
-                    format: &formatter,
-                    eval: &self.eval,
-                    reduction: &self.reduction,
-                };
-
-                let _ = display(&build_report(&data, options, &name)?);
-            }
-            Columns::One(col) => {
-                let key = col.clone();
-                let fmt = self.format.clone();
-
-                let grouper = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-                    let fmt = fmt.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => {
-                            if let Some(fmt) = fmt {
-                                let callback = nu_data::utils::helpers::date_formatter(fmt);
-                                callback(&key, "nothing".to_string())
-                            } else {
-                                nu_value_ext::as_string(&key)
-                            }
-                        }
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let formatter = if self.format.is_some() {
-                    let default = String::from("%b-%Y");
-
-                    let string_fmt = self.format.as_ref().unwrap_or(&default);
-
-                    Some(nu_data::utils::helpers::date_formatter(
-                        string_fmt.to_string(),
-                    ))
-                } else {
-                    None
-                };
-
-                let options = nu_data::utils::Operation {
-                    grouper: Some(grouper),
-                    splitter: None,
-                    format: &formatter,
-                    eval: &self.eval,
-                    reduction: &self.reduction,
-                };
-
-                let _ = display(&build_report(&data, options, &name)?);
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-}
-
-pub fn evaluator(by: ColumnPath) -> Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send> {
-    Box::new(move |_: usize, value: &Value| {
-        let path = by.clone();
-
-        let eval = nu_value_ext::get_data_by_column_path(value, &path, move |_, _, error| error);
-
-        match eval {
-            Ok(with_value) => Ok(with_value),
-            Err(reason) => Err(reason),
-        }
-    })
-}
diff --git a/old_nushell/crates/nu_plugin_chart/src/nu/line.rs b/old_nushell/crates/nu_plugin_chart/src/nu/line.rs
deleted file mode 100644
index 91f27c5ce..000000000
--- a/old_nushell/crates/nu_plugin_chart/src/nu/line.rs
+++ /dev/null
@@ -1,369 +0,0 @@
-use nu_data::utils::{report as build_report, Model};
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, ColumnPath, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::{Tagged, TaggedItem};
-use nu_value_ext::ValueExt;
-
-use crate::line::Line;
-
-use std::{
-    error::Error,
-    io::stdout,
-    sync::mpsc,
-    thread,
-    time::{Duration, Instant},
-};
-
-use crossterm::{
-    event::{self, DisableMouseCapture, EnableMouseCapture, Event as CEvent, KeyCode},
-    execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
-};
-
-use tui::{backend::CrosstermBackend, Terminal};
-
-enum Event<I> {
-    Input(I),
-    Tick,
-}
-
-pub enum Columns {
-    One(Tagged<String>),
-    Two(Tagged<String>, Tagged<String>),
-    None,
-}
-
-#[allow(clippy::type_complexity)]
-pub struct SubCommand {
-    pub reduction: nu_data::utils::Reduction,
-    pub columns: Columns,
-    pub eval: Option<Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send>>,
-    pub format: Option<String>,
-}
-
-impl Default for SubCommand {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SubCommand {
-    pub fn new() -> SubCommand {
-        SubCommand {
-            reduction: nu_data::utils::Reduction::Count,
-            columns: Columns::None,
-            eval: None,
-            format: None,
-        }
-    }
-}
-
-fn display(model: &Model) -> Result<(), Box<dyn Error>> {
-    let mut app = Line::from_model(model)?;
-
-    enable_raw_mode()?;
-
-    let mut stdout = stdout();
-    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
-
-    let backend = CrosstermBackend::new(stdout);
-
-    let mut terminal = Terminal::new(backend)?;
-
-    let (tx, rx) = mpsc::channel();
-
-    let tick_rate = Duration::from_millis(250);
-    thread::spawn(move || {
-        let mut last_tick = Instant::now();
-        loop {
-            if event::poll(tick_rate - last_tick.elapsed()).is_ok() {
-                if let Ok(CEvent::Key(key)) = event::read() {
-                    let _ = tx.send(Event::Input(key));
-                }
-            }
-            if last_tick.elapsed() >= tick_rate {
-                let _ = tx.send(Event::Tick);
-                last_tick = Instant::now();
-            }
-        }
-    });
-
-    terminal.clear()?;
-
-    loop {
-        app.draw(&mut terminal)?;
-
-        match rx.recv()? {
-            Event::Input(event) => match event.code {
-                KeyCode::Char('q') => {
-                    disable_raw_mode()?;
-                    execute!(
-                        terminal.backend_mut(),
-                        LeaveAlternateScreen,
-                        DisableMouseCapture
-                    )?;
-                    terminal.show_cursor()?;
-                    break;
-                }
-                _ => {
-                    disable_raw_mode()?;
-                    execute!(
-                        terminal.backend_mut(),
-                        LeaveAlternateScreen,
-                        DisableMouseCapture
-                    )?;
-                    terminal.show_cursor()?;
-                    break;
-                }
-            },
-            Event::Tick => {}
-        }
-    }
-
-    Ok(())
-}
-
-impl Plugin for SubCommand {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("chart line")
-            .desc("Line charts")
-            .switch("acc", "accumulate values", Some('a'))
-            .optional(
-                "columns",
-                SyntaxShape::Any,
-                "the columns to chart [x-axis y-axis]",
-            )
-            .named(
-                "use",
-                SyntaxShape::ColumnPath,
-                "column to use for evaluation",
-                Some('u'),
-            )
-            .named(
-                "format",
-                SyntaxShape::String,
-                "Specify date and time formatting",
-                Some('f'),
-            ))
-    }
-
-    fn sink(&mut self, call_info: CallInfo, input: Vec<Value>) {
-        if let Some(Value {
-            value: UntaggedValue::Primitive(Primitive::Boolean(true)),
-            ..
-        }) = call_info.args.get("acc")
-        {
-            self.reduction = nu_data::utils::Reduction::Accumulate;
-        }
-
-        let _ = self.run(call_info, input);
-    }
-}
-
-impl SubCommand {
-    fn run(&mut self, call_info: CallInfo, input: Vec<Value>) -> Result<(), ShellError> {
-        let args = call_info.args;
-        let name = call_info.name_tag;
-
-        self.eval = if let Some(path) = args.get("use") {
-            Some(evaluator(path.as_column_path()?.item))
-        } else {
-            None
-        };
-
-        self.format = if let Some(fmt) = args.get("format") {
-            Some(fmt.as_string()?)
-        } else {
-            None
-        };
-
-        for arg in args.positional_iter() {
-            match arg {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(column)),
-                    tag,
-                } => {
-                    let column = column.clone();
-                    self.columns = Columns::One(column.tagged(tag));
-                }
-                Value {
-                    value: UntaggedValue::Table(arguments),
-                    tag,
-                } => {
-                    if arguments.len() > 1 {
-                        let col1 = arguments
-                            .get(0)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        let col2 = arguments
-                            .get(1)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        self.columns = Columns::Two(col1, col2);
-                    } else {
-                        let col1 = arguments
-                            .get(0)
-                            .ok_or_else(|| {
-                                ShellError::labeled_error(
-                                    "expected file and replace strings eg) [find replace]",
-                                    "missing find-replace values",
-                                    tag,
-                                )
-                            })?
-                            .as_string()?
-                            .tagged(tag);
-
-                        self.columns = Columns::One(col1);
-                    }
-                }
-                _ => {}
-            }
-        }
-
-        let data = UntaggedValue::table(&input).into_value(&name);
-
-        match &self.columns {
-            Columns::Two(col1, col2) => {
-                let key = col1.clone();
-                let fmt = self.format.clone();
-
-                let grouper = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-                    let fmt = fmt.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => {
-                            if let Some(fmt) = fmt {
-                                let callback = nu_data::utils::helpers::date_formatter(fmt);
-                                callback(&key, "nothing".to_string())
-                            } else {
-                                nu_value_ext::as_string(&key)
-                            }
-                        }
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let key = col2.clone();
-                let splitter = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => nu_value_ext::as_string(&key),
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let formatter = if self.format.is_some() {
-                    let default = String::from("%b-%Y");
-
-                    let string_fmt = self.format.as_ref().unwrap_or(&default);
-
-                    Some(nu_data::utils::helpers::date_formatter(
-                        string_fmt.to_string(),
-                    ))
-                } else {
-                    None
-                };
-
-                let options = nu_data::utils::Operation {
-                    grouper: Some(grouper),
-                    splitter: Some(splitter),
-                    format: &formatter,
-                    eval: &self.eval,
-                    reduction: &self.reduction,
-                };
-
-                let _ = display(&build_report(&data, options, &name)?);
-            }
-            Columns::One(col) => {
-                let key = col.clone();
-                let fmt = self.format.clone();
-
-                let grouper = Box::new(move |_: usize, row: &Value| {
-                    let key = key.clone();
-                    let fmt = fmt.clone();
-
-                    match row.get_data_by_key(key.borrow_spanned()) {
-                        Some(key) => {
-                            if let Some(fmt) = fmt {
-                                let callback = nu_data::utils::helpers::date_formatter(fmt);
-                                callback(&key, "nothing".to_string())
-                            } else {
-                                nu_value_ext::as_string(&key)
-                            }
-                        }
-                        None => Err(ShellError::labeled_error(
-                            "unknown column",
-                            "unknown column",
-                            key.tag(),
-                        )),
-                    }
-                });
-
-                let formatter = if self.format.is_some() {
-                    let default = String::from("%b-%Y");
-
-                    let string_fmt = self.format.as_ref().unwrap_or(&default);
-
-                    Some(nu_data::utils::helpers::date_formatter(
-                        string_fmt.to_string(),
-                    ))
-                } else {
-                    None
-                };
-
-                let options = nu_data::utils::Operation {
-                    grouper: Some(grouper),
-                    splitter: None,
-                    format: &formatter,
-                    eval: &self.eval,
-                    reduction: &self.reduction,
-                };
-
-                let _ = display(&build_report(&data, options, &name)?);
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-}
-
-pub fn evaluator(by: ColumnPath) -> Box<dyn Fn(usize, &Value) -> Result<Value, ShellError> + Send> {
-    Box::new(move |_: usize, value: &Value| {
-        let path = by.clone();
-
-        let eval = nu_value_ext::get_data_by_column_path(value, &path, move |_, _, error| error);
-
-        match eval {
-            Ok(with_value) => Ok(with_value),
-            Err(reason) => Err(reason),
-        }
-    })
-}
diff --git a/old_nushell/crates/nu_plugin_from_bson/Cargo.toml b/old_nushell/crates/nu_plugin_from_bson/Cargo.toml
deleted file mode 100644
index c351a82c0..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A converter plugin to the bson format for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_from_bson"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_from_bson/src/from_bson.rs b/old_nushell/crates/nu_plugin_from_bson/src/from_bson.rs
deleted file mode 100644
index 115c52492..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/src/from_bson.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use bigdecimal::BigDecimal;
-use bson::{spec::BinarySubtype, Bson};
-use nu_errors::{ExpectedRange, ShellError};
-use nu_protocol::{Primitive, ReturnSuccess, ReturnValue, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::{SpannedItem, Tag};
-use std::str::FromStr;
-
-#[derive(Default)]
-pub struct FromBson {
-    pub state: Vec<u8>,
-    pub name_tag: Tag,
-}
-
-impl FromBson {
-    pub fn new() -> FromBson {
-        FromBson {
-            state: vec![],
-            name_tag: Tag::unknown(),
-        }
-    }
-}
-
-fn bson_array(input: &[Bson], tag: Tag) -> Result<Vec<Value>, ShellError> {
-    let mut out = vec![];
-
-    for value in input {
-        out.push(convert_bson_value_to_nu_value(value, &tag)?);
-    }
-
-    Ok(out)
-}
-
-fn convert_bson_value_to_nu_value(v: &Bson, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let tag = tag.into();
-    let span = tag.span;
-
-    Ok(match v {
-        Bson::Double(n) => UntaggedValue::Primitive(Primitive::from(*n)).into_value(&tag),
-        Bson::String(s) => {
-            UntaggedValue::Primitive(Primitive::String(String::from(s))).into_value(&tag)
-        }
-        Bson::Array(a) => UntaggedValue::Table(bson_array(a, tag.clone())?).into_value(&tag),
-        Bson::Document(doc) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            for (k, v) in doc {
-                collected.insert_value(k.clone(), convert_bson_value_to_nu_value(v, &tag)?);
-            }
-
-            collected.into_value()
-        }
-        Bson::Boolean(b) => UntaggedValue::Primitive(Primitive::Boolean(*b)).into_value(&tag),
-        Bson::Null => UntaggedValue::Primitive(Primitive::Nothing).into_value(&tag),
-        Bson::RegularExpression(regx) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$regex".to_string(),
-                UntaggedValue::Primitive(Primitive::String(String::from(&regx.pattern)))
-                    .into_value(&tag),
-            );
-            collected.insert_value(
-                "$options".to_string(),
-                UntaggedValue::Primitive(Primitive::String(String::from(&regx.options)))
-                    .into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::Int32(n) => UntaggedValue::int(*n).into_value(&tag),
-        Bson::Int64(n) => UntaggedValue::int(*n).into_value(&tag),
-        Bson::Decimal128(n) => {
-            // TODO: this really isn't great, and we should update this to do a higher
-            // fidelity translation
-            let decimal = BigDecimal::from_str(&n.to_string()).map_err(|_| {
-                ShellError::range_error(
-                    ExpectedRange::BigDecimal,
-                    &n.spanned(span),
-                    "converting BSON Decimal128 to BigDecimal".to_owned(),
-                )
-            })?;
-            UntaggedValue::Primitive(Primitive::Decimal(decimal)).into_value(&tag)
-        }
-        Bson::JavaScriptCode(js) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$javascript".to_string(),
-                UntaggedValue::Primitive(Primitive::String(String::from(js))).into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::JavaScriptCodeWithScope(js) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$javascript".to_string(),
-                UntaggedValue::Primitive(Primitive::String(String::from(&js.code)))
-                    .into_value(&tag),
-            );
-            collected.insert_value(
-                "$scope".to_string(),
-                convert_bson_value_to_nu_value(&Bson::Document(js.scope.to_owned()), tag)?,
-            );
-            collected.into_value()
-        }
-        Bson::Timestamp(ts) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$timestamp".to_string(),
-                UntaggedValue::int(ts.time).into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::Binary(binary) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$binary_subtype".to_string(),
-                match binary.subtype {
-                    BinarySubtype::UserDefined(u) => UntaggedValue::int(u),
-                    _ => UntaggedValue::Primitive(Primitive::String(binary_subtype_to_string(
-                        binary.subtype,
-                    ))),
-                }
-                .into_value(&tag),
-            );
-            collected.insert_value(
-                "$binary".to_string(),
-                UntaggedValue::Primitive(Primitive::Binary(binary.bytes.to_owned()))
-                    .into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::ObjectId(obj_id) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$object_id".to_string(),
-                UntaggedValue::Primitive(Primitive::String(obj_id.to_hex())).into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::DateTime(dt) => {
-            UntaggedValue::Primitive(Primitive::Date(dt.to_chrono().into())).into_value(&tag)
-        }
-        Bson::Symbol(s) => {
-            let mut collected = TaggedDictBuilder::new(tag.clone());
-            collected.insert_value(
-                "$symbol".to_string(),
-                UntaggedValue::Primitive(Primitive::String(String::from(s))).into_value(&tag),
-            );
-            collected.into_value()
-        }
-        Bson::Undefined | Bson::MaxKey | Bson::MinKey | Bson::DbPointer(_) => {
-            // TODO  Impelmenting Bson::Undefined, Bson::MaxKey, Bson::MinKey and Bson::DbPointer
-            // These Variants weren't present in the previous version.
-            TaggedDictBuilder::new(tag).into_value()
-        }
-    })
-}
-
-fn binary_subtype_to_string(bst: BinarySubtype) -> String {
-    match bst {
-        BinarySubtype::Generic => "generic",
-        BinarySubtype::Function => "function",
-        BinarySubtype::BinaryOld => "binary_old",
-        BinarySubtype::UuidOld => "uuid_old",
-        BinarySubtype::Uuid => "uuid",
-        BinarySubtype::Md5 => "md5",
-        _ => unreachable!(),
-    }
-    .to_string()
-}
-
-#[derive(Debug)]
-struct BytesReader {
-    pos: usize,
-    inner: Vec<u8>,
-}
-
-impl BytesReader {
-    fn new(bytes: Vec<u8>) -> BytesReader {
-        BytesReader {
-            pos: 0,
-            inner: bytes,
-        }
-    }
-}
-
-impl std::io::Read for BytesReader {
-    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
-        let src: &mut &[u8] = &mut self.inner[self.pos..].as_ref();
-        let diff = src.read(buf)?;
-        self.pos += diff;
-        Ok(diff)
-    }
-}
-
-pub fn from_bson_bytes_to_value(bytes: Vec<u8>, tag: impl Into<Tag>) -> Result<Value, ShellError> {
-    let mut docs = Vec::new();
-    let mut b_reader = BytesReader::new(bytes);
-    while let Ok(v) = bson::de::from_reader(&mut b_reader) {
-        docs.push(Bson::Document(v));
-    }
-
-    convert_bson_value_to_nu_value(&Bson::Array(docs), tag)
-}
-
-pub fn from_bson(bytes: Vec<u8>, name_tag: Tag) -> Result<Vec<ReturnValue>, ShellError> {
-    match from_bson_bytes_to_value(bytes, name_tag.clone()) {
-        Ok(x) => Ok(vec![ReturnSuccess::value(x)]),
-        Err(_) => Err(ShellError::labeled_error(
-            "Could not parse as BSON",
-            "input cannot be parsed as BSON",
-            name_tag,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_bson/src/lib.rs b/old_nushell/crates/nu_plugin_from_bson/src/lib.rs
deleted file mode 100644
index c037ee028..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod from_bson;
-mod nu;
-
-pub use from_bson::FromBson;
diff --git a/old_nushell/crates/nu_plugin_from_bson/src/main.rs b/old_nushell/crates/nu_plugin_from_bson/src/main.rs
deleted file mode 100644
index bec813d01..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_bson::FromBson;
-
-fn main() {
-    serve_plugin(&mut FromBson::new())
-}
diff --git a/old_nushell/crates/nu_plugin_from_bson/src/nu/mod.rs b/old_nushell/crates/nu_plugin_from_bson/src/nu/mod.rs
deleted file mode 100644
index 0a6584d01..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/src/nu/mod.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::FromBson;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Primitive, ReturnValue, Signature, UntaggedValue, Value};
-use nu_source::Tag;
-
-impl Plugin for FromBson {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("from bson")
-            .desc("Convert from .bson binary into table")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        self.name_tag = call_info.name_tag;
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                ..
-            } => {
-                self.state.extend_from_slice(&b);
-            }
-            Value { tag, .. } => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Expected binary from pipeline",
-                    "requires binary input",
-                    self.name_tag.clone(),
-                    "value originates from here",
-                    tag,
-                ));
-            }
-        }
-        Ok(vec![])
-    }
-
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        crate::from_bson::from_bson(self.state.clone(), Tag::unknown())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_bson/src/nu/tests.rs b/old_nushell/crates/nu_plugin_from_bson/src/nu/tests.rs
deleted file mode 100644
index d14c19bee..000000000
--- a/old_nushell/crates/nu_plugin_from_bson/src/nu/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration {}
diff --git a/old_nushell/crates/nu_plugin_from_mp4/Cargo.toml b/old_nushell/crates/nu_plugin_from_mp4/Cargo.toml
deleted file mode 100644
index 82f4fcd12..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A converter plugin to the mp4 format for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_from_mp4"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-tempfile = "3.2.0"
-mp4 = "0.9.0"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_from_mp4/src/from_mp4.rs b/old_nushell/crates/nu_plugin_from_mp4/src/from_mp4.rs
deleted file mode 100644
index 671cc2933..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/src/from_mp4.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{ReturnSuccess, ReturnValue, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tag;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
-
-#[derive(Default)]
-pub struct FromMp4 {
-    pub state: Vec<u8>,
-    pub name_tag: Tag,
-}
-
-impl FromMp4 {
-    pub fn new() -> Self {
-        Self {
-            state: vec![],
-            name_tag: Tag::unknown(),
-        }
-    }
-}
-
-pub fn convert_mp4_file_to_nu_value(path: &Path, tag: Tag) -> Result<Value, mp4::Error> {
-    let mp4 = mp4::read_mp4(File::open(path).expect("Could not open mp4 file to read metadata"))?;
-
-    let mut dict = TaggedDictBuilder::new(tag.clone());
-
-    // Build tracks table
-    let mut tracks = Vec::new();
-    for track in mp4.tracks().values() {
-        let mut curr_track_dict = TaggedDictBuilder::new(tag.clone());
-
-        curr_track_dict.insert_untagged("track id", UntaggedValue::int(track.track_id()));
-
-        curr_track_dict.insert_untagged(
-            "track type",
-            match track.track_type() {
-                Ok(t) => UntaggedValue::string(t.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "media type",
-            match track.media_type() {
-                Ok(t) => UntaggedValue::string(t.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "box type",
-            match track.box_type() {
-                Ok(t) => UntaggedValue::string(t.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged("width", UntaggedValue::int(track.width()));
-        curr_track_dict.insert_untagged("height", UntaggedValue::int(track.height()));
-        curr_track_dict.insert_untagged("frame_rate", UntaggedValue::from(track.frame_rate()));
-
-        curr_track_dict.insert_untagged(
-            "sample freq index",
-            match track.sample_freq_index() {
-                Ok(sfi) => UntaggedValue::string(sfi.freq().to_string()), // this is a string for formatting reasons
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "channel config",
-            match track.channel_config() {
-                Ok(cc) => UntaggedValue::string(cc.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged("language", UntaggedValue::string(track.language()));
-        curr_track_dict.insert_untagged("timescale", UntaggedValue::int(track.timescale()));
-        curr_track_dict.insert_untagged(
-            "duration",
-            UntaggedValue::duration(track.duration().as_nanos()),
-        );
-        curr_track_dict.insert_untagged("bitrate", UntaggedValue::int(track.bitrate()));
-        curr_track_dict.insert_untagged("sample count", UntaggedValue::int(track.sample_count()));
-
-        curr_track_dict.insert_untagged(
-            "video profile",
-            match track.video_profile() {
-                Ok(vp) => UntaggedValue::string(vp.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "audio profile",
-            match track.audio_profile() {
-                Ok(ap) => UntaggedValue::string(ap.to_string()),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "sequence parameter set",
-            match track.sequence_parameter_set() {
-                Ok(sps) => UntaggedValue::string(format!("{:X?}", sps)),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        curr_track_dict.insert_untagged(
-            "picture parameter set",
-            match track.picture_parameter_set() {
-                Ok(pps) => UntaggedValue::string(format!("{:X?}", pps)),
-                Err(_) => UntaggedValue::from("Unknown"),
-            },
-        );
-
-        // push curr track to tracks vec
-        tracks.push(curr_track_dict.into_value());
-    }
-
-    dict.insert_untagged("size", UntaggedValue::big_int(mp4.size()));
-
-    dict.insert_untagged(
-        "major brand",
-        UntaggedValue::string(mp4.major_brand().to_string()),
-    );
-
-    dict.insert_untagged("minor version", UntaggedValue::int(mp4.minor_version()));
-
-    dict.insert_untagged(
-        "compatible brands",
-        UntaggedValue::string(format!("{:?}", mp4.compatible_brands())),
-    );
-
-    dict.insert_untagged(
-        "duration",
-        UntaggedValue::duration(mp4.duration().as_nanos()),
-    );
-
-    dict.insert_untagged("timescale", UntaggedValue::int(mp4.timescale()));
-    dict.insert_untagged("is fragmented", UntaggedValue::boolean(mp4.is_fragmented()));
-    dict.insert_untagged("tracks", UntaggedValue::Table(tracks).into_value(&tag));
-
-    Ok(dict.into_value())
-}
-
-pub fn from_mp4_bytes_to_value(mut bytes: Vec<u8>, tag: Tag) -> Result<Value, std::io::Error> {
-    let mut tempfile = tempfile::NamedTempFile::new()?;
-    tempfile.write_all(bytes.as_mut_slice())?;
-    match convert_mp4_file_to_nu_value(tempfile.path(), tag) {
-        Ok(value) => Ok(value),
-        Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
-    }
-}
-
-pub fn from_mp4(bytes: Vec<u8>, name_tag: Tag) -> Result<Vec<ReturnValue>, ShellError> {
-    match from_mp4_bytes_to_value(bytes, name_tag.clone()) {
-        Ok(x) => match x {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => Ok(list.into_iter().map(ReturnSuccess::value).collect()),
-            _ => Ok(vec![ReturnSuccess::value(x)]),
-        },
-        Err(_) => Err(ShellError::labeled_error(
-            "Could not parse as MP4",
-            "input cannot be parsed as MP4",
-            &name_tag,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_mp4/src/lib.rs b/old_nushell/crates/nu_plugin_from_mp4/src/lib.rs
deleted file mode 100644
index 8de6281f2..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod from_mp4;
-mod nu;
-
-pub use from_mp4::FromMp4;
diff --git a/old_nushell/crates/nu_plugin_from_mp4/src/main.rs b/old_nushell/crates/nu_plugin_from_mp4/src/main.rs
deleted file mode 100644
index 539b494cf..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_mp4::FromMp4;
-
-fn main() {
-    serve_plugin(&mut FromMp4::new())
-}
diff --git a/old_nushell/crates/nu_plugin_from_mp4/src/nu/mod.rs b/old_nushell/crates/nu_plugin_from_mp4/src/nu/mod.rs
deleted file mode 100644
index 4aa09ca7d..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/src/nu/mod.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::FromMp4;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Primitive, ReturnValue, Signature, UntaggedValue, Value};
-use nu_source::Tag;
-
-impl Plugin for FromMp4 {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("from mp4")
-            .desc("Get meta-data of mp4 file")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        self.name_tag = call_info.name_tag;
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                ..
-            } => {
-                self.state.extend_from_slice(&b);
-            }
-            Value { tag, .. } => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Expected binary from pipeline",
-                    "requires binary input",
-                    self.name_tag.clone(),
-                    "value originates from here",
-                    tag,
-                ));
-            }
-        }
-        Ok(vec![])
-    }
-
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        crate::from_mp4::from_mp4(self.state.clone(), Tag::unknown())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_mp4/src/nu/tests.rs b/old_nushell/crates/nu_plugin_from_mp4/src/nu/tests.rs
deleted file mode 100644
index d14c19bee..000000000
--- a/old_nushell/crates/nu_plugin_from_mp4/src/nu/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration {}
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/Cargo.toml b/old_nushell/crates/nu_plugin_from_sqlite/Cargo.toml
deleted file mode 100644
index 91305239a..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A converter plugin to the bson format for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_from_sqlite"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-tempfile = "3.2.0"
-
-[dependencies.rusqlite]
-features = ["bundled", "blob"]
-version = "0.26.1"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/src/from_sqlite.rs b/old_nushell/crates/nu_plugin_from_sqlite/src/from_sqlite.rs
deleted file mode 100644
index da7bb00da..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/src/from_sqlite.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use bigdecimal::FromPrimitive;
-use nu_errors::ShellError;
-use nu_protocol::{Primitive, ReturnSuccess, ReturnValue, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tag;
-use rusqlite::{types::ValueRef, Connection, Row};
-use std::io::Write;
-use std::path::Path;
-
-#[derive(Default)]
-pub struct FromSqlite {
-    pub state: Vec<u8>,
-    pub name_tag: Tag,
-    pub tables: Vec<String>,
-}
-
-impl FromSqlite {
-    pub fn new() -> FromSqlite {
-        FromSqlite {
-            state: vec![],
-            name_tag: Tag::unknown(),
-            tables: vec![],
-        }
-    }
-}
-
-pub fn convert_sqlite_file_to_nu_value(
-    path: &Path,
-    tag: impl Into<Tag> + Clone,
-    tables: Vec<String>,
-) -> Result<Value, rusqlite::Error> {
-    let conn = Connection::open(path)?;
-
-    let mut meta_out = Vec::new();
-    let mut meta_stmt = conn.prepare("select name from sqlite_master where type='table'")?;
-    let mut meta_rows = meta_stmt.query([])?;
-
-    while let Some(meta_row) = meta_rows.next()? {
-        let table_name: String = meta_row.get(0)?;
-        if tables.is_empty() || tables.contains(&table_name) {
-            let mut meta_dict = TaggedDictBuilder::new(tag.clone());
-            let mut out = Vec::new();
-            let mut table_stmt = conn.prepare(&format!("select * from [{}]", table_name))?;
-            let mut table_rows = table_stmt.query([])?;
-            while let Some(table_row) = table_rows.next()? {
-                out.push(convert_sqlite_row_to_nu_value(table_row, tag.clone()))
-            }
-            meta_dict.insert_value(
-                "table_name".to_string(),
-                UntaggedValue::Primitive(Primitive::String(table_name)).into_value(tag.clone()),
-            );
-            meta_dict.insert_value(
-                "table_values",
-                UntaggedValue::Table(out).into_value(tag.clone()),
-            );
-            meta_out.push(meta_dict.into_value());
-        }
-    }
-    let tag = tag.into();
-    Ok(UntaggedValue::Table(meta_out).into_value(tag))
-}
-
-fn convert_sqlite_row_to_nu_value(row: &Row, tag: impl Into<Tag> + Clone) -> Value {
-    let mut collected = TaggedDictBuilder::new(tag.clone());
-    for (i, c) in row.as_ref().column_names().iter().enumerate() {
-        collected.insert_value(
-            c.to_string(),
-            convert_sqlite_value_to_nu_value(row.get_ref_unwrap(i), tag.clone()),
-        );
-    }
-    collected.into_value()
-}
-
-fn convert_sqlite_value_to_nu_value(value: ValueRef, tag: impl Into<Tag> + Clone) -> Value {
-    match value {
-        ValueRef::Null => {
-            UntaggedValue::Primitive(Primitive::String(String::from(""))).into_value(tag)
-        }
-        ValueRef::Integer(i) => UntaggedValue::int(i).into_value(tag),
-        ValueRef::Real(f) => {
-            let f = bigdecimal::BigDecimal::from_f64(f);
-            let tag = tag.into();
-            let span = tag.span;
-            match f {
-                Some(d) => UntaggedValue::decimal(d).into_value(tag),
-                None => UntaggedValue::Error(ShellError::labeled_error(
-                    "Can not convert f64 to big decimal",
-                    "can not convert to decimal",
-                    span,
-                ))
-                .into_value(tag),
-            }
-        }
-        ValueRef::Text(s) => {
-            // this unwrap is safe because we know the ValueRef is Text.
-            UntaggedValue::Primitive(Primitive::String(String::from_utf8_lossy(s).to_string()))
-                .into_value(tag)
-        }
-        ValueRef::Blob(u) => UntaggedValue::binary(u.to_owned()).into_value(tag),
-    }
-}
-
-pub fn from_sqlite_bytes_to_value(
-    mut bytes: Vec<u8>,
-    tag: impl Into<Tag> + Clone,
-    tables: Vec<String>,
-) -> Result<Value, std::io::Error> {
-    // FIXME: should probably write a sqlite virtual filesystem
-    // that will allow us to use bytes as a file to avoid this
-    // write out, but this will require C code. Might be
-    // best done as a PR to rusqlite.
-    let mut tempfile = tempfile::NamedTempFile::new()?;
-    tempfile.write_all(bytes.as_mut_slice())?;
-    match convert_sqlite_file_to_nu_value(tempfile.path(), tag, tables) {
-        Ok(value) => Ok(value),
-        Err(e) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
-    }
-}
-
-pub fn from_sqlite(
-    bytes: Vec<u8>,
-    name_tag: Tag,
-    tables: Vec<String>,
-) -> Result<Vec<ReturnValue>, ShellError> {
-    match from_sqlite_bytes_to_value(bytes, name_tag.clone(), tables) {
-        Ok(x) => match x {
-            Value {
-                value: UntaggedValue::Table(list),
-                ..
-            } => Ok(list.into_iter().map(ReturnSuccess::value).collect()),
-            _ => Ok(vec![ReturnSuccess::value(x)]),
-        },
-        Err(_) => Err(ShellError::labeled_error(
-            "Could not parse as SQLite",
-            "input cannot be parsed as SQLite",
-            &name_tag,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/src/lib.rs b/old_nushell/crates/nu_plugin_from_sqlite/src/lib.rs
deleted file mode 100644
index 62e49fb46..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod from_sqlite;
-mod nu;
-
-pub use from_sqlite::FromSqlite;
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/src/main.rs b/old_nushell/crates/nu_plugin_from_sqlite/src/main.rs
deleted file mode 100644
index 26147638a..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_sqlite::FromSqlite;
-
-fn main() {
-    serve_plugin(&mut FromSqlite::new())
-}
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/src/nu/mod.rs b/old_nushell/crates/nu_plugin_from_sqlite/src/nu/mod.rs
deleted file mode 100644
index f39463386..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/src/nu/mod.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::FromSqlite;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Primitive, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value};
-use nu_source::Tag;
-
-// Adapted from crates/nu-command/src/commands/dataframe/utils.rs
-fn convert_columns(columns: &[Value]) -> Result<Vec<String>, ShellError> {
-    let res = columns
-        .iter()
-        .map(|value| match &value.value {
-            UntaggedValue::Primitive(Primitive::String(s)) => Ok(s.clone()),
-            _ => Err(ShellError::labeled_error(
-                "Incorrect column format",
-                "Only string as column name",
-                &value.tag,
-            )),
-        })
-        .collect::<Result<Vec<String>, _>>()?;
-
-    Ok(res)
-}
-
-impl Plugin for FromSqlite {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("from sqlite")
-            .named(
-                "tables",
-                SyntaxShape::Table,
-                "Only convert specified tables",
-                Some('t'),
-            )
-            .desc("Convert from sqlite binary into table")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        self.name_tag = call_info.name_tag;
-
-        if let Some(t) = call_info.args.get("tables") {
-            if let UntaggedValue::Table(columns) = t.value.clone() {
-                self.tables = convert_columns(columns.as_slice())?;
-            }
-        }
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::Binary(b)),
-                ..
-            } => {
-                self.state.extend_from_slice(&b);
-            }
-            Value { tag, .. } => {
-                return Err(ShellError::labeled_error_with_secondary(
-                    "Expected binary from pipeline",
-                    "requires binary input",
-                    self.name_tag.clone(),
-                    "value originates from here",
-                    tag,
-                ));
-            }
-        }
-        Ok(vec![])
-    }
-
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        crate::from_sqlite::from_sqlite(self.state.clone(), Tag::unknown(), self.tables.clone())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_from_sqlite/src/nu/tests.rs b/old_nushell/crates/nu_plugin_from_sqlite/src/nu/tests.rs
deleted file mode 100644
index d14c19bee..000000000
--- a/old_nushell/crates/nu_plugin_from_sqlite/src/nu/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration {}
diff --git a/old_nushell/crates/nu_plugin_inc/Cargo.toml b/old_nushell/crates/nu_plugin_inc/Cargo.toml
deleted file mode 100644
index 7f4c05dec..000000000
--- a/old_nushell/crates/nu_plugin_inc/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A version incrementer plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_inc"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-nu-test-support = { path="../nu-test-support", version = "0.43.0" }
-nu-value-ext = { path="../nu-value-ext", version = "0.43.0" }
-
-semver = "0.11.0"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_inc/src/inc.rs b/old_nushell/crates/nu_plugin_inc/src/inc.rs
deleted file mode 100644
index 0b6f322fa..000000000
--- a/old_nushell/crates/nu_plugin_inc/src/inc.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{did_you_mean, ColumnPath, Primitive, ShellTypeName, UntaggedValue, Value};
-use nu_source::{span_for_spanned_list, HasSpan, SpannedItem, Tagged};
-use nu_value_ext::{get_data_by_column_path, ValueExt};
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum Action {
-    SemVerAction(SemVerAction),
-    Default,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum SemVerAction {
-    Major,
-    Minor,
-    Patch,
-}
-
-#[derive(Default)]
-pub struct Inc {
-    pub field: Option<Tagged<ColumnPath>>,
-    pub error: Option<String>,
-    pub action: Option<Action>,
-}
-
-impl Inc {
-    pub fn new() -> Self {
-        Default::default()
-    }
-
-    fn apply(&self, input: &str) -> UntaggedValue {
-        match &self.action {
-            Some(Action::SemVerAction(act_on)) => {
-                let mut ver = match semver::Version::parse(input) {
-                    Ok(parsed_ver) => parsed_ver,
-                    Err(_) => return UntaggedValue::string(input.to_string()),
-                };
-
-                match act_on {
-                    SemVerAction::Major => ver.increment_major(),
-                    SemVerAction::Minor => ver.increment_minor(),
-                    SemVerAction::Patch => ver.increment_patch(),
-                }
-
-                UntaggedValue::string(ver.to_string())
-            }
-            Some(Action::Default) | None => match input.parse::<u64>() {
-                Ok(v) => UntaggedValue::string((v + 1).to_string()),
-                Err(_) => UntaggedValue::string(input),
-            },
-        }
-    }
-
-    pub fn for_semver(&mut self, part: SemVerAction) {
-        if self.permit() {
-            self.action = Some(Action::SemVerAction(part));
-        } else {
-            self.log_error("can only apply one");
-        }
-    }
-
-    fn permit(&mut self) -> bool {
-        self.action.is_none()
-    }
-
-    fn log_error(&mut self, message: &str) {
-        self.error = Some(message.to_string());
-    }
-
-    pub fn usage() -> &'static str {
-        "Usage: inc field [--major|--minor|--patch]"
-    }
-
-    pub fn inc(&self, value: Value) -> Result<Value, ShellError> {
-        match &value.value {
-            UntaggedValue::Primitive(Primitive::Int(i)) => {
-                Ok(UntaggedValue::int(i + 1).into_value(value.tag()))
-            }
-            UntaggedValue::Primitive(Primitive::Filesize(b)) => {
-                Ok(UntaggedValue::filesize(b + 1_u64).into_value(value.tag()))
-            }
-            UntaggedValue::Primitive(Primitive::String(ref s)) => {
-                Ok(self.apply(s).into_value(value.tag()))
-            }
-            UntaggedValue::Table(values) => {
-                if values.len() == 1 {
-                    Ok(UntaggedValue::Table(vec![self.inc(values[0].clone())?])
-                        .into_value(value.tag()))
-                } else {
-                    Err(ShellError::type_error(
-                        "incrementable value",
-                        value.type_name().spanned(value.span()),
-                    ))
-                }
-            }
-
-            UntaggedValue::Row(_) => match self.field {
-                Some(ref f) => {
-                    let fields = f.clone();
-
-                    let replace_for = get_data_by_column_path(
-                        &value,
-                        f,
-                        move |obj_source, column_path_tried, _| match did_you_mean(
-                            obj_source,
-                            column_path_tried.as_string(),
-                        ) {
-                            Some(suggestions) => ShellError::labeled_error(
-                                "Unknown column",
-                                format!("did you mean '{}'?", suggestions[0]),
-                                span_for_spanned_list(fields.iter().map(|p| p.span)),
-                            ),
-                            None => ShellError::labeled_error(
-                                "Unknown column",
-                                "row does not contain this column",
-                                span_for_spanned_list(fields.iter().map(|p| p.span)),
-                            ),
-                        },
-                    );
-
-                    let got = replace_for?;
-                    let replacement = self.inc(got)?;
-
-                    value
-                        .replace_data_at_column_path(f, replacement.value.into_untagged_value())
-                        .ok_or_else(|| {
-                            ShellError::labeled_error(
-                                "inc could not find field to replace",
-                                "column name",
-                                value.tag(),
-                            )
-                        })
-                }
-                None => Err(ShellError::untagged_runtime_error(
-                    "inc needs a field when incrementing a column in a table",
-                )),
-            },
-            _ => Err(ShellError::type_error(
-                "incrementable value",
-                value.type_name().spanned(value.span()),
-            )),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    mod semver {
-        use crate::inc::SemVerAction;
-        use crate::Inc;
-        use nu_test_support::value::string;
-
-        #[test]
-        fn major() {
-            let mut inc = Inc::new();
-            inc.for_semver(SemVerAction::Major);
-            assert_eq!(inc.apply("0.1.3"), string("1.0.0").value);
-        }
-
-        #[test]
-        fn minor() {
-            let mut inc = Inc::new();
-            inc.for_semver(SemVerAction::Minor);
-            assert_eq!(inc.apply("0.1.3"), string("0.2.0").value);
-        }
-
-        #[test]
-        fn patch() {
-            let mut inc = Inc::new();
-            inc.for_semver(SemVerAction::Patch);
-            assert_eq!(inc.apply("0.1.3"), string("0.1.4").value);
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_inc/src/lib.rs b/old_nushell/crates/nu_plugin_inc/src/lib.rs
deleted file mode 100644
index 9167c0be4..000000000
--- a/old_nushell/crates/nu_plugin_inc/src/lib.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-mod inc;
-mod nu;
-
-pub use inc::Inc;
-
-#[cfg(test)]
-mod tests {
-    use super::Inc;
-    use crate::inc::Action;
-    use nu_protocol::Value;
-    use nu_value_ext::ValueExt;
-
-    impl Inc {
-        pub fn expect_action(&self, action: Action) {
-            match &self.action {
-                Some(set) if set == &action => {}
-                Some(_) => panic!("\nUnexpected action"),
-                None => panic!("\nAction not found."),
-            }
-        }
-
-        pub fn expect_field(&self, field: Value) {
-            let field = match field.as_column_path() {
-                Ok(column_path) => column_path,
-                Err(_) => panic!("\nExpected a ColumnPath",),
-            };
-
-            match &self.field {
-                Some(column_path) if column_path == &field => {}
-                Some(_) => panic!("\nUnexpected field."),
-                None => panic!("\nField not found."),
-            }
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_inc/src/main.rs b/old_nushell/crates/nu_plugin_inc/src/main.rs
deleted file mode 100644
index 7245f1fbc..000000000
--- a/old_nushell/crates/nu_plugin_inc/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_inc::Inc;
-
-fn main() {
-    serve_plugin(&mut Inc::new())
-}
diff --git a/old_nushell/crates/nu_plugin_inc/src/nu/mod.rs b/old_nushell/crates/nu_plugin_inc/src/nu/mod.rs
deleted file mode 100644
index b7c48fbd5..000000000
--- a/old_nushell/crates/nu_plugin_inc/src/nu/mod.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::inc::{Action, SemVerAction};
-use crate::Inc;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{
-    CallInfo, Primitive, ReturnSuccess, ReturnValue, ShellTypeName, Signature, SyntaxShape,
-    UntaggedValue, Value,
-};
-use nu_source::{HasSpan, SpannedItem};
-use nu_value_ext::ValueExt;
-
-impl Plugin for Inc {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("inc")
-            .desc("Increment a value or version. Optionally use the column of a table.")
-            .switch(
-                "major",
-                "increment the major version (eg 1.2.1 -> 2.0.0)",
-                Some('M'),
-            )
-            .switch(
-                "minor",
-                "increment the minor version (eg 1.2.1 -> 1.3.0)",
-                Some('m'),
-            )
-            .switch(
-                "patch",
-                "increment the patch version (eg 1.2.1 -> 1.2.2)",
-                Some('p'),
-            )
-            .rest("rest", SyntaxShape::ColumnPath, "the column(s) to update")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        if call_info.args.has("major") {
-            self.for_semver(SemVerAction::Major);
-        }
-        if call_info.args.has("minor") {
-            self.for_semver(SemVerAction::Minor);
-        }
-        if call_info.args.has("patch") {
-            self.for_semver(SemVerAction::Patch);
-        }
-
-        if let Some(args) = call_info.args.positional {
-            for arg in args {
-                match arg {
-                    table @ Value {
-                        value: UntaggedValue::Primitive(Primitive::ColumnPath(_)),
-                        ..
-                    } => {
-                        self.field = Some(table.as_column_path()?);
-                    }
-                    value => {
-                        return Err(ShellError::type_error(
-                            "table",
-                            value.type_name().spanned(value.span()),
-                        ))
-                    }
-                }
-            }
-        }
-
-        if self.action.is_none() {
-            self.action = Some(Action::Default);
-        }
-
-        match &self.error {
-            Some(reason) => Err(ShellError::untagged_runtime_error(format!(
-                "{}: {}",
-                reason,
-                Inc::usage()
-            ))),
-            None => Ok(vec![]),
-        }
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        Ok(vec![ReturnSuccess::value(self.inc(input)?)])
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_inc/src/nu/tests.rs b/old_nushell/crates/nu_plugin_inc/src/nu/tests.rs
deleted file mode 100644
index e97a8941d..000000000
--- a/old_nushell/crates/nu_plugin_inc/src/nu/tests.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-mod integration {
-    use crate::inc::{Action, SemVerAction};
-    use crate::Inc;
-    use nu_errors::ShellError;
-    use nu_plugin::test_helpers::{plugin, CallStub};
-    use nu_protocol::{Primitive, UntaggedValue};
-    use nu_test_support::value::column_path;
-    use nu_value_ext::ValueExt;
-
-    #[test]
-    fn picks_up_one_action_flag_only() {
-        plugin(&mut Inc::new())
-            .args(
-                CallStub::new()
-                    .with_long_flag("major")
-                    .with_long_flag("minor")
-                    .create(),
-            )
-            .setup(|plugin, returned_values| {
-                let actual = returned_values.unwrap_err().to_string();
-
-                assert!(actual.contains("can only apply one"));
-                assert_eq!(plugin.error, Some("can only apply one".to_string()));
-            });
-    }
-
-    #[test]
-    fn picks_up_major_flag() {
-        plugin(&mut Inc::new())
-            .args(CallStub::new().with_long_flag("major").create())
-            .setup(|plugin, _| {
-                let sem_version_part = SemVerAction::Major;
-                plugin.expect_action(Action::SemVerAction(sem_version_part))
-            });
-    }
-
-    #[test]
-    fn picks_up_minor_flag() {
-        plugin(&mut Inc::new())
-            .args(CallStub::new().with_long_flag("minor").create())
-            .setup(|plugin, _| {
-                let sem_version_part = SemVerAction::Minor;
-                plugin.expect_action(Action::SemVerAction(sem_version_part))
-            });
-    }
-
-    #[test]
-    fn picks_up_patch_flag() {
-        plugin(&mut Inc::new())
-            .args(CallStub::new().with_long_flag("patch").create())
-            .setup(|plugin, _| {
-                let sem_version_part = SemVerAction::Patch;
-                plugin.expect_action(Action::SemVerAction(sem_version_part))
-            });
-    }
-
-    #[test]
-    fn picks_up_argument_for_field() -> Result<(), ShellError> {
-        plugin(&mut Inc::new())
-            .args(CallStub::new().with_parameter("package.version")?.create())
-            .setup(|plugin, _| {
-                //FIXME: this will need to be updated
-                if let Ok(column_path) = column_path("package.version").as_column_path() {
-                    let column_path =
-                        UntaggedValue::Primitive(Primitive::ColumnPath(column_path.item))
-                            .into_value(column_path.tag);
-                    plugin.expect_field(column_path)
-                }
-            });
-        Ok(())
-    }
-    mod sem_ver {
-        use crate::Inc;
-        use nu_errors::ShellError;
-        use nu_plugin::test_helpers::{expect_return_value_at, plugin, CallStub};
-        use nu_protocol::TaggedDictBuilder;
-        use nu_source::Tag;
-        use nu_test_support::value::string;
-        use nu_value_ext::get_data;
-
-        fn cargo_sample_record(with_version: &str) -> nu_protocol::Value {
-            TaggedDictBuilder::build(Tag::unknown(), |row| {
-                row.insert_value("version".to_string(), string(with_version));
-            })
-        }
-
-        #[test]
-        fn major_input_using_the_field_passed_as_parameter() -> Result<(), ShellError> {
-            let run = plugin(&mut Inc::new())
-                .args(
-                    CallStub::new()
-                        .with_long_flag("major")
-                        .with_parameter("version")?
-                        .create(),
-                )
-                .input(cargo_sample_record("0.1.3"))
-                .setup(|_, _| {})
-                .test();
-
-            let actual = expect_return_value_at(run, 0);
-
-            assert_eq!(get_data(&actual, "version").borrow(), &string("1.0.0"));
-            Ok(())
-        }
-
-        #[test]
-        fn minor_input_using_the_field_passed_as_parameter() -> Result<(), ShellError> {
-            let run = plugin(&mut Inc::new())
-                .args(
-                    CallStub::new()
-                        .with_long_flag("minor")
-                        .with_parameter("version")?
-                        .create(),
-                )
-                .input(cargo_sample_record("0.1.3"))
-                .setup(|_, _| {})
-                .test();
-
-            let actual = expect_return_value_at(run, 0);
-
-            assert_eq!(get_data(&actual, "version").borrow(), &string("0.2.0"));
-            Ok(())
-        }
-
-        #[test]
-        fn patch_input_using_the_field_passed_as_parameter() -> Result<(), ShellError> {
-            let run = plugin(&mut Inc::new())
-                .args(
-                    CallStub::new()
-                        .with_long_flag("patch")
-                        .with_parameter("version")?
-                        .create(),
-                )
-                .input(cargo_sample_record("0.1.3"))
-                .setup(|_, _| {})
-                .test();
-
-            let actual = expect_return_value_at(run, 0);
-
-            assert_eq!(get_data(&actual, "version").borrow(), &string("0.1.4"));
-            Ok(())
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_match/Cargo.toml b/old_nushell/crates/nu_plugin_match/Cargo.toml
deleted file mode 100644
index dae6081ce..000000000
--- a/old_nushell/crates/nu_plugin_match/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A regex match plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_match"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-regex = "1.4.3"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_match/src/lib.rs b/old_nushell/crates/nu_plugin_match/src/lib.rs
deleted file mode 100644
index 8def36349..000000000
--- a/old_nushell/crates/nu_plugin_match/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod match_;
-mod nu;
-
-pub use match_::Match;
diff --git a/old_nushell/crates/nu_plugin_match/src/main.rs b/old_nushell/crates/nu_plugin_match/src/main.rs
deleted file mode 100644
index 2023f3963..000000000
--- a/old_nushell/crates/nu_plugin_match/src/main.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_match::Match;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    serve_plugin(&mut Match::new()?);
-    Ok(())
-}
diff --git a/old_nushell/crates/nu_plugin_match/src/match_.rs b/old_nushell/crates/nu_plugin_match/src/match_.rs
deleted file mode 100644
index b90c5e2dc..000000000
--- a/old_nushell/crates/nu_plugin_match/src/match_.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use regex::Regex;
-
-pub struct Match {
-    pub column: String,
-    pub regex: Regex,
-    pub invert: bool,
-}
-
-impl Match {
-    #[allow(clippy::trivial_regex)]
-    pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
-        Ok(Match {
-            column: String::new(),
-            regex: Regex::new("")?,
-            invert: false,
-        })
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_match/src/nu/mod.rs b/old_nushell/crates/nu_plugin_match/src/nu/mod.rs
deleted file mode 100644
index 5bf7abaad..000000000
--- a/old_nushell/crates/nu_plugin_match/src/nu/mod.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{
-    CallInfo, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value,
-};
-
-use crate::Match;
-use regex::Regex;
-
-impl Plugin for Match {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("match")
-            .desc("Filter rows by Regex pattern.")
-            .required("member", SyntaxShape::String, "the column name to match")
-            .required("regex", SyntaxShape::String, "the regex to match with")
-            .switch("insensitive", "case-insensitive search", Some('i'))
-            .switch(
-                "multiline",
-                "multi-line mode: ^ and $ match begin/end of line",
-                Some('m'),
-            )
-            .switch(
-                "dotall",
-                "dotall mode: allow a dot . to match newline character \\n",
-                Some('s'),
-            )
-            .switch("invert", "invert the match", Some('v'))
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        let insensitive = call_info.args.has("insensitive");
-        let multiline = call_info.args.has("multiline");
-        let dotall = call_info.args.has("dotall");
-        self.invert = call_info.args.has("invert");
-        if let Some(args) = call_info.args.positional {
-            match &args[0] {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    ..
-                } => {
-                    self.column = s.clone();
-                }
-                Value { tag, .. } => {
-                    return Err(ShellError::labeled_error(
-                        "Unrecognized type in params",
-                        "value",
-                        tag,
-                    ));
-                }
-            }
-            let flags = match (insensitive, multiline, dotall) {
-                (false, false, false) => "",
-                (true, false, false) => "(?i)",
-                (false, true, false) => "(?m)",
-                (false, false, true) => "(?s)",
-                (true, true, false) => "(?im)",
-                (true, false, true) => "(?is)",
-                (false, true, true) => "(?ms)",
-                (true, true, true) => "(?ims)",
-            }
-            .to_owned();
-            match &args[1] {
-                Value {
-                    value: UntaggedValue::Primitive(Primitive::String(s)),
-                    tag,
-                } => {
-                    self.regex = Regex::new(&(flags + s)).map_err(|_| {
-                        ShellError::labeled_error(
-                            "Internal error while creating regex",
-                            "internal error created by pattern",
-                            tag,
-                        )
-                    })?;
-                }
-                Value { tag, .. } => {
-                    return Err(ShellError::labeled_error(
-                        "Unrecognized type in params",
-                        "unexpected value",
-                        tag,
-                    ));
-                }
-            }
-        }
-
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        let flag: bool;
-        match &input {
-            Value {
-                value: UntaggedValue::Row(dict),
-                tag,
-            } => {
-                if let Some(val) = dict.entries.get(&self.column) {
-                    if let Ok(s) = val.as_string() {
-                        flag = self.regex.is_match(&s);
-                    } else {
-                        return Err(ShellError::labeled_error(
-                            "expected string",
-                            "value",
-                            val.tag(),
-                        ));
-                    }
-                } else {
-                    return Err(ShellError::labeled_error(
-                        format!("column not in row! {:?} {:?}", &self.column, dict),
-                        "row",
-                        tag,
-                    ));
-                }
-            }
-            Value { tag, .. } => {
-                return Err(ShellError::labeled_error("Expected row", "value", tag));
-            }
-        }
-        if flag ^ self.invert {
-            Ok(vec![Ok(ReturnSuccess::Value(input))])
-        } else {
-            Ok(vec![])
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_query_json/Cargo.toml b/old_nushell/crates/nu_plugin_query_json/Cargo.toml
deleted file mode 100644
index dfb7c0bcf..000000000
--- a/old_nushell/crates/nu_plugin_query_json/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "query json files with gjson"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_query_json"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-gjson = "0.8.0"
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-plugin = { version = "0.43.0", path="../nu-plugin" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
diff --git a/old_nushell/crates/nu_plugin_query_json/src/lib.rs b/old_nushell/crates/nu_plugin_query_json/src/lib.rs
deleted file mode 100644
index 3e18566ba..000000000
--- a/old_nushell/crates/nu_plugin_query_json/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod query_json;
-
-pub use query_json::QueryJson;
diff --git a/old_nushell/crates/nu_plugin_query_json/src/main.rs b/old_nushell/crates/nu_plugin_query_json/src/main.rs
deleted file mode 100644
index 19fecc26b..000000000
--- a/old_nushell/crates/nu_plugin_query_json/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_query_json::QueryJson;
-
-fn main() {
-    serve_plugin(&mut QueryJson::new());
-}
diff --git a/old_nushell/crates/nu_plugin_query_json/src/nu/mod.rs b/old_nushell/crates/nu_plugin_query_json/src/nu/mod.rs
deleted file mode 100644
index d92d372d2..000000000
--- a/old_nushell/crates/nu_plugin_query_json/src/nu/mod.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{
-    CallInfo, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::TaggedItem;
-
-use crate::{query_json::begin_json_query, QueryJson};
-
-impl Plugin for QueryJson {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("query json")
-            .desc("execute json query on json file (open --raw <file> | query json 'query string')\nsee https://gjson.dev/ for more info.")
-            .required("query", SyntaxShape::String, "json query")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        let tag = call_info.name_tag;
-        let query = call_info.args.nth(0).ok_or_else(|| {
-            ShellError::labeled_error("json query not passed", "json query not passed", &tag)
-        })?;
-
-        self.query = query.as_string()?;
-        self.tag = tag;
-
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => match begin_json_query(s, (*self.query).tagged(&self.tag)) {
-                Ok(result) => Ok(result.into_iter().map(ReturnSuccess::value).collect()),
-                Err(err) => Err(err),
-            },
-            Value { tag, .. } => Err(ShellError::labeled_error_with_secondary(
-                "Expected text from pipeline",
-                "requires text input",
-                &self.tag,
-                "value originates from here",
-                tag,
-            )),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_query_json/src/query_json.rs b/old_nushell/crates/nu_plugin_query_json/src/query_json.rs
deleted file mode 100644
index 9b58b8fc1..000000000
--- a/old_nushell/crates/nu_plugin_query_json/src/query_json.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-use gjson::Value as gjValue;
-use nu_errors::ShellError;
-use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::{Tag, Tagged};
-
-pub struct QueryJson {
-    pub query: String,
-    pub tag: Tag,
-}
-
-impl QueryJson {
-    pub fn new() -> QueryJson {
-        QueryJson {
-            query: String::new(),
-            tag: Tag::unknown(),
-        }
-    }
-}
-
-impl Default for QueryJson {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub fn begin_json_query(input: String, query: Tagged<&str>) -> Result<Vec<Value>, ShellError> {
-    execute_json_query(input, query.item.to_string(), query.tag())
-}
-
-fn execute_json_query(
-    input_string: String,
-    query_string: String,
-    tag: impl Into<Tag>,
-) -> Result<Vec<Value>, ShellError> {
-    let tag = tag.into();
-
-    // Validate the json before trying to query it
-    let is_valid_json = gjson::valid(&input_string);
-    if !is_valid_json {
-        return Err(ShellError::labeled_error(
-            "invalid json",
-            "invalid json",
-            tag,
-        ));
-    }
-
-    let mut ret: Vec<Value> = vec![];
-    let val: gjValue = gjson::get(&input_string, &query_string);
-
-    if query_contains_modifiers(&query_string) {
-        let json_str = val.json();
-        let json_val = Value::from(json_str);
-        ret.push(json_val);
-    } else {
-        let gjv = convert_gjson_value_to_nu_value(&val, &tag);
-
-        match gjv.value {
-            UntaggedValue::Primitive(_) => ret.push(gjv),
-            UntaggedValue::Row(_) => ret.push(gjv),
-            UntaggedValue::Table(t) => {
-                // Unravel the table so it's not a table inside of a table in the output
-                for v in &t {
-                    let c = v.clone();
-                    ret.push(c)
-                }
-            }
-            _ => (),
-        }
-    }
-
-    Ok(ret)
-}
-fn query_contains_modifiers(query: &str) -> bool {
-    // https://github.com/tidwall/gjson.rs documents 7 modifiers as of 4/19/21
-    // Some of these modifiers mean we really need to output the data as a string
-    // instead of tabular data. Others don't matter.
-
-    // Output as String
-    // @ugly: Remove all whitespace from a json document.
-    // @pretty: Make the json document more human readable.
-    query.contains("@ugly") || query.contains("@pretty")
-
-    // Output as Tablular
-    // Since it's output as tabular, which is our default, we can just ignore these
-    // @reverse: Reverse an array or the members of an object.
-    // @this: Returns the current element. It can be used to retrieve the root element.
-    // @valid: Ensure the json document is valid.
-    // @flatten: Flattens an array.
-    // @join: Joins multiple objects into a single object.
-}
-
-fn convert_gjson_value_to_nu_value(v: &gjValue, tag: impl Into<Tag>) -> Value {
-    let tag = tag.into();
-    let span = tag.span;
-
-    match v.kind() {
-        gjson::Kind::Array => {
-            let mut values = vec![];
-            v.each(|_k, v| {
-                values.push(convert_gjson_value_to_nu_value(&v, &tag));
-                true
-            });
-
-            UntaggedValue::Table(values).into_value(&tag)
-        }
-        gjson::Kind::Null => UntaggedValue::nothing().into_value(&tag),
-        gjson::Kind::False => UntaggedValue::boolean(false).into_value(&tag),
-        gjson::Kind::Number => {
-            let str_value = v.str();
-            if str_value.contains('.') {
-                UntaggedValue::decimal_from_float(v.f64(), span).into_value(&tag)
-            } else {
-                UntaggedValue::int(v.i64()).into_value(&tag)
-            }
-        }
-        gjson::Kind::String => UntaggedValue::string(v.str()).into_value(&tag),
-        gjson::Kind::True => UntaggedValue::boolean(true).into_value(&tag),
-        // I'm not sure how to test this, so it may not work
-        gjson::Kind::Object => {
-            // eprint!("Object: ");
-            let mut collected = TaggedDictBuilder::new(&tag);
-            v.each(|k, v| {
-                // eprintln!("k:{} v:{}", k.str(), v.str());
-                collected.insert_value(k.str(), convert_gjson_value_to_nu_value(&v, &tag));
-                true
-            });
-            collected.into_value()
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gjson::{valid, Value as gjValue};
-
-    #[test]
-    fn validate_string() {
-        let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
-        let val = valid(json);
-        assert!(val);
-    }
-
-    #[test]
-    fn answer_from_get_age() {
-        let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
-        let val: gjValue = gjson::get(json, "age");
-        assert_eq!(val.str(), "37");
-    }
-
-    #[test]
-    fn answer_from_get_children() {
-        let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
-        let val: gjValue = gjson::get(json, "children");
-        assert_eq!(val.str(), r#"["Sara", "Alex", "Jack"]"#);
-    }
-
-    #[test]
-    fn answer_from_get_children_count() {
-        let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
-        let val: gjValue = gjson::get(json, "children.#");
-        assert_eq!(val.str(), "3");
-    }
-
-    #[test]
-    fn answer_from_get_friends_first_name() {
-        let json = r#"{ "name": { "first": "Tom", "last": "Anderson" }, "age": 37, "children": ["Sara", "Alex", "Jack"], "friends": [ { "first": "James", "last": "Murphy" }, { "first": "Roger", "last": "Craig" } ] }"#;
-        let val: gjValue = gjson::get(json, "friends.#.first");
-        assert_eq!(val.str(), r#"["James","Roger"]"#);
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_s3/Cargo.toml b/old_nushell/crates/nu_plugin_s3/Cargo.toml
deleted file mode 100644
index e2ff921d5..000000000
--- a/old_nushell/crates/nu_plugin_s3/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "An S3 plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_s3"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-futures = { version="0.3.12", features=["compat", "io-compat"] }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-s3handler = "0.7.5"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_s3/README.md b/old_nushell/crates/nu_plugin_s3/README.md
deleted file mode 100644
index 60ffb3320..000000000
--- a/old_nushell/crates/nu_plugin_s3/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Nu Plugin S3
----
-
-An S3 plugin for nu shell, it can load the content of S3 objects and convert into table
-
-#### Snapshot
-In following example, the return content from httpbin is saved before as an object in AWS S3.
-![snapshot](https://raw.githubusercontent.com/yanganto/nu_plugin_s3/master/demo.png)
-
diff --git a/old_nushell/crates/nu_plugin_s3/demo.png b/old_nushell/crates/nu_plugin_s3/demo.png
deleted file mode 100644
index 8fd2a4162..000000000
Binary files a/old_nushell/crates/nu_plugin_s3/demo.png and /dev/null differ
diff --git a/old_nushell/crates/nu_plugin_s3/src/handler.rs b/old_nushell/crates/nu_plugin_s3/src/handler.rs
deleted file mode 100644
index 4cdcf6881..000000000
--- a/old_nushell/crates/nu_plugin_s3/src/handler.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{CallInfo, CommandAction, ReturnSuccess, ReturnValue, UntaggedValue, Value};
-use nu_source::{AnchorLocation, Tag};
-use s3handler::{CredentialConfig, Handler as S3Handler};
-
-pub struct Handler {
-    pub resource: Option<Value>,
-    pub tag: Tag,
-    pub has_raw: bool,
-    pub config: CredentialConfig,
-}
-
-impl Handler {
-    pub fn new() -> Handler {
-        Handler {
-            tag: Tag::unknown(),
-            config: CredentialConfig {
-                host: String::new(),
-                access_key: String::new(),
-                secret_key: String::new(),
-                user: None,
-                region: None,
-                s3_type: None,
-                secure: None,
-            },
-            resource: None,
-            has_raw: false,
-        }
-    }
-
-    pub fn setup(&mut self, call_info: CallInfo) -> ReturnValue {
-        self.resource = {
-            let r = call_info.args.nth(0).ok_or_else(|| {
-                ShellError::labeled_error(
-                    "No obj or directory specified",
-                    "for command",
-                    &call_info.name_tag,
-                )
-            })?;
-            Some(r.clone())
-        };
-        self.tag = call_info.name_tag.clone();
-        self.has_raw = call_info.args.has("raw");
-
-        if let Some(e) = call_info.args.get("endpoint") {
-            self.config.host = e.as_string()?
-        } else {
-            return Err(ShellError::labeled_error(
-                "No endpoint provided",
-                "for command",
-                &call_info.name_tag,
-            ));
-        }
-
-        if let Some(access_key) = call_info.args.get("access_key") {
-            self.config.access_key = access_key.as_string()?
-        } else {
-            return Err(ShellError::labeled_error(
-                "No access key provided",
-                "for command",
-                &call_info.name_tag,
-            ));
-        }
-
-        if let Some(secret_key) = call_info.args.get("secret_key") {
-            self.config.secret_key = secret_key.as_string()?
-        } else {
-            return Err(ShellError::labeled_error(
-                "No secret key provided",
-                "for command",
-                &call_info.name_tag,
-            ));
-        }
-
-        if let Some(region) = call_info.args.get("region") {
-            self.config.region = Some(region.as_string()?)
-        }
-
-        ReturnSuccess::value(UntaggedValue::nothing().into_untagged_value())
-    }
-}
-
-impl Default for Handler {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub async fn s3_helper(resource: &Value, has_raw: bool, config: &CredentialConfig) -> ReturnValue {
-    let resource_str = resource.as_string()?;
-    let mut handler = S3Handler::from(config);
-    let (output, content_type) = handler
-        .cat(&resource_str)
-        .map_err(|e| ShellError::unexpected(e.to_string()))?;
-
-    let extension = if has_raw {
-        None
-    } else {
-        fn get_accept_ext(s: String) -> Option<String> {
-            if s.contains("json") {
-                Some("json".to_string())
-            } else if s.contains("xml") {
-                Some("xml".to_string())
-            } else if s.contains("svg") {
-                Some("svg".to_string())
-            } else if s.contains("html") {
-                Some("html".to_string())
-            } else {
-                None
-            }
-        }
-        // If the extension could not provide when uploading,
-        // try to use the resource extension.
-        content_type.and_then(get_accept_ext).or_else(|| {
-            resource_str
-                .split('.')
-                .last()
-                .map(String::from)
-                .and_then(get_accept_ext)
-        })
-    };
-
-    if let Some(e) = extension {
-        Ok(ReturnSuccess::Action(CommandAction::AutoConvert(
-            UntaggedValue::string(output).into_value(Tag {
-                span: resource.tag.span,
-                anchor: Some(AnchorLocation::Url(resource_str)),
-            }),
-            e,
-        )))
-    } else {
-        ReturnSuccess::value(UntaggedValue::string(output))
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_s3/src/lib.rs b/old_nushell/crates/nu_plugin_s3/src/lib.rs
deleted file mode 100644
index c90621639..000000000
--- a/old_nushell/crates/nu_plugin_s3/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod handler;
-mod nu;
-
-pub use handler::Handler;
diff --git a/old_nushell/crates/nu_plugin_s3/src/main.rs b/old_nushell/crates/nu_plugin_s3/src/main.rs
deleted file mode 100644
index e3d0a5841..000000000
--- a/old_nushell/crates/nu_plugin_s3/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_s3::handler;
-
-fn main() {
-    serve_plugin(&mut handler::Handler::new())
-}
diff --git a/old_nushell/crates/nu_plugin_s3/src/nu/mod.rs b/old_nushell/crates/nu_plugin_s3/src/nu/mod.rs
deleted file mode 100644
index d93aadf79..000000000
--- a/old_nushell/crates/nu_plugin_s3/src/nu/mod.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use futures::executor::block_on;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, ReturnValue, Signature, SyntaxShape};
-
-use crate::handler;
-use crate::handler::s3_helper;
-
-impl Plugin for handler::Handler {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("s3")
-            .desc("Load S3 resource into a cell, convert to table if possible (avoid by appending '--raw' or '-R')")
-            .required(
-                "RESOURCE",
-                SyntaxShape::String,
-                "the RESOURCE to fetch the contents from",
-            )
-            .named(
-                "endpoint",
-                SyntaxShape::Any,
-                "the endpoint info for the S3 resource, i.g., s3.ap-northeast-1.amazonaws.com or 10.1.1.1",
-                Some('e'),
-            )
-            .named(
-                "access_key",
-                SyntaxShape::Any,
-                "the access key when authenticating",
-                Some('a'),
-            )
-            .named(
-                "secret_key",
-                SyntaxShape::Any,
-                "the secret key when authenticating",
-                Some('s'),
-            )
-            .named(
-                "region",
-                SyntaxShape::Any,
-                "the region of the resource, default will use us-east-1",
-                Some('r'),
-            )
-            .switch("raw", "fetch contents as text rather than a table", Some('R'))
-            .filter())
-    }
-
-    fn begin_filter(&mut self, callinfo: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        self.setup(callinfo)?;
-        Ok(vec![block_on(s3_helper(
-            &self.resource.clone().ok_or_else(|| {
-                ShellError::labeled_error(
-                    "internal error: resource not set",
-                    "resource not set",
-                    &self.tag,
-                )
-            })?,
-            self.has_raw,
-            &self.config,
-        ))])
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_selector/Cargo.toml b/old_nushell/crates/nu_plugin_selector/Cargo.toml
deleted file mode 100644
index 66b8e2367..000000000
--- a/old_nushell/crates/nu_plugin_selector/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "web scraping using css selector"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_selector"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-scraper = "0.12.0"
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-plugin = { version = "0.43.0", path="../nu-plugin" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-
-[dev-dependencies]
-indexmap = { version="1.7", features=["serde-1"] }
diff --git a/old_nushell/crates/nu_plugin_selector/src/lib.rs b/old_nushell/crates/nu_plugin_selector/src/lib.rs
deleted file mode 100644
index 79a9f7255..000000000
--- a/old_nushell/crates/nu_plugin_selector/src/lib.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-mod nu;
-mod selector;
-mod tables;
-
-pub use selector::Selector;
-pub use tables::Table;
diff --git a/old_nushell/crates/nu_plugin_selector/src/main.rs b/old_nushell/crates/nu_plugin_selector/src/main.rs
deleted file mode 100644
index 3e1832f42..000000000
--- a/old_nushell/crates/nu_plugin_selector/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_selector::Selector;
-
-fn main() {
-    serve_plugin(&mut Selector::new());
-}
diff --git a/old_nushell/crates/nu_plugin_selector/src/nu/mod.rs b/old_nushell/crates/nu_plugin_selector/src/nu/mod.rs
deleted file mode 100644
index 01e4714bd..000000000
--- a/old_nushell/crates/nu_plugin_selector/src/nu/mod.rs
+++ /dev/null
@@ -1,90 +0,0 @@
-use crate::{selector::begin_selector_query, Selector};
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{
-    CallInfo, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use scraper::Selector as ScraperSelector;
-
-impl Plugin for Selector {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("selector")
-            .desc("execute selector query on html/web")
-            .named("query", SyntaxShape::String, "selector query", Some('q'))
-            .switch("as_html", "return the query output as html", Some('m'))
-            .named(
-                "attribute",
-                SyntaxShape::String,
-                "downselect based on the given attribute",
-                Some('a'),
-            )
-            .named(
-                "as_table",
-                SyntaxShape::Table,
-                "find table based on column header list",
-                Some('t'),
-            )
-            .switch(
-                "inspect",
-                "run in inspect mode to provide more information for determining column headers",
-                Some('i'),
-            )
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        let tag = call_info.name_tag;
-        // let query = call_info.args.nth(0).ok_or_else(|| {
-        //     ShellError::labeled_error(
-        //         "selector query not passed",
-        //         "selector query not passed",
-        //         &tag,
-        //     )
-        // })?;
-
-        // self.query = query.as_string()?;
-        self.query = if let Some(qtext) = call_info.args.get("query") {
-            qtext.convert_to_string()
-        } else {
-            "".to_string()
-        };
-        self.tag = tag;
-        self.as_html = call_info.args.has("as_html");
-        if call_info.args.has("attribute") {
-            self.attribute = call_info.args.expect_get("attribute")?.convert_to_string();
-        }
-
-        if call_info.args.has("as_table") {
-            self.as_table = call_info.args.expect_get("as_table")?.clone();
-        }
-        self.inspect = call_info.args.has("inspect");
-
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        if !self.query.is_empty() && ScraperSelector::parse(&self.query).is_err() {
-            return Err(ShellError::labeled_error(
-                "Can not parse this query as a valid css selector",
-                "Parse error",
-                &self.tag,
-            ));
-        }
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => Ok(begin_selector_query(s, self)
-                .into_iter()
-                .map(ReturnSuccess::value)
-                .collect()),
-            Value { tag, .. } => Err(ShellError::labeled_error_with_secondary(
-                "Expected text from pipeline",
-                "requires text input",
-                &self.tag,
-                "value originates from here",
-                tag,
-            )),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_selector/src/selector.rs b/old_nushell/crates/nu_plugin_selector/src/selector.rs
deleted file mode 100644
index 7b707600b..000000000
--- a/old_nushell/crates/nu_plugin_selector/src/selector.rs
+++ /dev/null
@@ -1,231 +0,0 @@
-use crate::Table;
-use nu_protocol::{value::StringExt, Primitive, TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::Tag;
-use scraper::{Html, Selector as ScraperSelector};
-
-pub struct Selector {
-    pub query: String,
-    pub tag: Tag,
-    pub as_html: bool,
-    pub attribute: String,
-    pub as_table: Value,
-    pub inspect: bool,
-}
-
-impl Selector {
-    pub fn new() -> Selector {
-        Selector {
-            query: String::new(),
-            tag: Tag::unknown(),
-            as_html: false,
-            attribute: String::new(),
-            as_table: Value::new(
-                UntaggedValue::Primitive(Primitive::String("".to_string())),
-                Tag::unknown(),
-            ),
-            inspect: false,
-        }
-    }
-}
-
-impl Default for Selector {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub fn begin_selector_query(input_html: String, selector: &Selector) -> Vec<Value> {
-    if !selector.as_table.value.is_string() {
-        retrieve_tables(input_html.as_str(), &selector.as_table, selector.inspect)
-    } else {
-        match selector.attribute.is_empty() {
-            true => execute_selector_query(
-                input_html.as_str(),
-                selector.query.as_str(),
-                selector.as_html,
-            ),
-            false => execute_selector_query_with_attribute(
-                input_html.as_str(),
-                selector.query.as_str(),
-                selector.attribute.as_str(),
-            ),
-        }
-    }
-}
-
-pub fn retrieve_tables(input_string: &str, columns: &Value, inspect_mode: bool) -> Vec<Value> {
-    let html = input_string;
-    let mut cols = Vec::new();
-    if let UntaggedValue::Table(t) = &columns.value {
-        for x in t {
-            cols.push(x.convert_to_string());
-        }
-    }
-
-    if inspect_mode {
-        eprintln!("Passed in Column Headers = {:#?}", &cols,);
-    }
-
-    let tables = match Table::find_by_headers(html, &cols) {
-        Some(t) => {
-            if inspect_mode {
-                eprintln!("Table Found = {:#?}", &t);
-            }
-            t
-        }
-        None => vec![Table::empty()],
-    };
-    if tables.len() == 1 {
-        return retrieve_table(
-            tables
-                .into_iter()
-                .next()
-                .expect("This should never trigger"),
-            columns,
-        );
-    }
-    tables
-        .into_iter()
-        .map(move |table| {
-            UntaggedValue::Table(retrieve_table(table, columns)).into_value(Tag::unknown())
-        })
-        .collect()
-}
-
-fn retrieve_table(mut table: Table, columns: &Value) -> Vec<Value> {
-    let mut cols = Vec::new();
-    if let UntaggedValue::Table(t) = &columns.value {
-        for x in t {
-            cols.push(x.convert_to_string());
-        }
-    }
-
-    if cols.is_empty() && !table.headers().is_empty() {
-        for col in table.headers().keys() {
-            cols.push(col.to_string());
-        }
-    }
-
-    let mut table_out = Vec::new();
-    // sometimes there are tables where the first column is the headers, kind of like
-    // a table has ben rotated ccw 90 degrees, in these cases all columns will be missing
-    // we keep track of this with this variable so we can deal with it later
-    let mut at_least_one_row_filled = false;
-    // if columns are still empty, let's just make a single column table with the data
-    if cols.is_empty() {
-        at_least_one_row_filled = true;
-        let table_with_no_empties: Vec<_> = table.iter().filter(|item| !item.is_empty()).collect();
-
-        for row in &table_with_no_empties {
-            let mut dict = TaggedDictBuilder::new(Tag::unknown());
-            for (counter, cell) in row.iter().enumerate() {
-                let col_name = format!("Column{}", counter);
-                dict.insert_value(
-                    col_name,
-                    UntaggedValue::Primitive(Primitive::String(cell.to_string()))
-                        .into_value(Tag::unknown()),
-                );
-            }
-            table_out.push(dict.into_value());
-        }
-    } else {
-        for row in &table {
-            let mut dict = TaggedDictBuilder::new(Tag::unknown());
-            // eprintln!("row={:?}", &row);
-            for col in &cols {
-                //eprintln!("col={:?}", &col);
-                let key = col.to_string();
-                let val = row
-                    .get(col)
-                    .unwrap_or(&format!("Missing column: '{}'", &col))
-                    .to_string();
-                if !at_least_one_row_filled && val != format!("Missing column: '{}'", &col) {
-                    at_least_one_row_filled = true;
-                }
-                dict.insert_value(
-                    key,
-                    UntaggedValue::Primitive(Primitive::String(val)).into_value(Tag::unknown()),
-                );
-            }
-            table_out.push(dict.into_value());
-        }
-    }
-    if !at_least_one_row_filled {
-        let mut data2 = Vec::new();
-        for x in &table.data {
-            data2.push(x.join(", "));
-        }
-        table.data = vec![data2];
-        return retrieve_table(table, columns);
-    }
-    table_out
-}
-
-fn execute_selector_query_with_attribute(
-    input_string: &str,
-    query_string: &str,
-    attribute: &str,
-) -> Vec<Value> {
-    let doc = Html::parse_fragment(input_string);
-
-    doc.select(&css(query_string))
-        .map(|selection| {
-            selection
-                .value()
-                .attr(attribute)
-                .unwrap_or("")
-                .to_string()
-                .to_string_value_create_tag()
-        })
-        .collect()
-}
-
-fn execute_selector_query(input_string: &str, query_string: &str, as_html: bool) -> Vec<Value> {
-    let doc = Html::parse_fragment(input_string);
-
-    match as_html {
-        true => doc
-            .select(&css(query_string))
-            .map(|selection| selection.html().to_string_value_create_tag())
-            .collect(),
-        false => doc
-            .select(&css(query_string))
-            .map(|selection| {
-                selection
-                    .text()
-                    .fold("".to_string(), |acc, x| format!("{}{}", acc, x))
-                    .to_string_value_create_tag()
-            })
-            .collect(),
-    }
-}
-
-pub fn css(selector: &str) -> ScraperSelector {
-    ScraperSelector::parse(selector).expect("this should never trigger")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const SIMPLE_LIST: &str = r#"
-    <ul>
-        <li>Coffee</li>
-        <li>Tea</li>
-        <li>Milk</li>
-    </ul>
-"#;
-
-    #[test]
-    fn test_first_child_is_not_empty() {
-        assert!(!execute_selector_query(SIMPLE_LIST, "li:first-child", false).is_empty())
-    }
-
-    #[test]
-    fn test_first_child() {
-        assert_eq!(
-            vec!["Coffee".to_string().to_string_value_create_tag()],
-            execute_selector_query(SIMPLE_LIST, "li:first-child", false)
-        )
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_selector/src/tables.rs b/old_nushell/crates/nu_plugin_selector/src/tables.rs
deleted file mode 100644
index c6aaf41b8..000000000
--- a/old_nushell/crates/nu_plugin_selector/src/tables.rs
+++ /dev/null
@@ -1,1225 +0,0 @@
-use crate::selector::css;
-use scraper::{element_ref::ElementRef, Html, Selector as ScraperSelector};
-use std::collections::HashMap;
-
-// Borrowed from here
-// https://github.com/mk12/table-extract/blob/master/src/lib.rs
-pub type Headers = HashMap<String, usize>;
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Table {
-    headers: Headers,
-    pub data: Vec<Vec<String>>,
-}
-
-impl Table {
-    /// Finds the first table in `html`.
-    pub fn find_first(html: &str) -> Option<Table> {
-        let html = Html::parse_fragment(html);
-        html.select(&css("table")).next().map(Table::new)
-    }
-
-    pub fn find_all_tables(html: &str) -> Option<Vec<Table>> {
-        let html = Html::parse_fragment(html);
-        let iter: Vec<Table> = html.select(&css("table")).map(Table::new).collect();
-        if iter.is_empty() {
-            return None;
-        }
-        Some(iter)
-    }
-
-    /// Finds the table in `html` with an id of `id`.
-    pub fn find_by_id(html: &str, id: &str) -> Option<Table> {
-        let html = Html::parse_fragment(html);
-        let selector = format!("table#{}", id);
-        ScraperSelector::parse(&selector)
-            .ok()
-            .as_ref()
-            .map(|s| html.select(s))
-            .and_then(|mut s| s.next())
-            .map(Table::new)
-    }
-
-    /// Finds the table in `html` whose first row contains all of the headers
-    /// specified in `headers`. The order does not matter.
-    ///
-    /// If `headers` is empty, this is the same as
-    /// [`find_first`](#method.find_first).
-    pub fn find_by_headers<T>(html: &str, headers: &[T]) -> Option<Vec<Table>>
-    where
-        T: AsRef<str>,
-    {
-        if headers.is_empty() {
-            return Table::find_all_tables(html);
-        }
-
-        let sel_table = css("table");
-        let sel_tr = css("tr");
-        let sel_th = css("th");
-
-        let html = Html::parse_fragment(html);
-        let mut tables = html
-            .select(&sel_table)
-            .filter(|table| {
-                table.select(&sel_tr).next().map_or(false, |tr| {
-                    let cells = select_cells(tr, &sel_th, true);
-                    headers.iter().all(|h| contains_str(&cells, h.as_ref()))
-                })
-            })
-            .peekable();
-        tables.peek()?;
-        Some(tables.map(Table::new).collect())
-    }
-
-    /// Returns the headers of the table.
-    ///
-    /// This will be empty if the table had no `<th>` tags in its first row. See
-    /// [`Headers`](type.Headers.html) for more.
-    pub fn headers(&self) -> &Headers {
-        &self.headers
-    }
-
-    /// Returns an iterator over the [`Row`](struct.Row.html)s of the table.
-    ///
-    /// Only `<td>` cells are considered when generating rows. If the first row
-    /// of the table is a header row, meaning it contains at least one `<th>`
-    /// cell, the iterator will start on the second row. Use
-    /// [`headers`](#method.headers) to access the header row in that case.
-    pub fn iter(&self) -> Iter {
-        Iter {
-            headers: &self.headers,
-            iter: self.data.iter(),
-        }
-    }
-
-    pub fn empty() -> Table {
-        Table {
-            headers: HashMap::new(),
-            data: vec![vec!["".to_string()]],
-        }
-    }
-
-    // fn new(element: ElementRef) -> Table {
-    //     let sel_tr = css("tr");
-    //     let sel_th = css("th");
-    //     let sel_td = css("td");
-
-    //     let mut headers = HashMap::new();
-    //     let mut rows = element.select(&sel_tr).peekable();
-    //     if let Some(tr) = rows.peek() {
-    //         for (i, th) in tr.select(&sel_th).enumerate() {
-    //             headers.insert(cell_content(th), i);
-    //         }
-    //     }
-    //     if !headers.is_empty() {
-    //         rows.next();
-    //     }
-    //     let data = rows.map(|tr| select_cells(tr, &sel_td, true)).collect();
-    //     Table { headers, data }
-    // }
-
-    fn new(element: ElementRef) -> Table {
-        let sel_tr = css("tr");
-        let sel_th = css("th");
-        let sel_td = css("td");
-
-        let mut headers = HashMap::new();
-        let mut rows = element.select(&sel_tr).peekable();
-        if let Some(tr) = rows.clone().peek() {
-            for (i, th) in tr.select(&sel_th).enumerate() {
-                headers.insert(cell_content(th), i);
-            }
-        }
-        if !headers.is_empty() {
-            rows.next();
-        }
-
-        if headers.is_empty() {
-            // try looking for data as headers i.e. they're row headers not column headers
-            for (i, d) in rows
-                .clone()
-                .map(|tr| select_cells(tr, &sel_th, true))
-                .enumerate()
-            {
-                headers.insert(d.join(", "), i);
-            }
-            // check if headers are there but empty
-            let mut empty_headers = true;
-            for (h, _i) in headers.clone() {
-                if !h.is_empty() {
-                    empty_headers = false;
-                    break;
-                }
-            }
-            if empty_headers {
-                headers = HashMap::new();
-            }
-            let data = rows.map(|tr| select_cells(tr, &sel_td, true)).collect();
-            Table { headers, data }
-        } else {
-            let data = rows.map(|tr| select_cells(tr, &sel_td, true)).collect();
-            Table { headers, data }
-        }
-    }
-}
-
-impl<'a> IntoIterator for &'a Table {
-    type Item = Row<'a>;
-    type IntoIter = Iter<'a>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.iter()
-    }
-}
-
-/// An iterator over the rows in a [`Table`](struct.Table.html).
-pub struct Iter<'a> {
-    headers: &'a Headers,
-    iter: std::slice::Iter<'a, Vec<String>>,
-}
-
-impl<'a> Iterator for Iter<'a> {
-    type Item = Row<'a>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let headers = self.headers;
-        self.iter.next().map(|cells| Row { headers, cells })
-    }
-}
-
-/// A row in a [`Table`](struct.Table.html).
-///
-/// A row consists of a number of data cells stored as strings. If the row
-/// contains the same number of cells as the table's header row, its cells can
-/// be safely accessed by header names using [`get`](#method.get). Otherwise,
-/// the data should be accessed via [`as_slice`](#method.as_slice) or by
-/// iterating over the row.
-///
-/// This struct can be thought of as a lightweight reference into a table. As
-/// such, it implements the `Copy` trait.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct Row<'a> {
-    headers: &'a Headers,
-    cells: &'a [String],
-}
-
-impl<'a> Row<'a> {
-    /// Returns the number of cells in the row.
-    pub fn len(&self) -> usize {
-        self.cells.len()
-    }
-
-    /// Returns `true` if the row contains no cells.
-    pub fn is_empty(&self) -> bool {
-        self.cells.is_empty()
-    }
-
-    /// Returns the cell underneath `header`.
-    ///
-    /// Returns `None` if there is no such header, or if there is no cell at
-    /// that position in the row.
-    pub fn get(&self, header: &str) -> Option<&'a str> {
-        // eprintln!(
-        //     "header={}, headers={:?}, cells={:?}",
-        //     &header, &self.headers, &self.cells
-        // );
-        self.headers.get(header).and_then(|&i| {
-            // eprintln!("i={}", i);
-            self.cells.get(i).map(String::as_str)
-        })
-    }
-
-    pub fn get_header_at(&self, index: usize) -> Option<&'a str> {
-        let mut a_match = "";
-        for (key, val) in self.headers {
-            if *val == index {
-                a_match = key;
-                break;
-            }
-        }
-        if a_match.is_empty() {
-            None
-        } else {
-            Some(a_match)
-        }
-    }
-
-    /// Returns a slice containing all the cells.
-    pub fn as_slice(&self) -> &'a [String] {
-        self.cells
-    }
-
-    /// Returns an iterator over the cells of the row.
-    pub fn iter(&self) -> std::slice::Iter<String> {
-        self.cells.iter()
-    }
-}
-
-impl<'a> IntoIterator for Row<'a> {
-    type Item = &'a String;
-    type IntoIter = std::slice::Iter<'a, String>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.cells.iter()
-    }
-}
-
-fn select_cells(
-    element: ElementRef,
-    selector: &ScraperSelector,
-    remove_html_tags: bool,
-) -> Vec<String> {
-    if remove_html_tags {
-        let scraped = element.select(selector).map(cell_content);
-        let mut dehtmlized: Vec<String> = Vec::new();
-        for item in scraped {
-            let frag = Html::parse_fragment(&item);
-            for node in frag.tree {
-                if let scraper::node::Node::Text(text) = node {
-                    dehtmlized.push(text.text.to_string());
-                }
-            }
-        }
-        dehtmlized
-    } else {
-        element.select(selector).map(cell_content).collect()
-    }
-}
-
-fn cell_content(element: ElementRef) -> String {
-    // element.inner_html().trim().to_string()
-    let mut dehtmlize = String::new();
-    let element = element.inner_html().trim().to_string();
-    let frag = Html::parse_fragment(&element);
-    for node in frag.tree {
-        if let scraper::node::Node::Text(text) = node {
-            dehtmlize.push_str(&text.text.to_string())
-        }
-    }
-
-    // eprintln!("element={} dehtmlize={}", &element, &dehtmlize);
-
-    if dehtmlize.is_empty() {
-        dehtmlize = element;
-    }
-
-    dehtmlize
-}
-
-fn contains_str(slice: &[String], item: &str) -> bool {
-    // slice.iter().any(|s| s == item)
-
-    let mut dehtmlized = String::new();
-    let frag = Html::parse_fragment(item);
-    for node in frag.tree {
-        if let scraper::node::Node::Text(text) = node {
-            dehtmlized.push_str(&text.text.to_string());
-        }
-    }
-
-    if dehtmlized.is_empty() {
-        dehtmlized = item.to_string();
-    }
-
-    slice.iter().any(|s| {
-        // eprintln!(
-        //     "\ns={} item={} contains={}\n",
-        //     &s,
-        //     &dehtmlized,
-        //     &dehtmlized.contains(s)
-        // );
-        // s.starts_with(item)
-        dehtmlized.contains(s)
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::selector::retrieve_tables;
-    use indexmap::indexmap;
-    use nu_protocol::UntaggedValue;
-
-    const TABLE_EMPTY: &str = r#"
-<table></table>
-"#;
-
-    const TABLE_TH: &str = r#"
-<table>
-    <tr><th>Name</th><th>Age</th></tr>
-</table>
-"#;
-
-    const TABLE_TD: &str = r#"
-<table>
-    <tr><td>Name</td><td>Age</td></tr>
-</table>
-"#;
-
-    const TWO_TABLES_TD: &str = r#"
-<table>
-    <tr><td>Name</td><td>Age</td></tr>
-</table>
-<table>
-    <tr><td>Profession</td><td>Civil State</td></tr>
-</table>
-"#;
-
-    const TABLE_TH_TD: &str = r#"
-<table>
-    <tr><th>Name</th><th>Age</th></tr>
-    <tr><td>John</td><td>20</td></tr>
-</table>
-"#;
-
-    const TWO_TABLES_TH_TD: &str = r#"
-<table>
-    <tr><th>Name</th><th>Age</th></tr>
-    <tr><td>John</td><td>20</td></tr>
-</table>
-<table>
-    <tr><th>Profession</th><th>Civil State</th></tr>
-    <tr><td>Mechanic</td><td>Single</td></tr>
-</table>
-"#;
-
-    const TABLE_TD_TD: &str = r#"
-<table>
-    <tr><td>Name</td><td>Age</td></tr>
-    <tr><td>John</td><td>20</td></tr>
-</table>
-"#;
-
-    const TABLE_TH_TH: &str = r#"
-<table>
-    <tr><th>Name</th><th>Age</th></tr>
-    <tr><th>John</th><th>20</th></tr>
-</table>
-"#;
-
-    const TABLE_COMPLEX: &str = r#"
-<table>
-    <tr><th>Name</th><th>Age</th><th>Extra</th></tr>
-    <tr><td>John</td><td>20</td></tr>
-    <tr><td>May</td><td>30</td><td>foo</td></tr>
-    <tr></tr>
-    <tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
-</table>
-"#;
-
-    const TWO_TABLES_COMPLEX: &str = r#"
-<!doctype HTML>
-<html>
-    <head><title>foo</title></head>
-    <body>
-        <table>
-            <tr><th>Name</th><th>Age</th><th>Extra</th></tr>
-            <tr><td>John</td><td>20</td></tr>
-            <tr><td>May</td><td>30</td><td>foo</td></tr>
-            <tr></tr>
-            <tr><td>a</td><td>b</td><td>c</td><td>d</td></tr>
-        </table>
-        <table>
-            <tr><th>Profession</th><th>Civil State</th><th>Extra</th></tr>
-            <tr><td>Carpenter</td><td>Single</td></tr>
-            <tr><td>Mechanic</td><td>Married</td><td>bar</td></tr>
-            <tr></tr>
-            <tr><td>e</td><td>f</td><td>g</td><td>h</td></tr>
-        </table>
-    </body>
-</html>
-"#;
-
-    const HTML_NO_TABLE: &str = r#"
-<!doctype HTML>
-<html>
-    <head><title>foo</title></head>
-    <body><p>Hi.</p></body>
-</html>
-"#;
-
-    const HTML_TWO_TABLES: &str = r#"
-<!doctype HTML>
-<html>
-    <head><title>foo</title></head>
-    <body>
-        <table id="first">
-            <tr><th>Name</th><th>Age</th></tr>
-            <tr><td>John</td><td>20</td></tr>
-        </table>
-        <table id="second">
-            <tr><th>Name</th><th>Weight</th></tr>
-            <tr><td>John</td><td>150</td></tr>
-        </table>
-    </body>
-</html>
-"#;
-
-    const HTML_TABLE_FRAGMENT: &str = r#"
-        <table id="first">
-            <tr><th>Name</th><th>Age</th></tr>
-            <tr><td>John</td><td>20</td></tr>
-        </table>
-    </body>
-</html>
-"#;
-
-    const HTML_TABLE_WIKIPEDIA_WITH_COLUMN_NAMES: &str = r#"
-    <table class="wikitable">
-    <caption>Excel 2007 formats
-    </caption>
-    <tbody><tr>
-    <th>Format
-    </th>
-    <th>Extension
-    </th>
-    <th>Description
-    </th></tr>
-    <tr>
-    <td>Excel Workbook
-    </td>
-    <td><code class="mw-highlight mw-highlight-lang-text mw-content-ltr" id="" style="" dir="ltr">.xlsx</code>
-    </td>
-    <td>The default Excel 2007 and later workbook format. In reality, a <a href="/wiki/Zip_(file_format)" class="mw-redirect" title="Zip (file format)">Zip</a> compressed archive with a directory structure of <a href="/wiki/XML" title="XML">XML</a> text documents. Functions as the primary replacement for the former binary .xls format, although it does not support Excel macros for security reasons. Saving as .xlsx offers file size reduction over .xls<sup id="cite_ref-38" class="reference"><a href="&#35;cite_note-38">[38]</a></sup>
-    </td></tr>
-    <tr>
-    <td>Excel Macro-enabled Workbook
-    </td>
-    <td><code class="mw-highlight mw-highlight-lang-text mw-content-ltr" id="" style="" dir="ltr">.xlsm</code>
-    </td>
-    <td>As Excel Workbook, but with macro support.
-    </td></tr>
-    <tr>
-    <td>Excel Binary Workbook
-    </td>
-    <td><code class="mw-highlight mw-highlight-lang-text mw-content-ltr" id="" style="" dir="ltr">.xlsb</code>
-    </td>
-    <td>As Excel Macro-enabled Workbook, but storing information in binary form rather than XML documents for opening and saving documents more quickly and efficiently. Intended especially for very large documents with tens of thousands of rows, and/or several hundreds of columns. This format is very useful for shrinking large Excel files as is often the case when doing data analysis.
-    </td></tr>
-    <tr>
-    <td>Excel Macro-enabled Template
-    </td>
-    <td><code class="mw-highlight mw-highlight-lang-text mw-content-ltr" id="" style="" dir="ltr">.xltm</code>
-    </td>
-    <td>A template document that forms a basis for actual workbooks, with macro support. The replacement for the old .xlt format.
-    </td></tr>
-    <tr>
-    <td>Excel Add-in
-    </td>
-    <td><code class="mw-highlight mw-highlight-lang-text mw-content-ltr" id="" style="" dir="ltr">.xlam</code>
-    </td>
-    <td>Excel add-in to add extra functionality and tools. Inherent macro support because of the file purpose.
-    </td></tr></tbody></table>
-    "#;
-
-    const HTML_TABLE_WIKIPEDIA_COLUMNS_AS_ROWS: &str = r#"
-<table class="infobox vevent">
-  <caption class="infobox-title summary">
-    Microsoft Excel
-  </caption>
-  <tbody>
-    <tr>
-      <td colspan="2" class="infobox-image">
-        <a
-          href="/wiki/File:Microsoft_Office_Excel_(2019%E2%80%93present).svg"
-          class="image"
-          ><img
-            alt="Microsoft Office Excel (2019–present).svg"
-            src="//upload.wikimedia.org/wikipedia/commons/thumb/3/34/Microsoft_Office_Excel_%282019%E2%80%93present%29.svg/69px-Microsoft_Office_Excel_%282019%E2%80%93present%29.svg.png"
-            decoding="async"
-            width="69"
-            height="64"
-            srcset="
-              //upload.wikimedia.org/wikipedia/commons/thumb/3/34/Microsoft_Office_Excel_%282019%E2%80%93present%29.svg/103px-Microsoft_Office_Excel_%282019%E2%80%93present%29.svg.png 1.5x,
-              //upload.wikimedia.org/wikipedia/commons/thumb/3/34/Microsoft_Office_Excel_%282019%E2%80%93present%29.svg/138px-Microsoft_Office_Excel_%282019%E2%80%93present%29.svg.png 2x
-            "
-            data-file-width="512"
-            data-file-height="476"
-        /></a>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2" class="infobox-image">
-        <a href="/wiki/File:Microsoft_Excel.png" class="image"
-          ><img
-            alt="Microsoft Excel.png"
-            src="//upload.wikimedia.org/wikipedia/en/thumb/9/94/Microsoft_Excel.png/300px-Microsoft_Excel.png"
-            decoding="async"
-            width="300"
-            height="190"
-            srcset="
-              //upload.wikimedia.org/wikipedia/en/thumb/9/94/Microsoft_Excel.png/450px-Microsoft_Excel.png 1.5x,
-              //upload.wikimedia.org/wikipedia/en/thumb/9/94/Microsoft_Excel.png/600px-Microsoft_Excel.png 2x
-            "
-            data-file-width="800"
-            data-file-height="507"
-        /></a>
-        <div class="infobox-caption">
-          A simple
-          <a href="/wiki/Line_chart" title="Line chart">line chart</a> being
-          created in Excel, running on
-          <a href="/wiki/Windows_10" title="Windows 10">Windows 10</a>
-        </div>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        <a href="/wiki/Programmer" title="Programmer">Developer(s)</a>
-      </th>
-      <td class="infobox-data">
-        <a href="/wiki/Microsoft" title="Microsoft">Microsoft</a>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        Initial release
-      </th>
-      <td class="infobox-data">
-        1987<span class="noprint">; 34&nbsp;years ago</span
-        ><span style="display: none"
-          >&nbsp;(<span class="bday dtstart published updated">1987</span
-          >)</span
-        >
-      </td>
-    </tr>
-    <tr style="display: none">
-      <td colspan="2" class="infobox-full-data"></td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        <a
-          href="/wiki/Software_release_life_cycle"
-          title="Software release life cycle"
-          >Stable release</a
-        >
-      </th>
-      <td class="infobox-data">
-        <div style="margin: 0px">
-          2103 (16.0.13901.20400) / April&nbsp;13, 2021<span class="noprint"
-            >; 4 months ago</span
-          ><span style="display: none"
-            >&nbsp;(<span class="bday dtstart published updated"
-              >2021-04-13</span
-            >)</span
-          ><sup id="cite_ref-1" class="reference"
-            ><a href="&#35;cite_note-1">[1]</a></sup
-          >
-        </div>
-      </td>
-    </tr>
-    <tr style="display: none">
-      <td colspan="2"></td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        <a href="/wiki/Operating_system" title="Operating system"
-          >Operating system</a
-        >
-      </th>
-      <td class="infobox-data">
-        <a href="/wiki/Microsoft_Windows" title="Microsoft Windows"
-          >Microsoft Windows</a
-        >
-      </td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        <a
-          href="/wiki/Software_categories#Categorization_approaches"
-          title="Software categories"
-          >Type</a
-        >
-      </th>
-      <td class="infobox-data">
-        <a href="/wiki/Spreadsheet" title="Spreadsheet">Spreadsheet</a>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        <a href="/wiki/Software_license" title="Software license">License</a>
-      </th>
-      <td class="infobox-data">
-        <a href="/wiki/Trialware" class="mw-redirect" title="Trialware"
-          >Trialware</a
-        ><sup id="cite_ref-2" class="reference"
-          ><a href="&#35;cite_note-2">[2]</a></sup
-        >
-      </td>
-    </tr>
-    <tr>
-      <th scope="row" class="infobox-label" style="white-space: nowrap">
-        Website
-      </th>
-      <td class="infobox-data">
-        <span class="url"
-          ><a
-            rel="nofollow"
-            class="external text"
-            href="http://products.office.com/en-us/excel"
-            >products<wbr />.office<wbr />.com<wbr />/en-us<wbr />/excel</a
-          ></span
-        >
-      </td>
-    </tr>
-  </tbody>
-</table>
-"#;
-
-    #[test]
-    fn test_find_first_none() {
-        assert_eq!(None, Table::find_first(""));
-        assert_eq!(None, Table::find_first("foo"));
-        assert_eq!(None, Table::find_first(HTML_NO_TABLE));
-    }
-
-    #[test]
-    fn test_find_first_empty() {
-        let empty = Table {
-            headers: HashMap::new(),
-            data: Vec::new(),
-        };
-        assert_eq!(Some(empty), Table::find_first(TABLE_EMPTY));
-    }
-
-    #[test]
-    fn test_find_first_some() {
-        assert!(Table::find_first(TABLE_TH).is_some());
-        assert!(Table::find_first(TABLE_TD).is_some());
-    }
-
-    #[test]
-    fn test_find_by_id_none() {
-        assert_eq!(None, Table::find_by_id("", ""));
-        assert_eq!(None, Table::find_by_id("foo", "id"));
-        assert_eq!(None, Table::find_by_id(HTML_NO_TABLE, "id"));
-
-        assert_eq!(None, Table::find_by_id(TABLE_EMPTY, "id"));
-        assert_eq!(None, Table::find_by_id(TABLE_TH, "id"));
-        assert_eq!(None, Table::find_by_id(TABLE_TH, ""));
-        assert_eq!(None, Table::find_by_id(HTML_TWO_TABLES, "id"));
-    }
-
-    #[test]
-    fn test_find_by_id_some() {
-        assert!(Table::find_by_id(HTML_TWO_TABLES, "first").is_some());
-        assert!(Table::find_by_id(HTML_TWO_TABLES, "second").is_some());
-    }
-
-    #[test]
-    fn test_find_by_headers_empty() {
-        let headers: [&str; 0] = [];
-
-        assert_eq!(None, Table::find_by_headers("", &headers));
-        assert_eq!(None, Table::find_by_headers("foo", &headers));
-        assert_eq!(None, Table::find_by_headers(HTML_NO_TABLE, &headers));
-
-        assert!(Table::find_by_headers(TABLE_EMPTY, &headers).is_some());
-        assert!(Table::find_by_headers(HTML_TWO_TABLES, &headers).is_some());
-    }
-
-    #[test]
-    fn test_find_by_headers_none() {
-        let headers = ["Name", "Age"];
-        let bad_headers = ["Name", "BAD"];
-
-        assert_eq!(None, Table::find_by_headers("", &headers));
-        assert_eq!(None, Table::find_by_headers("foo", &headers));
-        assert_eq!(None, Table::find_by_headers(HTML_NO_TABLE, &headers));
-
-        assert_eq!(None, Table::find_by_headers(TABLE_EMPTY, &bad_headers));
-        assert_eq!(None, Table::find_by_headers(TABLE_TH, &bad_headers));
-
-        assert_eq!(None, Table::find_by_headers(TABLE_TD, &headers));
-        assert_eq!(None, Table::find_by_headers(TABLE_TD, &bad_headers));
-    }
-
-    #[test]
-    fn test_find_by_headers_some() {
-        let headers: [&str; 0] = [];
-        assert!(Table::find_by_headers(TABLE_TH, &headers).is_some());
-        assert!(Table::find_by_headers(TABLE_TH_TD, &headers).is_some());
-        assert!(Table::find_by_headers(HTML_TWO_TABLES, &headers).is_some());
-
-        let headers = ["Name"];
-        assert!(Table::find_by_headers(TABLE_TH, &headers).is_some());
-        assert!(Table::find_by_headers(TABLE_TH_TD, &headers).is_some());
-        assert!(Table::find_by_headers(HTML_TWO_TABLES, &headers).is_some());
-
-        let headers = ["Age", "Name"];
-        assert!(Table::find_by_headers(TABLE_TH, &headers).is_some());
-        assert!(Table::find_by_headers(TABLE_TH_TD, &headers).is_some());
-        assert!(Table::find_by_headers(HTML_TWO_TABLES, &headers).is_some());
-    }
-
-    #[test]
-    fn test_find_first_incomplete_fragment() {
-        assert!(Table::find_first(HTML_TABLE_FRAGMENT).is_some());
-    }
-
-    #[test]
-    fn test_headers_empty() {
-        let empty = HashMap::new();
-        assert_eq!(&empty, Table::find_first(TABLE_TD).unwrap().headers());
-        assert_eq!(&empty, Table::find_first(TABLE_TD_TD).unwrap().headers());
-    }
-
-    #[test]
-    fn test_headers_nonempty() {
-        let mut headers = HashMap::new();
-        headers.insert("Name".to_string(), 0);
-        headers.insert("Age".to_string(), 1);
-
-        assert_eq!(&headers, Table::find_first(TABLE_TH).unwrap().headers());
-        assert_eq!(&headers, Table::find_first(TABLE_TH_TD).unwrap().headers());
-        assert_eq!(&headers, Table::find_first(TABLE_TH_TH).unwrap().headers());
-
-        headers.insert("Extra".to_string(), 2);
-        assert_eq!(
-            &headers,
-            Table::find_first(TABLE_COMPLEX).unwrap().headers()
-        );
-    }
-
-    #[test]
-    fn test_iter_empty() {
-        assert_eq!(0, Table::find_first(TABLE_EMPTY).unwrap().iter().count());
-        assert_eq!(0, Table::find_first(TABLE_TH).unwrap().iter().count());
-    }
-
-    #[test]
-    fn test_iter_nonempty() {
-        assert_eq!(1, Table::find_first(TABLE_TD).unwrap().iter().count());
-        assert_eq!(1, Table::find_first(TABLE_TH_TD).unwrap().iter().count());
-        assert_eq!(2, Table::find_first(TABLE_TD_TD).unwrap().iter().count());
-        assert_eq!(1, Table::find_first(TABLE_TH_TH).unwrap().iter().count());
-        assert_eq!(4, Table::find_first(TABLE_COMPLEX).unwrap().iter().count());
-    }
-
-    #[test]
-    fn test_row_is_empty() {
-        let table = Table::find_first(TABLE_TD).unwrap();
-        assert_eq!(
-            vec![false],
-            table.iter().map(|r| r.is_empty()).collect::<Vec<_>>()
-        );
-
-        let table = Table::find_first(TABLE_COMPLEX).unwrap();
-        assert_eq!(
-            vec![false, false, true, false],
-            table.iter().map(|r| r.is_empty()).collect::<Vec<_>>()
-        );
-    }
-
-    #[test]
-    fn test_row_len() {
-        let table = Table::find_first(TABLE_TD).unwrap();
-        assert_eq!(vec![2], table.iter().map(|r| r.len()).collect::<Vec<_>>());
-
-        let table = Table::find_first(TABLE_COMPLEX).unwrap();
-        assert_eq!(
-            vec![2, 3, 0, 4],
-            table.iter().map(|r| r.len()).collect::<Vec<_>>()
-        );
-    }
-
-    #[test]
-    fn test_row_len_two_tables() {
-        let tables = Table::find_all_tables(HTML_TWO_TABLES).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        assert_eq!(vec![2], table_1.iter().map(|r| r.len()).collect::<Vec<_>>());
-        assert_eq!(vec![2], table_2.iter().map(|r| r.len()).collect::<Vec<_>>());
-
-        let tables = Table::find_all_tables(TWO_TABLES_COMPLEX).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        assert_eq!(
-            vec![2, 3, 0, 4],
-            table_1.iter().map(|r| r.len()).collect::<Vec<_>>()
-        );
-        assert_eq!(
-            vec![2, 3, 0, 4],
-            table_2.iter().map(|r| r.len()).collect::<Vec<_>>()
-        );
-    }
-
-    #[test]
-    fn test_row_get_without_headers() {
-        let table = Table::find_first(TABLE_TD).unwrap();
-        let mut iter = table.iter();
-        let row = iter.next().unwrap();
-
-        assert_eq!(None, row.get(""));
-        assert_eq!(None, row.get("foo"));
-        assert_eq!(None, row.get("Name"));
-        assert_eq!(None, row.get("Age"));
-
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_get_with_headers() {
-        let table = Table::find_first(TABLE_TH_TD).unwrap();
-        let mut iter = table.iter();
-        let row = iter.next().unwrap();
-
-        assert_eq!(None, row.get(""));
-        assert_eq!(None, row.get("foo"));
-        assert_eq!(Some("John"), row.get("Name"));
-        assert_eq!(Some("20"), row.get("Age"));
-
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_get_complex() {
-        let table = Table::find_first(TABLE_COMPLEX).unwrap();
-        let mut iter = table.iter();
-
-        let row = iter.next().unwrap();
-        assert_eq!(Some("John"), row.get("Name"));
-        assert_eq!(Some("20"), row.get("Age"));
-        assert_eq!(None, row.get("Extra"));
-
-        let row = iter.next().unwrap();
-        assert_eq!(Some("May"), row.get("Name"));
-        assert_eq!(Some("30"), row.get("Age"));
-        assert_eq!(Some("foo"), row.get("Extra"));
-
-        let row = iter.next().unwrap();
-        assert_eq!(None, row.get("Name"));
-        assert_eq!(None, row.get("Age"));
-        assert_eq!(None, row.get("Extra"));
-
-        let row = iter.next().unwrap();
-        assert_eq!(Some("a"), row.get("Name"));
-        assert_eq!(Some("b"), row.get("Age"));
-        assert_eq!(Some("c"), row.get("Extra"));
-
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_two_tables_row_get_complex() {
-        let tables = Table::find_all_tables(TWO_TABLES_COMPLEX).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        let mut iter_1 = table_1.iter();
-        let mut iter_2 = table_2.iter();
-
-        let row_table_1 = iter_1.next().unwrap();
-        let row_table_2 = iter_2.next().unwrap();
-        assert_eq!(Some("John"), row_table_1.get("Name"));
-        assert_eq!(Some("20"), row_table_1.get("Age"));
-        assert_eq!(None, row_table_1.get("Extra"));
-        assert_eq!(Some("Carpenter"), row_table_2.get("Profession"));
-        assert_eq!(Some("Single"), row_table_2.get("Civil State"));
-        assert_eq!(None, row_table_2.get("Extra"));
-
-        let row_table_1 = iter_1.next().unwrap();
-        let row_table_2 = iter_2.next().unwrap();
-        assert_eq!(Some("May"), row_table_1.get("Name"));
-        assert_eq!(Some("30"), row_table_1.get("Age"));
-        assert_eq!(Some("foo"), row_table_1.get("Extra"));
-        assert_eq!(Some("Mechanic"), row_table_2.get("Profession"));
-        assert_eq!(Some("Married"), row_table_2.get("Civil State"));
-        assert_eq!(Some("bar"), row_table_2.get("Extra"));
-
-        let row_table_1 = iter_1.next().unwrap();
-        let row_table_2 = iter_2.next().unwrap();
-        assert_eq!(None, row_table_1.get("Name"));
-        assert_eq!(None, row_table_1.get("Age"));
-        assert_eq!(None, row_table_1.get("Extra"));
-        assert_eq!(None, row_table_2.get("Name"));
-        assert_eq!(None, row_table_2.get("Age"));
-        assert_eq!(None, row_table_2.get("Extra"));
-
-        let row_table_1 = iter_1.next().unwrap();
-        let row_table_2 = iter_2.next().unwrap();
-        assert_eq!(Some("a"), row_table_1.get("Name"));
-        assert_eq!(Some("b"), row_table_1.get("Age"));
-        assert_eq!(Some("c"), row_table_1.get("Extra"));
-        assert_eq!(Some("e"), row_table_2.get("Profession"));
-        assert_eq!(Some("f"), row_table_2.get("Civil State"));
-        assert_eq!(Some("g"), row_table_2.get("Extra"));
-
-        assert_eq!(None, iter_1.next());
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_without_headers() {
-        let table = Table::find_first(TABLE_TD).unwrap();
-        let mut iter = table.iter();
-
-        assert_eq!(&["Name", "Age"], iter.next().unwrap().as_slice());
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_without_headers_two_tables() {
-        let tables = Table::find_all_tables(TWO_TABLES_TD).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        let mut iter_1 = table_1.iter();
-        let mut iter_2 = table_2.iter();
-
-        assert_eq!(&["Name", "Age"], iter_1.next().unwrap().as_slice());
-        assert_eq!(
-            &["Profession", "Civil State"],
-            iter_2.next().unwrap().as_slice()
-        );
-        assert_eq!(None, iter_1.next());
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_with_headers() {
-        let table = Table::find_first(TABLE_TH_TD).unwrap();
-        let mut iter = table.iter();
-
-        assert_eq!(&["John", "20"], iter.next().unwrap().as_slice());
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_with_headers_two_tables() {
-        let tables = Table::find_all_tables(TWO_TABLES_TH_TD).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        let mut iter_1 = table_1.iter();
-        let mut iter_2 = table_2.iter();
-
-        assert_eq!(&["John", "20"], iter_1.next().unwrap().as_slice());
-        assert_eq!(&["Mechanic", "Single"], iter_2.next().unwrap().as_slice());
-        assert_eq!(None, iter_1.next());
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_complex() {
-        let table = Table::find_first(TABLE_COMPLEX).unwrap();
-        let mut iter = table.iter();
-        let empty: [&str; 0] = [];
-
-        assert_eq!(&["John", "20"], iter.next().unwrap().as_slice());
-        assert_eq!(&["May", "30", "foo"], iter.next().unwrap().as_slice());
-        assert_eq!(&empty, iter.next().unwrap().as_slice());
-        assert_eq!(&["a", "b", "c", "d"], iter.next().unwrap().as_slice());
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_as_slice_complex_two_tables() {
-        let tables = Table::find_all_tables(TWO_TABLES_COMPLEX).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        let mut iter_1 = table_1.iter();
-        let mut iter_2 = table_2.iter();
-        let empty: [&str; 0] = [];
-
-        assert_eq!(&["John", "20"], iter_1.next().unwrap().as_slice());
-        assert_eq!(&["May", "30", "foo"], iter_1.next().unwrap().as_slice());
-        assert_eq!(&empty, iter_1.next().unwrap().as_slice());
-        assert_eq!(&["a", "b", "c", "d"], iter_1.next().unwrap().as_slice());
-        assert_eq!(None, iter_1.next());
-        assert_eq!(&["Carpenter", "Single"], iter_2.next().unwrap().as_slice());
-        assert_eq!(
-            &["Mechanic", "Married", "bar"],
-            iter_2.next().unwrap().as_slice()
-        );
-        assert_eq!(&empty, iter_2.next().unwrap().as_slice());
-        assert_eq!(&["e", "f", "g", "h"], iter_2.next().unwrap().as_slice());
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_row_iter_simple() {
-        let table = Table::find_first(TABLE_TD).unwrap();
-        let row = table.iter().next().unwrap();
-        let mut iter = row.iter();
-
-        assert_eq!(Some("Name"), iter.next().map(String::as_str));
-        assert_eq!(Some("Age"), iter.next().map(String::as_str));
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_iter_simple_two_tables() {
-        let tables = Table::find_all_tables(TWO_TABLES_TD).unwrap();
-        let mut tables_iter = tables.iter();
-        let table_1 = tables_iter.next().unwrap();
-        let table_2 = tables_iter.next().unwrap();
-        let row_1 = table_1.iter().next().unwrap();
-        let row_2 = table_2.iter().next().unwrap();
-        let mut iter_1 = row_1.iter();
-        let mut iter_2 = row_2.iter();
-
-        assert_eq!(Some("Name"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("Age"), iter_1.next().map(String::as_str));
-        assert_eq!(None, iter_1.next());
-        assert_eq!(Some("Profession"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("Civil State"), iter_2.next().map(String::as_str));
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_row_iter_complex() {
-        let table = Table::find_first(TABLE_COMPLEX).unwrap();
-        let mut table_iter = table.iter();
-
-        let row = table_iter.next().unwrap();
-        let mut iter = row.iter();
-        assert_eq!(Some("John"), iter.next().map(String::as_str));
-        assert_eq!(Some("20"), iter.next().map(String::as_str));
-        assert_eq!(None, iter.next());
-
-        let row = table_iter.next().unwrap();
-        let mut iter = row.iter();
-        assert_eq!(Some("May"), iter.next().map(String::as_str));
-        assert_eq!(Some("30"), iter.next().map(String::as_str));
-        assert_eq!(Some("foo"), iter.next().map(String::as_str));
-        assert_eq!(None, iter.next());
-
-        let row = table_iter.next().unwrap();
-        let mut iter = row.iter();
-        assert_eq!(None, iter.next());
-
-        let row = table_iter.next().unwrap();
-        let mut iter = row.iter();
-        assert_eq!(Some("a"), iter.next().map(String::as_str));
-        assert_eq!(Some("b"), iter.next().map(String::as_str));
-        assert_eq!(Some("c"), iter.next().map(String::as_str));
-        assert_eq!(Some("d"), iter.next().map(String::as_str));
-        assert_eq!(None, iter.next());
-    }
-
-    #[test]
-    fn test_row_iter_complex_two_tables() {
-        let tables = Table::find_all_tables(TWO_TABLES_COMPLEX).unwrap();
-        let mut tables_iter = tables.iter();
-        let mut table_1 = tables_iter.next().unwrap().iter();
-        let mut table_2 = tables_iter.next().unwrap().iter();
-
-        let row_1 = table_1.next().unwrap();
-        let row_2 = table_2.next().unwrap();
-        let mut iter_1 = row_1.iter();
-        let mut iter_2 = row_2.iter();
-        assert_eq!(Some("John"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("20"), iter_1.next().map(String::as_str));
-        assert_eq!(None, iter_1.next());
-        assert_eq!(Some("Carpenter"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("Single"), iter_2.next().map(String::as_str));
-        assert_eq!(None, iter_2.next());
-
-        let row_1 = table_1.next().unwrap();
-        let row_2 = table_2.next().unwrap();
-        let mut iter_1 = row_1.iter();
-        let mut iter_2 = row_2.iter();
-        assert_eq!(Some("May"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("30"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("foo"), iter_1.next().map(String::as_str));
-        assert_eq!(None, iter_1.next());
-        assert_eq!(Some("Mechanic"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("Married"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("bar"), iter_2.next().map(String::as_str));
-        assert_eq!(None, iter_2.next());
-
-        let row_1 = table_1.next().unwrap();
-        let row_2 = table_2.next().unwrap();
-        let mut iter_1 = row_1.iter();
-        let mut iter_2 = row_2.iter();
-        assert_eq!(None, iter_1.next());
-        assert_eq!(None, iter_2.next());
-
-        let row_1 = table_1.next().unwrap();
-        let row_2 = table_2.next().unwrap();
-        let mut iter_1 = row_1.iter();
-        let mut iter_2 = row_2.iter();
-        assert_eq!(Some("a"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("b"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("c"), iter_1.next().map(String::as_str));
-        assert_eq!(Some("d"), iter_1.next().map(String::as_str));
-        assert_eq!(None, iter_1.next());
-        assert_eq!(Some("e"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("f"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("g"), iter_2.next().map(String::as_str));
-        assert_eq!(Some("h"), iter_2.next().map(String::as_str));
-        assert_eq!(None, iter_2.next());
-    }
-
-    #[test]
-    fn test_wikipedia_swapped_rows_columns() {
-        // empty columns
-        let cols = nu_protocol::value::Value {
-            value: nu_protocol::UntaggedValue::Primitive(nu_protocol::Primitive::String(
-                "".to_string(),
-            )),
-            tag: nu_source::Tag::unknown(),
-        };
-
-        // this table is taken straight from wikipedia with no changes
-        let table = retrieve_tables(HTML_TABLE_WIKIPEDIA_COLUMNS_AS_ROWS, &cols, true);
-
-        let expected = vec![UntaggedValue::row(indexmap! {
-            "Stable release".to_string() => UntaggedValue::string("\n          2103 (16.0.13901.20400) / April\u{a0}13, 2021; 4 months ago\u{a0}(2021-04-13)[1]\n        ").into(),
-            "Developer(s)".to_string() => UntaggedValue::string("Microsoft").into(),
-            "Operating system".to_string() => UntaggedValue::string("Microsoft Windows").into(),
-            "Type".to_string() => UntaggedValue::string("Spreadsheet").into(),
-            "License".to_string() => UntaggedValue::string("Trialware[2]").into(),
-            "".to_string() => UntaggedValue::string("").into(),
-            "Website".to_string() => UntaggedValue::string("products.office.com/en-us/excel").into(),
-            "Initial release".to_string() => UntaggedValue::string("1987; 34\u{a0}years ago\u{a0}(1987)").into(),
-        }).into()];
-
-        assert_eq!(table, expected);
-    }
-
-    #[test]
-    fn test_wikipedia_table_with_column_headers() {
-        let cols = UntaggedValue::table(&[
-            UntaggedValue::string("Format".to_string()).into(),
-            UntaggedValue::string("Extension".to_string()).into(),
-            UntaggedValue::string("Description".to_string()).into(),
-        ])
-        .into();
-
-        // this table is taken straight from wikipedia with no changes
-        let table = retrieve_tables(HTML_TABLE_WIKIPEDIA_WITH_COLUMN_NAMES, &cols, true);
-        let expected = vec![
-            UntaggedValue::row(indexmap! {
-                "Format".to_string() => UntaggedValue::string("Excel Workbook").into(),
-                "Extension".to_string() => UntaggedValue::string(".xlsx").into(),
-                "Description".to_string() => UntaggedValue::string("The default Excel 2007 and later workbook format. In reality, a Zip compressed archive with a directory structure of XML text documents. Functions as the primary replacement for the former binary .xls format, although it does not support Excel macros for security reasons. Saving as .xlsx offers file size reduction over .xls[38]").into(),
-            }).into(),
-            UntaggedValue::row(indexmap! {
-                "Format".to_string() => UntaggedValue::string("Excel Macro-enabled Workbook").into(),
-                "Extension".to_string() => UntaggedValue::string(".xlsm").into(),
-                "Description".to_string() => UntaggedValue::string("As Excel Workbook, but with macro support.").into(),
-            }).into(),
-            UntaggedValue::row(indexmap! {
-                "Format".to_string() => UntaggedValue::string("Excel Binary Workbook").into(),
-                "Extension".to_string() => UntaggedValue::string(".xlsb").into(),
-                "Description".to_string() => UntaggedValue::string("As Excel Macro-enabled Workbook, but storing information in binary form rather than XML documents for opening and saving documents more quickly and efficiently. Intended especially for very large documents with tens of thousands of rows, and/or several hundreds of columns. This format is very useful for shrinking large Excel files as is often the case when doing data analysis.").into(),
-            }).into(),
-            UntaggedValue::row(indexmap! {
-                "Format".to_string() => UntaggedValue::string("Excel Macro-enabled Template").into(),
-                "Extension".to_string() => UntaggedValue::string(".xltm").into(),
-                "Description".to_string() => UntaggedValue::string("A template document that forms a basis for actual workbooks, with macro support. The replacement for the old .xlt format.").into(),
-            }).into(),
-            UntaggedValue::row(indexmap! {
-                "Format".to_string() => UntaggedValue::string("Excel Add-in").into(),
-                "Extension".to_string() => UntaggedValue::string(".xlam").into(),
-                "Description".to_string() => UntaggedValue::string("Excel add-in to add extra functionality and tools. Inherent macro support because of the file purpose.").into(),
-            }).into(),
-        ];
-
-        assert_eq!(table, expected);
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_start/Cargo.toml b/old_nushell/crates/nu_plugin_start/Cargo.toml
deleted file mode 100644
index 25789e711..000000000
--- a/old_nushell/crates/nu_plugin_start/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A plugin to open files/URLs directly from Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_start"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-glob = "0.3.0"
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-url = "2.2.0"
-webbrowser = "0.5.5"
-
-[target.'cfg(windows)'.dependencies]
-open = "1.4.0"
-
-[build-dependencies]
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-source = { version = "0.43.0", path="../nu-source" }
diff --git a/old_nushell/crates/nu_plugin_start/src/lib.rs b/old_nushell/crates/nu_plugin_start/src/lib.rs
deleted file mode 100644
index de341633d..000000000
--- a/old_nushell/crates/nu_plugin_start/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod start;
-
-pub use start::Start;
diff --git a/old_nushell/crates/nu_plugin_start/src/main.rs b/old_nushell/crates/nu_plugin_start/src/main.rs
deleted file mode 100644
index 43ef421b8..000000000
--- a/old_nushell/crates/nu_plugin_start/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_start::Start;
-
-fn main() {
-    serve_plugin(&mut Start::new());
-}
diff --git a/old_nushell/crates/nu_plugin_start/src/nu/mod.rs b/old_nushell/crates/nu_plugin_start/src/nu/mod.rs
deleted file mode 100644
index 594fe3430..000000000
--- a/old_nushell/crates/nu_plugin_start/src/nu/mod.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, ReturnValue, Signature, SyntaxShape};
-
-use crate::start::Start;
-
-impl Plugin for Start {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("start")
-            .desc("Opens each file/directory/URL using the default application")
-            .rest(
-                "rest",
-                SyntaxShape::String,
-                "files/urls/directories to open",
-            )
-            .named(
-                "application",
-                SyntaxShape::String,
-                "Specifies the application used for opening the files/directories/urls",
-                Some('a'),
-            )
-            .filter())
-    }
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        self.parse(call_info)?;
-        self.exec().map(|_| Vec::new())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_start/src/start.rs b/old_nushell/crates/nu_plugin_start/src/start.rs
deleted file mode 100644
index 068c2abb3..000000000
--- a/old_nushell/crates/nu_plugin_start/src/start.rs
+++ /dev/null
@@ -1,260 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{CallInfo, Value};
-use nu_source::{Tag, Tagged, TaggedItem};
-use std::path::Path;
-#[cfg(not(target_os = "windows"))]
-use std::process::{Command, Stdio};
-
-#[derive(Default)]
-pub struct Start {
-    pub tag: Tag,
-    pub filenames: Vec<Tagged<String>>,
-    pub application: Option<String>,
-}
-
-impl Start {
-    pub fn new() -> Start {
-        Start {
-            tag: Tag::unknown(),
-            filenames: vec![],
-            application: None,
-        }
-    }
-
-    pub fn parse(&mut self, call_info: CallInfo) -> Result<(), ShellError> {
-        self.tag = call_info.name_tag.clone();
-        self.parse_input_parameters(&call_info)?;
-        self.parse_application(&call_info);
-        Ok(())
-    }
-
-    fn add_filename(&mut self, filename: Tagged<String>) -> Result<(), ShellError> {
-        if Path::new(&filename.item).exists() || url::Url::parse(&filename.item).is_ok() {
-            self.filenames.push(filename);
-            Ok(())
-        } else {
-            Err(ShellError::labeled_error(
-                format!("The file '{}' does not exist", filename.item),
-                "doesn't exist",
-                filename.tag,
-            ))
-        }
-    }
-
-    fn glob_to_values(&self, value: &Value) -> Result<Vec<Tagged<String>>, ShellError> {
-        let mut result = vec![];
-        match glob::glob(&value.as_string()?) {
-            Ok(paths) => {
-                for path_result in paths {
-                    match path_result {
-                        Ok(path) => result
-                            .push(path.to_string_lossy().to_string().tagged(value.tag.clone())),
-                        Err(glob_error) => {
-                            return Err(ShellError::labeled_error(
-                                glob_error.to_string(),
-                                "glob error",
-                                value.tag.clone(),
-                            ));
-                        }
-                    }
-                }
-            }
-            Err(pattern_error) => {
-                return Err(ShellError::labeled_error(
-                    pattern_error.to_string(),
-                    "invalid pattern",
-                    value.tag.clone(),
-                ))
-            }
-        }
-
-        Ok(result)
-    }
-
-    fn parse_input_parameters(&mut self, call_info: &CallInfo) -> Result<(), ShellError> {
-        let candidates = match &call_info.args.positional {
-            Some(values) => {
-                let mut result = vec![];
-
-                for value in values {
-                    let val_str = value.as_string();
-                    match val_str {
-                        Ok(s) => {
-                            if s.to_ascii_lowercase().starts_with("http")
-                                || s.to_ascii_lowercase().starts_with("https")
-                            {
-                                if webbrowser::open(&s).is_ok() {
-                                    result.push("http/web".to_string().tagged_unknown())
-                                } else {
-                                    return Err(ShellError::labeled_error(
-                                        &format!("error opening {}", &s),
-                                        "error opening url",
-                                        self.tag.span,
-                                    ));
-                                }
-                            } else {
-                                let res = self.glob_to_values(value)?;
-                                result.extend(res);
-                            }
-                        }
-                        Err(e) => {
-                            return Err(ShellError::labeled_error(
-                                e.to_string(),
-                                "no input given",
-                                self.tag.span,
-                            ));
-                        }
-                    }
-                }
-
-                if result.is_empty() {
-                    return Err(ShellError::labeled_error(
-                        "No input given",
-                        "no input given",
-                        self.tag.span,
-                    ));
-                }
-                result
-            }
-            None => {
-                return Err(ShellError::labeled_error(
-                    "No input given",
-                    "no input given",
-                    self.tag.span,
-                ))
-            }
-        };
-
-        for candidate in candidates {
-            if !candidate.contains("http/web") {
-                self.add_filename(candidate)?;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn parse_application(&mut self, call_info: &CallInfo) {
-        self.application = if let Some(app) = call_info.args.get("application") {
-            match app.as_string() {
-                Ok(name) => Some(name),
-                Err(_) => None,
-            }
-        } else {
-            None
-        };
-    }
-
-    #[cfg(target_os = "macos")]
-    pub fn exec(&mut self) -> Result<(), ShellError> {
-        let mut args = vec![];
-        args.append(
-            &mut self
-                .filenames
-                .iter()
-                .map(|x| x.item.clone())
-                .collect::<Vec<_>>(),
-        );
-
-        if let Some(app_name) = &self.application {
-            args.append(&mut vec![String::from("-a"), app_name.to_string()]);
-        }
-        exec_cmd("open", &args, self.tag.clone())
-    }
-
-    #[cfg(target_os = "windows")]
-    pub fn exec(&mut self) -> Result<(), ShellError> {
-        if let Some(app_name) = &self.application {
-            for file in &self.filenames {
-                match open::with(&file.item, app_name) {
-                    Ok(_) => continue,
-                    Err(_) => {
-                        return Err(ShellError::labeled_error(
-                            "Failed to open file with specified application",
-                            "can't open with specified application",
-                            file.tag.span,
-                        ))
-                    }
-                }
-            }
-        } else {
-            for file in &self.filenames {
-                match open::that(&file.item) {
-                    Ok(_) => continue,
-                    Err(_) => {
-                        return Err(ShellError::labeled_error(
-                            "Failed to open file with default application",
-                            "can't open with default application",
-                            file.tag.span,
-                        ))
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    #[cfg(not(any(target_os = "windows", target_os = "macos")))]
-    pub fn exec(&mut self) -> Result<(), ShellError> {
-        let mut args = vec![];
-        args.append(
-            &mut self
-                .filenames
-                .iter()
-                .map(|x| x.item.clone())
-                .collect::<Vec<_>>(),
-        );
-
-        if let Some(app_name) = &self.application {
-            exec_cmd(app_name, &args, self.tag.clone())
-        } else {
-            for cmd in ["xdg-open", "gnome-open", "kde-open", "wslview"] {
-                if exec_cmd(cmd, &args, self.tag.clone()).is_err() {
-                    continue;
-                } else {
-                    return Ok(());
-                }
-            }
-            Err(ShellError::labeled_error(
-                "Failed to open file(s) with xdg-open. gnome-open, kde-open, and wslview",
-                "failed to open xdg-open. gnome-open, kde-open, and wslview",
-                self.tag.span,
-            ))
-        }
-    }
-}
-
-#[cfg(not(target_os = "windows"))]
-fn exec_cmd(cmd: &str, args: &[String], tag: Tag) -> Result<(), ShellError> {
-    if args.is_empty() {
-        return Err(ShellError::labeled_error(
-            "No file(s) or application provided",
-            "no file(s) or application provided",
-            tag,
-        ));
-    }
-    let status = match Command::new(cmd)
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .args(args)
-        .status()
-    {
-        Ok(exit_code) => exit_code,
-        Err(_) => {
-            return Err(ShellError::labeled_error(
-                "Failed to run native open syscall",
-                "failed to run native open call",
-                tag,
-            ))
-        }
-    };
-    if status.success() {
-        Ok(())
-    } else {
-        Err(ShellError::labeled_error(
-            "Failed to run start. Hint: The file(s)/application may not exist",
-            "failed to run",
-            tag,
-        ))
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_textview/Cargo.toml b/old_nushell/crates/nu_plugin_textview/Cargo.toml
deleted file mode 100644
index 722b45eb6..000000000
--- a/old_nushell/crates/nu_plugin_textview/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Text viewer plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_textview"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-data = { path="../nu-data", version = "0.43.0" }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-
-bat = { version="0.18", default-features = false,  features=["regex-onig", "paging", "git"] }
-term_size = "0.3.2"
-url = "2.2.0"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_textview/src/assets/syntaxes.bin b/old_nushell/crates/nu_plugin_textview/src/assets/syntaxes.bin
deleted file mode 100644
index dee29367c..000000000
Binary files a/old_nushell/crates/nu_plugin_textview/src/assets/syntaxes.bin and /dev/null differ
diff --git a/old_nushell/crates/nu_plugin_textview/src/assets/themes.bin b/old_nushell/crates/nu_plugin_textview/src/assets/themes.bin
deleted file mode 100644
index 23ad91328..000000000
Binary files a/old_nushell/crates/nu_plugin_textview/src/assets/themes.bin and /dev/null differ
diff --git a/old_nushell/crates/nu_plugin_textview/src/config.rs b/old_nushell/crates/nu_plugin_textview/src/config.rs
deleted file mode 100644
index 063141ee3..000000000
--- a/old_nushell/crates/nu_plugin_textview/src/config.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use nu_protocol::Value;
-
-pub struct Config {
-    pub term_width: usize,
-    pub tab_width: u64,
-    pub colored_output: bool,
-    pub true_color: bool,
-    pub header: bool,
-    pub line_numbers: bool,
-    pub grid: bool,
-    pub vcs_modification_markers: bool,
-    pub snip: bool,
-    pub wrapping_mode: bat::WrappingMode,
-    pub use_italics: bool,
-    pub paging_mode: bat::PagingMode,
-    pub pager: String,
-    pub line_ranges: bat::line_range::LineRanges,
-    // TODO: Not configurable
-    #[allow(unused)]
-    highlight_range: String,
-    // TODO: Not configurable
-    pub highlight_range_from: u64,
-    // TODO: Not configurable
-    pub highlight_range_to: u64,
-    pub theme: String,
-}
-
-impl From<&Value> for Config {
-    fn from(value: &Value) -> Self {
-        let mut config = Config::default();
-
-        for (idx, entry) in value.row_entries() {
-            match idx.as_ref() {
-                "term_width" => {
-                    config.term_width = entry.as_u64().unwrap_or(config.term_width as u64) as usize;
-                }
-                "tab_width" => {
-                    config.tab_width = entry.as_u64().unwrap_or(4_u64);
-                }
-                "colored_output" => config.colored_output = entry.as_bool().unwrap_or(true),
-                "true_color" => config.true_color = entry.as_bool().unwrap_or(true),
-                "header" => config.header = entry.as_bool().unwrap_or(true),
-                "line_numbers" => config.line_numbers = entry.as_bool().unwrap_or(true),
-                "grid" => config.grid = entry.as_bool().unwrap_or(true),
-                "vcs_modification_markers" => {
-                    config.vcs_modification_markers = entry.as_bool().unwrap_or(true)
-                }
-                "snip" => config.snip = entry.as_bool().unwrap_or(true),
-                "wrapping_mode" => {
-                    config.wrapping_mode = match entry.as_string() {
-                        Ok(s) if s.to_lowercase() == "nowrapping" => {
-                            bat::WrappingMode::NoWrapping(true)
-                        }
-                        Ok(s) if s.to_lowercase() == "character" => bat::WrappingMode::Character,
-                        _ => bat::WrappingMode::NoWrapping(true),
-                    }
-                }
-                "use_italics" => config.use_italics = entry.as_bool().unwrap_or(true),
-                "paging_mode" => {
-                    config.paging_mode = match entry.as_string() {
-                        Ok(s) if s.to_lowercase() == "always" => bat::PagingMode::Always,
-                        Ok(s) if s.to_lowercase() == "never" => bat::PagingMode::Never,
-                        Ok(s) if s.to_lowercase() == "quitifonescreen" => {
-                            bat::PagingMode::QuitIfOneScreen
-                        }
-                        _ => bat::PagingMode::QuitIfOneScreen,
-                    }
-                }
-                "pager" => config.pager = entry.as_string().unwrap_or_else(|_| "less".to_string()),
-                // TODO: not real sure what to do with this
-                "line_ranges" => config.line_ranges = bat::line_range::LineRanges::all(),
-                "highlight_range" => config.highlight_range = "0,0".into(),
-                "theme" => {
-                    config.theme = entry
-                        .as_string()
-                        .unwrap_or_else(|_| "OneDarkHalf".to_string())
-                }
-                _ => (),
-            }
-        }
-
-        config
-    }
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        let (term_width, _) = term_size::dimensions().unwrap_or((80, 20));
-
-        Self {
-            term_width,
-            tab_width: 4,
-            colored_output: true,
-            true_color: true,
-            header: true,
-            line_numbers: true,
-            grid: true,
-            vcs_modification_markers: true,
-            snip: true,
-            wrapping_mode: bat::WrappingMode::NoWrapping(true),
-            use_italics: true,
-            paging_mode: bat::PagingMode::QuitIfOneScreen,
-            pager: "less".into(),
-            line_ranges: bat::line_range::LineRanges::all(),
-            highlight_range: "0.0".into(),
-            highlight_range_from: 0,
-            highlight_range_to: 0,
-            theme: "OneHalfDark".into(),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_textview/src/lib.rs b/old_nushell/crates/nu_plugin_textview/src/lib.rs
deleted file mode 100644
index 9fc844450..000000000
--- a/old_nushell/crates/nu_plugin_textview/src/lib.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod config;
-mod nu;
-mod textview;
-
-pub use textview::TextView;
diff --git a/old_nushell/crates/nu_plugin_textview/src/main.rs b/old_nushell/crates/nu_plugin_textview/src/main.rs
deleted file mode 100644
index 1425efead..000000000
--- a/old_nushell/crates/nu_plugin_textview/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_textview::TextView;
-
-fn main() {
-    serve_plugin(&mut TextView::new());
-}
diff --git a/old_nushell/crates/nu_plugin_textview/src/nu/mod.rs b/old_nushell/crates/nu_plugin_textview/src/nu/mod.rs
deleted file mode 100644
index 43bc314b7..000000000
--- a/old_nushell/crates/nu_plugin_textview/src/nu/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use crate::textview::{view_text_value, TextView};
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Signature, Value};
-
-impl Plugin for TextView {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("textview").desc("Autoview of text data."))
-    }
-
-    fn sink(&mut self, _call_info: CallInfo, input: Vec<Value>) {
-        if !input.is_empty() {
-            view_text_value(&input[0]);
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_textview/src/textview.rs b/old_nushell/crates/nu_plugin_textview/src/textview.rs
deleted file mode 100644
index b96c0632a..000000000
--- a/old_nushell/crates/nu_plugin_textview/src/textview.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use crate::config::Config;
-use nu_protocol::{Primitive, UntaggedValue, Value};
-use nu_source::{AnchorLocation, Tag};
-use std::path::Path;
-
-#[derive(Default)]
-pub struct TextView;
-
-impl TextView {
-    pub fn new() -> TextView {
-        TextView
-    }
-}
-
-fn get_file_path(source: AnchorLocation) -> Option<String> {
-    match source {
-        AnchorLocation::File(file) => {
-            let path = Path::new(&file);
-
-            Some(path.to_string_lossy().to_string())
-        }
-        AnchorLocation::Url(url) => url::Url::parse(&url).ok().and_then(|url| {
-            url.path_segments().and_then(|mut segments| {
-                segments
-                    .next_back()
-                    .map(|segment| Path::new(segment).to_string_lossy().to_string())
-            })
-        }),
-        //FIXME: this probably isn't correct
-        AnchorLocation::Source(_source) => None,
-    }
-}
-
-#[allow(clippy::cognitive_complexity)]
-pub fn view_text_value(value: &Value) {
-    let config = nu_data::config::config(Tag::unknown())
-        .ok()
-        .and_then(|config| config.get("textview").map(Config::from))
-        .unwrap_or_default();
-
-    if let UntaggedValue::Primitive(Primitive::String(ref s)) = &value.value {
-        let mut printer = bat::PrettyPrinter::new();
-
-        printer
-            .term_width(config.term_width)
-            .tab_width(Some(config.tab_width as usize))
-            .colored_output(config.colored_output)
-            .true_color(config.true_color)
-            .header(config.header)
-            .line_numbers(config.line_numbers)
-            .grid(config.grid)
-            .vcs_modification_markers(config.vcs_modification_markers)
-            .snip(config.snip)
-            .wrapping_mode(config.wrapping_mode)
-            .use_italics(config.use_italics)
-            .paging_mode(config.paging_mode)
-            .pager(&config.pager)
-            .line_ranges(config.line_ranges)
-            .highlight_range(
-                config.highlight_range_from as usize,
-                config.highlight_range_to as usize,
-            )
-            .theme(&config.theme);
-
-        match value.anchor().and_then(get_file_path) {
-            Some(file_path) => printer.input(bat::Input::from_bytes(s.as_bytes()).name(file_path)),
-            None => printer.input_from_bytes(s.as_bytes()),
-        };
-
-        printer.print().expect("Error with bat PrettyPrint");
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_to_bson/Cargo.toml b/old_nushell/crates/nu_plugin_to_bson/Cargo.toml
deleted file mode 100644
index a1ecab6b3..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A converter plugin to the bson format for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_to_bson"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-bson = { version = "2.0.1", features = [ "chrono-0_4" ] }
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-num-traits = "0.2.14"
-
-[features]
-dataframe = ["nu-protocol/dataframe"]
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_to_bson/src/lib.rs b/old_nushell/crates/nu_plugin_to_bson/src/lib.rs
deleted file mode 100644
index 9193d10c5..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod to_bson;
-
-pub use to_bson::ToBson;
diff --git a/old_nushell/crates/nu_plugin_to_bson/src/main.rs b/old_nushell/crates/nu_plugin_to_bson/src/main.rs
deleted file mode 100644
index 47d3f0468..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_to_bson::ToBson;
-
-fn main() {
-    serve_plugin(&mut ToBson::new())
-}
diff --git a/old_nushell/crates/nu_plugin_to_bson/src/nu/mod.rs b/old_nushell/crates/nu_plugin_to_bson/src/nu/mod.rs
deleted file mode 100644
index 515fafe21..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/src/nu/mod.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::ToBson;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{ReturnValue, Signature, Value};
-use nu_source::Tag;
-
-impl Plugin for ToBson {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("to bson")
-            .desc("Convert table into .bson binary")
-            .filter())
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        self.state.push(input);
-        Ok(vec![])
-    }
-
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        Ok(crate::to_bson::to_bson(self.state.clone(), Tag::unknown()))
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_to_bson/src/nu/tests.rs b/old_nushell/crates/nu_plugin_to_bson/src/nu/tests.rs
deleted file mode 100644
index d14c19bee..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/src/nu/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration {}
diff --git a/old_nushell/crates/nu_plugin_to_bson/src/to_bson.rs b/old_nushell/crates/nu_plugin_to_bson/src/to_bson.rs
deleted file mode 100644
index b4bf79c5e..000000000
--- a/old_nushell/crates/nu_plugin_to_bson/src/to_bson.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-use bson::{oid::ObjectId, spec::BinarySubtype, Bson, Document};
-use nu_errors::{CoerceInto, ShellError};
-use nu_protocol::{
-    Dictionary, Primitive, ReturnSuccess, ReturnValue, SpannedTypeName, UnspannedPathMember,
-    UntaggedValue, Value,
-};
-use nu_source::{Tag, TaggedItem};
-use num_traits::ToPrimitive;
-use std::convert::TryInto;
-
-#[derive(Default)]
-pub struct ToBson {
-    pub state: Vec<Value>,
-}
-
-impl ToBson {
-    pub fn new() -> ToBson {
-        ToBson { state: vec![] }
-    }
-}
-
-pub fn value_to_bson_value(v: &Value) -> Result<Bson, ShellError> {
-    Ok(match &v.value {
-        UntaggedValue::Primitive(Primitive::Boolean(b)) => Bson::Boolean(*b),
-        // FIXME: What about really big decimals?
-        UntaggedValue::Primitive(Primitive::Filesize(decimal)) => Bson::Double(
-            (decimal)
-                .to_f64()
-                .expect("Unimplemented BUG: What about big decimals?"),
-        ),
-        UntaggedValue::Primitive(Primitive::Duration(i)) => Bson::String(i.to_string()),
-        UntaggedValue::Primitive(Primitive::Date(d)) => {
-            Bson::DateTime(bson::DateTime::from_chrono(*d))
-        }
-        UntaggedValue::Primitive(Primitive::EndOfStream) => Bson::Null,
-        UntaggedValue::Primitive(Primitive::BeginningOfStream) => Bson::Null,
-        UntaggedValue::Primitive(Primitive::Decimal(d)) => {
-            Bson::Double(d.to_f64().ok_or_else(|| {
-                ShellError::labeled_error(
-                    "Could not convert value to decimal",
-                    "could not convert to decimal",
-                    &v.tag,
-                )
-            })?)
-        }
-        UntaggedValue::Primitive(Primitive::Int(i)) => Bson::Int64(*i),
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => {
-            Bson::Int64(i.tagged(&v.tag).coerce_into("converting to BSON")?)
-        }
-        UntaggedValue::Primitive(Primitive::Nothing) => Bson::Null,
-        UntaggedValue::Primitive(Primitive::String(s)) => Bson::String(s.clone()),
-        UntaggedValue::Primitive(Primitive::ColumnPath(path)) => Bson::Array(
-            path.iter()
-                .map(|x| match &x.unspanned {
-                    UnspannedPathMember::String(string) => Ok(Bson::String(string.clone())),
-                    UnspannedPathMember::Int(int) => Ok(Bson::Int64(*int)),
-                })
-                .collect::<Result<Vec<Bson>, ShellError>>()?,
-        ),
-        UntaggedValue::Primitive(Primitive::GlobPattern(p)) => Bson::String(p.clone()),
-        UntaggedValue::Primitive(Primitive::FilePath(s)) => Bson::String(s.display().to_string()),
-        UntaggedValue::Table(l) => Bson::Array(
-            l.iter()
-                .map(value_to_bson_value)
-                .collect::<Result<_, _>>()?,
-        ),
-        UntaggedValue::Block(_) | UntaggedValue::Primitive(Primitive::Range(_)) => Bson::Null,
-        #[cfg(feature = "dataframe")]
-        UntaggedValue::DataFrame(_) | UntaggedValue::FrameStruct(_) => Bson::Null,
-        UntaggedValue::Error(e) => return Err(e.clone()),
-        UntaggedValue::Primitive(Primitive::Binary(b)) => Bson::Binary(bson::Binary {
-            subtype: BinarySubtype::Generic,
-            bytes: b.clone(),
-        }),
-        UntaggedValue::Row(o) => object_value_to_bson(o)?,
-        // TODO  Impelmenting Bson::Undefined, Bson::MaxKey, Bson::MinKey and Bson::DbPointer
-        // These Variants weren't present in the previous version.
-    })
-}
-
-// object_value_to_bson handles all Objects, even those that correspond to special
-// types (things like regex or javascript code).
-fn object_value_to_bson(o: &Dictionary) -> Result<Bson, ShellError> {
-    let mut it = o.entries.iter();
-    if it.len() > 2 {
-        return generic_object_value_to_bson(o);
-    }
-    match it.next() {
-        Some((regex, tagged_regex_value)) if regex == "$regex" => match it.next() {
-            Some((options, tagged_opts_value)) if options == "$options" => {
-                let r: Result<String, _> = tagged_regex_value.try_into();
-                let opts: Result<String, _> = tagged_opts_value.try_into();
-                match (r, opts) {
-                    (Ok(pattern), Ok(options)) => {
-                        Ok(Bson::RegularExpression(bson::Regex { pattern, options }))
-                    }
-                    _ => generic_object_value_to_bson(o),
-                }
-            }
-            _ => generic_object_value_to_bson(o),
-        },
-        Some((javascript, tagged_javascript_value)) if javascript == "$javascript" => {
-            match it.next() {
-                Some((scope, tagged_scope_value)) if scope == "$scope" => {
-                    let js: Result<String, _> = tagged_javascript_value.try_into();
-                    let s: Result<&Dictionary, _> = tagged_scope_value.try_into();
-
-                    match (js, s) {
-                        (Ok(code), Ok(s)) => {
-                            if let Bson::Document(scope) = object_value_to_bson(s)? {
-                                Ok(Bson::JavaScriptCodeWithScope(
-                                    bson::JavaScriptCodeWithScope { code, scope },
-                                ))
-                            } else {
-                                generic_object_value_to_bson(o)
-                            }
-                        }
-                        _ => generic_object_value_to_bson(o),
-                    }
-                }
-                None => {
-                    let js: Result<String, _> = tagged_javascript_value.try_into();
-
-                    match js {
-                        Err(_) => generic_object_value_to_bson(o),
-                        Ok(v) => Ok(Bson::JavaScriptCode(v)),
-                    }
-                }
-                _ => generic_object_value_to_bson(o),
-            }
-        }
-        Some((timestamp, tagged_timestamp_value)) if timestamp == "$timestamp" => {
-            let ts: Result<i64, _> = tagged_timestamp_value.try_into();
-            if let Ok(time) = ts {
-                Ok(Bson::Timestamp(bson::Timestamp {
-                    time: time as u32,
-                    increment: Default::default(),
-                }))
-            } else {
-                generic_object_value_to_bson(o)
-            }
-        }
-        Some((binary_subtype, tagged_binary_subtype_value))
-            if binary_subtype == "$binary_subtype" =>
-        {
-            match it.next() {
-                Some((binary, tagged_bin_value)) if binary == "$binary" => {
-                    let bst = get_binary_subtype(tagged_binary_subtype_value);
-                    let bin: Result<Vec<u8>, _> = tagged_bin_value.try_into();
-
-                    match (bin, bst) {
-                        (Ok(bin), Ok(subtype)) => Ok(Bson::Binary(bson::Binary {
-                            subtype,
-                            bytes: bin,
-                        })),
-                        _ => generic_object_value_to_bson(o),
-                    }
-                }
-                _ => generic_object_value_to_bson(o),
-            }
-        }
-        Some((object_id, tagged_object_id_value)) if object_id == "$object_id" => {
-            let obj_id: Result<String, _> = tagged_object_id_value.try_into();
-
-            if let Ok(obj_id) = obj_id {
-                let obj_id = ObjectId::parse_str(&obj_id);
-
-                if let Ok(obj_id) = obj_id {
-                    Ok(Bson::ObjectId(obj_id))
-                } else {
-                    generic_object_value_to_bson(o)
-                }
-            } else {
-                generic_object_value_to_bson(o)
-            }
-        }
-        Some((symbol, tagged_symbol_value)) if symbol == "$symbol" => {
-            let sym: Result<String, _> = tagged_symbol_value.try_into();
-            if let Ok(sym) = sym {
-                Ok(Bson::Symbol(sym))
-            } else {
-                generic_object_value_to_bson(o)
-            }
-        }
-        _ => generic_object_value_to_bson(o),
-    }
-}
-
-fn get_binary_subtype(tagged_value: &Value) -> Result<BinarySubtype, ShellError> {
-    match &tagged_value.value {
-        UntaggedValue::Primitive(Primitive::String(s)) => Ok(match s.as_ref() {
-            "generic" => BinarySubtype::Generic,
-            "function" => BinarySubtype::Function,
-            "binary_old" => BinarySubtype::BinaryOld,
-            "uuid_old" => BinarySubtype::UuidOld,
-            "uuid" => BinarySubtype::Uuid,
-            "md5" => BinarySubtype::Md5,
-            _ => unreachable!(),
-        }),
-        UntaggedValue::Primitive(Primitive::BigInt(i)) => Ok(BinarySubtype::UserDefined(
-            i.tagged(&tagged_value.tag)
-                .coerce_into("converting to BSON binary subtype")?,
-        )),
-        _ => Err(ShellError::type_error(
-            "bson binary",
-            tagged_value.spanned_type_name(),
-        )),
-    }
-}
-
-// generic_object_value_bson handles any Object that does not
-// correspond to a special bson type (things like regex or javascript code).
-fn generic_object_value_to_bson(o: &Dictionary) -> Result<Bson, ShellError> {
-    let mut doc = Document::new();
-    for (k, v) in &o.entries {
-        doc.insert(k.clone(), value_to_bson_value(v)?);
-    }
-    Ok(Bson::Document(doc))
-}
-
-fn shell_encode_document(writer: &mut Vec<u8>, doc: Document, tag: Tag) -> Result<(), ShellError> {
-    match doc.to_writer(writer) {
-        Err(e) => Err(ShellError::labeled_error(
-            format!("Failed to encode document due to: {:?}", e),
-            "requires BSON-compatible document",
-            tag,
-        )),
-        _ => Ok(()),
-    }
-}
-
-fn bson_value_to_bytes(bson: Bson, tag: Tag) -> Result<Vec<u8>, ShellError> {
-    let mut out = Vec::new();
-    match bson {
-        Bson::Array(a) => {
-            for v in a {
-                match v {
-                    Bson::Document(d) => shell_encode_document(&mut out, d, tag.clone())?,
-                    _ => {
-                        return Err(ShellError::labeled_error(
-                            format!("All top level values must be Documents, got {:?}", v),
-                            "requires BSON-compatible document",
-                            &tag,
-                        ))
-                    }
-                }
-            }
-        }
-        Bson::Document(d) => shell_encode_document(&mut out, d, tag)?,
-        _ => {
-            return Err(ShellError::labeled_error(
-                format!("All top level values must be Documents, got {:?}", bson),
-                "requires BSON-compatible document",
-                tag,
-            ))
-        }
-    }
-    Ok(out)
-}
-
-pub fn to_bson(input: Vec<Value>, name_tag: Tag) -> Vec<ReturnValue> {
-    let name_span = name_tag.span;
-
-    let to_process_input = match input.len() {
-        x if x > 1 => {
-            let tag = input[0].tag.clone();
-            vec![Value {
-                value: UntaggedValue::Table(input),
-                tag,
-            }]
-        }
-        1 => input,
-        _ => vec![],
-    };
-
-    to_process_input
-        .into_iter()
-        .map(move |value| match value_to_bson_value(&value) {
-            Ok(bson_value) => {
-                let value_span = value.tag.span;
-
-                match bson_value_to_bytes(bson_value, name_tag.clone()) {
-                    Ok(x) => ReturnSuccess::value(UntaggedValue::binary(x).into_value(name_span)),
-                    _ => Err(ShellError::labeled_error_with_secondary(
-                        "Expected a table with BSON-compatible structure from pipeline",
-                        "requires BSON-compatible input",
-                        name_span,
-                        "originates from here".to_string(),
-                        value_span,
-                    )),
-                }
-            }
-            _ => Err(ShellError::labeled_error(
-                "Expected a table with BSON-compatible structure from pipeline",
-                "requires BSON-compatible input",
-                &name_tag,
-            )),
-        })
-        .collect()
-}
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/Cargo.toml b/old_nushell/crates/nu_plugin_to_sqlite/Cargo.toml
deleted file mode 100644
index 472b0c8ad..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "A converter plugin to the SQLite format for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_to_sqlite"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-hex = "0.4.2"
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-nu-source = { path="../nu-source", version = "0.43.0" }
-tempfile = "3.2.0"
-
-[dependencies.rusqlite]
-features = ["bundled", "blob"]
-version = "0.26.1"
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/src/lib.rs b/old_nushell/crates/nu_plugin_to_sqlite/src/lib.rs
deleted file mode 100644
index 3e814f55b..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod to_sqlite;
-
-pub use to_sqlite::ToSqlite;
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/src/main.rs b/old_nushell/crates/nu_plugin_to_sqlite/src/main.rs
deleted file mode 100644
index 5f6923225..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_to_sqlite::ToSqlite;
-
-fn main() {
-    serve_plugin(&mut ToSqlite::new())
-}
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/src/nu/mod.rs b/old_nushell/crates/nu_plugin_to_sqlite/src/nu/mod.rs
deleted file mode 100644
index 08288db45..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/src/nu/mod.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#[cfg(test)]
-mod tests;
-
-use crate::ToSqlite;
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{ReturnValue, Signature, Value};
-use nu_source::Tag;
-
-impl Plugin for ToSqlite {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("to sqlite")
-            .desc("Convert table into sqlite binary")
-            .filter())
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        self.state.push(input);
-        Ok(vec![])
-    }
-
-    fn end_filter(&mut self) -> Result<Vec<ReturnValue>, ShellError> {
-        crate::to_sqlite::to_sqlite(self.state.clone(), Tag::unknown())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/src/nu/tests.rs b/old_nushell/crates/nu_plugin_to_sqlite/src/nu/tests.rs
deleted file mode 100644
index d14c19bee..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/src/nu/tests.rs
+++ /dev/null
@@ -1 +0,0 @@
-mod integration {}
diff --git a/old_nushell/crates/nu_plugin_to_sqlite/src/to_sqlite.rs b/old_nushell/crates/nu_plugin_to_sqlite/src/to_sqlite.rs
deleted file mode 100644
index 69466338c..000000000
--- a/old_nushell/crates/nu_plugin_to_sqlite/src/to_sqlite.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use hex::encode;
-use nu_errors::ShellError;
-use nu_protocol::{Dictionary, Primitive, ReturnSuccess, ReturnValue, UntaggedValue, Value};
-use nu_source::Tag;
-use rusqlite::Connection;
-use std::io::Read;
-
-#[derive(Default)]
-pub struct ToSqlite {
-    pub state: Vec<Value>,
-}
-
-impl ToSqlite {
-    pub fn new() -> ToSqlite {
-        ToSqlite { state: vec![] }
-    }
-}
-fn comma_concat(acc: String, current: String) -> String {
-    if acc.is_empty() {
-        current
-    } else {
-        format!("{}, {}", acc, current)
-    }
-}
-
-fn get_columns(rows: &[Value]) -> Result<String, std::io::Error> {
-    match &rows[0].value {
-        UntaggedValue::Row(d) => Ok(d
-            .entries
-            .iter()
-            .map(|(k, _v)| k.clone())
-            .fold("".to_string(), comma_concat)),
-        _ => Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
-            "Could not find table column names",
-        )),
-    }
-}
-
-fn nu_value_to_sqlite_string(v: Value) -> String {
-    match &v.value {
-        UntaggedValue::Primitive(p) => match p {
-            Primitive::Nothing => "NULL".into(),
-            Primitive::BigInt(i) => i.to_string(),
-            Primitive::Int(i) => i.to_string(),
-            Primitive::Duration(i) => i.to_string(),
-            Primitive::Decimal(f) => f.to_string(),
-            Primitive::Filesize(u) => u.to_string(),
-            Primitive::GlobPattern(s) => format!("'{}'", s.replace("'", "''")),
-            Primitive::String(s) => format!("'{}'", s.replace("'", "''")),
-            Primitive::Boolean(true) => "1".into(),
-            Primitive::Boolean(_) => "0".into(),
-            Primitive::Date(d) => format!("'{}'", d),
-            Primitive::FilePath(p) => format!("'{}'", p.display().to_string().replace("'", "''")),
-            Primitive::Binary(u) => format!("x'{}'", encode(u)),
-            Primitive::BeginningOfStream
-            | Primitive::EndOfStream
-            | Primitive::ColumnPath(_)
-            | Primitive::Range(_) => "NULL".into(),
-        },
-        _ => "NULL".into(),
-    }
-}
-
-fn get_insert_values(rows: Vec<Value>) -> Result<String, std::io::Error> {
-    let values: Result<Vec<_>, _> = rows
-        .into_iter()
-        .map(|value| match value.value {
-            UntaggedValue::Row(d) => Ok(format!(
-                "({})",
-                d.entries
-                    .iter()
-                    .map(|(_k, v)| nu_value_to_sqlite_string(v.clone()))
-                    .fold("".to_string(), comma_concat)
-            )),
-            _ => Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Could not find table column names",
-            )),
-        })
-        .collect();
-    let values = values?;
-    Ok(values.join(", "))
-}
-
-fn generate_statements(table: Dictionary) -> Result<(String, String), std::io::Error> {
-    let table_name = match table.entries.get("table_name") {
-        Some(Value {
-            value: UntaggedValue::Primitive(Primitive::String(table_name)),
-            ..
-        }) => table_name,
-        _ => {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Could not find table name",
-            ))
-        }
-    };
-    let (columns, insert_values) = match table.entries.get("table_values") {
-        Some(Value {
-            value: UntaggedValue::Table(l),
-            ..
-        }) => {
-            if l.is_empty() {
-                return Ok((String::new(), String::new()));
-            }
-            (get_columns(l), get_insert_values(l.to_vec()))
-        }
-        _ => {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Could not find table values",
-            ))
-        }
-    };
-
-    let create = format!("create table {}({})", table_name, columns?);
-    let insert = format!("insert into {} values {}", table_name, insert_values?);
-    Ok((create, insert))
-}
-
-fn sqlite_input_stream_to_bytes(values: Vec<Value>) -> Result<Value, std::io::Error> {
-    // FIXME: should probably write a sqlite virtual filesystem
-    // that will allow us to use bytes as a file to avoid this
-    // write out, but this will require C code. Might be
-    // best done as a PR to rusqlite.
-    let mut tempfile = tempfile::NamedTempFile::new()?;
-    let conn = match Connection::open(tempfile.path()) {
-        Ok(conn) => conn,
-        Err(e) => return Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
-    };
-    let tag = values[0].tag.clone();
-    for value in values {
-        match &value.value {
-            UntaggedValue::Row(d) => {
-                let (create, insert) = generate_statements(d.to_owned())?;
-                if create.is_empty() {
-                    continue;
-                }
-                match conn
-                    .execute(&create, [])
-                    .and_then(|_| conn.execute(&insert, []))
-                {
-                    Ok(_) => (),
-                    Err(e) => {
-                        return Err(std::io::Error::new(std::io::ErrorKind::Other, e));
-                    }
-                }
-            }
-            other => {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::Other,
-                    format!("Expected row, found {:?}", other),
-                ))
-            }
-        }
-    }
-    let mut out = Vec::new();
-    tempfile.read_to_end(&mut out)?;
-    Ok(UntaggedValue::binary(out).into_value(tag))
-}
-
-pub fn to_sqlite(input: Vec<Value>, name_tag: Tag) -> Result<Vec<ReturnValue>, ShellError> {
-    match sqlite_input_stream_to_bytes(input) {
-        Ok(out) => Ok(vec![ReturnSuccess::value(out)]),
-        _ => Err(ShellError::labeled_error(
-            "Expected a table with SQLite-compatible structure from pipeline",
-            "requires SQLite-compatible input",
-            name_tag,
-        )),
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_tree/Cargo.toml b/old_nushell/crates/nu_plugin_tree/Cargo.toml
deleted file mode 100644
index 2286a50e9..000000000
--- a/old_nushell/crates/nu_plugin_tree/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Tree viewer plugin for Nushell"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_tree"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-derive-new = "0.5.8"
-nu-errors = { path="../nu-errors", version = "0.43.0" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { path="../nu-protocol", version = "0.43.0" }
-ptree = { version = "0.4.0", default-features = false }
-
-
-[build-dependencies]
diff --git a/old_nushell/crates/nu_plugin_tree/src/lib.rs b/old_nushell/crates/nu_plugin_tree/src/lib.rs
deleted file mode 100644
index d71f024ce..000000000
--- a/old_nushell/crates/nu_plugin_tree/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod tree;
-
-pub use tree::TreeViewer;
diff --git a/old_nushell/crates/nu_plugin_tree/src/main.rs b/old_nushell/crates/nu_plugin_tree/src/main.rs
deleted file mode 100644
index 7ba6d9ea5..000000000
--- a/old_nushell/crates/nu_plugin_tree/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_tree::TreeViewer;
-
-fn main() {
-    serve_plugin(&mut TreeViewer);
-}
diff --git a/old_nushell/crates/nu_plugin_tree/src/nu/mod.rs b/old_nushell/crates/nu_plugin_tree/src/nu/mod.rs
deleted file mode 100644
index fcec4e9bd..000000000
--- a/old_nushell/crates/nu_plugin_tree/src/nu/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{CallInfo, Signature, Value};
-
-use crate::tree::TreeView;
-use crate::TreeViewer;
-
-impl Plugin for TreeViewer {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("tree").desc("View the contents of the pipeline as a tree."))
-    }
-
-    fn sink(&mut self, _call_info: CallInfo, input: Vec<Value>) {
-        for i in &input {
-            let view = TreeView::from_value(i);
-            let _ = view.render_view();
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_tree/src/tree.rs b/old_nushell/crates/nu_plugin_tree/src/tree.rs
deleted file mode 100644
index 7a84f8cad..000000000
--- a/old_nushell/crates/nu_plugin_tree/src/tree.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use derive_new::new;
-use nu_errors::ShellError;
-use nu_protocol::{format_primitive, UntaggedValue, Value};
-use ptree::item::StringItem;
-use ptree::output::print_tree_with;
-use ptree::print_config::PrintConfig;
-use ptree::style::{Color, Style};
-use ptree::TreeBuilder;
-
-pub struct TreeViewer;
-#[derive(new)]
-pub struct TreeView {
-    tree: StringItem,
-}
-
-impl TreeView {
-    fn from_value_helper(value: &UntaggedValue, mut builder: &mut TreeBuilder) {
-        match value {
-            UntaggedValue::Primitive(p) => {
-                let _ = builder.add_empty_child(format_primitive(p, None));
-            }
-            UntaggedValue::Row(o) => {
-                for (k, v) in &o.entries {
-                    builder = builder.begin_child(k.clone());
-                    Self::from_value_helper(v, builder);
-                    builder = builder.end_child();
-                }
-            }
-            UntaggedValue::Table(l) => {
-                for elem in l {
-                    Self::from_value_helper(elem, builder);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn from_value(value: &Value) -> TreeView {
-        let descs = value.data_descriptors();
-
-        let mut tree = TreeBuilder::new("".to_string());
-        let mut builder = &mut tree;
-
-        for desc in descs {
-            let value = match &value.value {
-                UntaggedValue::Row(d) => d.get_data(&desc).borrow().clone(),
-                _ => value.clone(),
-            };
-            builder = builder.begin_child(desc.clone());
-            Self::from_value_helper(&value, builder);
-            builder = builder.end_child();
-            //entries.push((desc.name.clone(), value.borrow().copy()))
-        }
-
-        TreeView::new(builder.build())
-    }
-
-    pub fn render_view(&self) -> Result<(), ShellError> {
-        // Set up the print configuration
-        let config = {
-            let mut config = PrintConfig::from_env();
-            config.branch = Style {
-                foreground: Some(Color::Green),
-                dimmed: true,
-                ..Style::default()
-            };
-            config.leaf = Style {
-                bold: true,
-                ..Style::default()
-            };
-            config.indent = 4;
-            config
-        };
-
-        // Print out the tree using custom formatting
-        print_tree_with(&self.tree, &config)?;
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_xpath/Cargo.toml b/old_nushell/crates/nu_plugin_xpath/Cargo.toml
deleted file mode 100644
index 296d7eca9..000000000
--- a/old_nushell/crates/nu_plugin_xpath/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Nu Project Contributors"]
-description = "Traverses xml"
-edition = "2018"
-license = "MIT"
-name = "nu_plugin_xpath"
-version = "0.43.0"
-
-[lib]
-doctest = false
-
-[dependencies]
-nu-errors = { version = "0.43.0", path="../nu-errors" }
-nu-plugin = { path="../nu-plugin", version = "0.43.0" }
-nu-protocol = { version = "0.43.0", path="../nu-protocol" }
-nu-source = { version = "0.43.0", path="../nu-source" }
-
-bigdecimal = { package = "bigdecimal", version = "0.3.0", features = ["serde"] }
-indexmap = { version="1.6.1", features=["serde-1"] }
-sxd-document = "0.3.2"
-sxd-xpath = "0.4.2"
-
-[dev-dependencies]
-nu-test-support = { path="../nu-test-support", version = "0.43.0" }
diff --git a/old_nushell/crates/nu_plugin_xpath/src/lib.rs b/old_nushell/crates/nu_plugin_xpath/src/lib.rs
deleted file mode 100644
index 7d6683f86..000000000
--- a/old_nushell/crates/nu_plugin_xpath/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-mod nu;
-mod xpath;
-
-pub use xpath::Xpath;
diff --git a/old_nushell/crates/nu_plugin_xpath/src/main.rs b/old_nushell/crates/nu_plugin_xpath/src/main.rs
deleted file mode 100644
index 66ae2ee15..000000000
--- a/old_nushell/crates/nu_plugin_xpath/src/main.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_xpath::Xpath;
-
-fn main() {
-    serve_plugin(&mut Xpath::new());
-}
diff --git a/old_nushell/crates/nu_plugin_xpath/src/nu/mod.rs b/old_nushell/crates/nu_plugin_xpath/src/nu/mod.rs
deleted file mode 100644
index 80619aa10..000000000
--- a/old_nushell/crates/nu_plugin_xpath/src/nu/mod.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use nu_errors::ShellError;
-use nu_plugin::Plugin;
-use nu_protocol::{
-    CallInfo, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value,
-};
-use nu_source::TaggedItem;
-
-use crate::{xpath::string_to_value, Xpath};
-
-impl Plugin for Xpath {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("xpath")
-            .desc("execute xpath query on xml")
-            .required("query", SyntaxShape::String, "xpath query")
-            .filter())
-    }
-
-    fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
-        let tag = call_info.name_tag;
-
-        let query = call_info.args.nth(0).ok_or_else(|| {
-            ShellError::labeled_error("xpath query not passed", "xpath query not passed", &tag)
-        })?;
-
-        self.query = query.as_string()?;
-        self.tag = tag;
-
-        Ok(vec![])
-    }
-
-    fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
-        match input {
-            Value {
-                value: UntaggedValue::Primitive(Primitive::String(s)),
-                ..
-            } => Ok(string_to_value(s, (*self.query).tagged(&self.tag))?
-                .into_iter()
-                .map(ReturnSuccess::value)
-                .collect()),
-            Value { tag, .. } => Err(ShellError::labeled_error_with_secondary(
-                "Expected text from pipeline",
-                "requires text input",
-                &self.tag,
-                "value originates from here",
-                tag,
-            )),
-        }
-    }
-}
diff --git a/old_nushell/crates/nu_plugin_xpath/src/xpath.rs b/old_nushell/crates/nu_plugin_xpath/src/xpath.rs
deleted file mode 100644
index 17e469541..000000000
--- a/old_nushell/crates/nu_plugin_xpath/src/xpath.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use nu_errors::ShellError;
-use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value};
-use nu_source::{Tag, Tagged};
-
-use bigdecimal::{BigDecimal, FromPrimitive};
-
-use sxd_document::parser;
-use sxd_xpath::{Context, Factory};
-
-pub struct Xpath {
-    pub query: String,
-    pub tag: Tag,
-}
-
-impl Xpath {
-    pub fn new() -> Xpath {
-        Xpath {
-            query: String::new(),
-            tag: Tag::unknown(),
-        }
-    }
-}
-
-impl Default for Xpath {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-pub fn string_to_value(raw: String, query: Tagged<&str>) -> Result<Vec<Value>, ShellError> {
-    execute_xpath_query(raw, query.item.to_string(), query.tag())
-}
-
-fn execute_xpath_query(
-    input_string: String,
-    query_string: String,
-    tag: impl Into<Tag>,
-) -> Result<Vec<Value>, ShellError> {
-    let tag = tag.into();
-    let xpath = build_xpath(&query_string)?;
-
-    let package = parser::parse(&input_string);
-
-    if package.is_err() {
-        return Err(ShellError::labeled_error(
-            "invalid xml document",
-            "invalid xml document",
-            tag.span,
-        ));
-    }
-
-    let package = package.expect("invalid xml document");
-
-    let document = package.as_document();
-    let context = Context::new();
-
-    // leaving this here for augmentation at some point
-    // build_variables(&arguments, &mut context);
-    // build_namespaces(&arguments, &mut context);
-
-    let res = xpath.evaluate(&context, document.root());
-
-    // Some xpath statements can be long, so let's truncate it with ellipsis
-    let mut key = query_string.clone();
-    if query_string.len() >= 20 {
-        key.truncate(17);
-        key += "...";
-    } else {
-        key = query_string;
-    };
-
-    match res {
-        Ok(r) => {
-            let rows: Vec<Value> = match r {
-                sxd_xpath::Value::Nodeset(ns) => ns
-                    .into_iter()
-                    .map(|a| {
-                        let mut row = TaggedDictBuilder::new(Tag::unknown());
-                        row.insert_value(&key, UntaggedValue::string(a.string_value()));
-                        row.into_value()
-                    })
-                    .collect::<Vec<Value>>(),
-                sxd_xpath::Value::Boolean(b) => {
-                    let mut row = TaggedDictBuilder::new(Tag::unknown());
-                    row.insert_value(&key, UntaggedValue::boolean(b));
-                    vec![row.into_value()]
-                }
-                sxd_xpath::Value::Number(n) => {
-                    let mut row = TaggedDictBuilder::new(Tag::unknown());
-                    row.insert_value(
-                        &key,
-                        UntaggedValue::decimal(BigDecimal::from_f64(n).expect("error with f64"))
-                            .into_untagged_value(),
-                    );
-
-                    vec![row.into_value()]
-                }
-                sxd_xpath::Value::String(s) => {
-                    let mut row = TaggedDictBuilder::new(Tag::unknown());
-                    row.insert_value(&key, UntaggedValue::string(s));
-                    vec![row.into_value()]
-                }
-            };
-
-            Ok(rows)
-        }
-        Err(_) => Err(ShellError::labeled_error(
-            "xpath query error",
-            "xpath query error",
-            tag,
-        )),
-    }
-}
-
-fn build_xpath(xpath_str: &str) -> Result<sxd_xpath::XPath, ShellError> {
-    let factory = Factory::new();
-
-    match factory.build(xpath_str) {
-        Ok(xpath) => xpath.ok_or_else(|| ShellError::untagged_runtime_error("invalid xpath query")),
-        Err(_) => Err(ShellError::untagged_runtime_error(
-            "expected valid xpath query",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::string_to_value as query;
-    use nu_errors::ShellError;
-    use nu_source::TaggedItem;
-    use nu_test_support::value::{decimal_from_float, row};
-
-    use indexmap::indexmap;
-
-    #[test]
-    fn position_function_in_predicate() -> Result<(), ShellError> {
-        let text = String::from(r#"<?xml version="1.0" encoding="UTF-8"?><a><b/><b/></a>"#);
-
-        let actual = query(text, "count(//a/*[position() = 2])".tagged_unknown())?;
-
-        assert_eq!(
-            actual[0],
-            row(indexmap! { "count(//a/*[posit...".into() => decimal_from_float(1.0) })
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn functions_implicitly_coerce_argument_types() -> Result<(), ShellError> {
-        let text = String::from(r#"<?xml version="1.0" encoding="UTF-8"?><a>true</a>"#);
-
-        let actual = query(text, "count(//*[contains(., true)])".tagged_unknown())?;
-
-        assert_eq!(
-            actual[0],
-            row(indexmap! { "count(//*[contain...".into() => decimal_from_float(1.0) })
-        );
-
-        Ok(())
-    }
-}
diff --git a/old_nushell/src/README.md b/old_nushell/src/README.md
deleted file mode 100644
index 989a12fd2..000000000
--- a/old_nushell/src/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Nushell REPL
-
-This directory contains the main Nushell REPL (read eval print loop) as part of the CLI portion of Nushell, which creates the `nu` binary itself.
-
-Current versions of the `nu` binary will use the Nu argument parsing logic to parse the commandline arguments passed to `nu`, leaving the logic here to be a thin layer around what the core libraries.
diff --git a/old_nushell/src/main.rs b/old_nushell/src/main.rs
deleted file mode 100644
index 97a536927..000000000
--- a/old_nushell/src/main.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use nu_cli::App as CliApp;
-use nu_errors::ShellError;
-
-fn main() -> Result<(), ShellError> {
-    let mut argv = vec![String::from("nu")];
-    argv.extend(positionals());
-
-    CliApp::run(&argv)
-}
-
-fn positionals() -> Vec<String> {
-    std::env::args().skip(1).collect::<Vec<_>>()
-}
diff --git a/old_nushell/src/plugins/nu_plugin_core_inc.rs b/old_nushell/src/plugins/nu_plugin_core_inc.rs
deleted file mode 100644
index 407dcd852..000000000
--- a/old_nushell/src/plugins/nu_plugin_core_inc.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_inc::Inc;
-
-fn main() {
-    serve_plugin(&mut Inc::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_core_match.rs b/old_nushell/src/plugins/nu_plugin_core_match.rs
deleted file mode 100644
index 2023f3963..000000000
--- a/old_nushell/src/plugins/nu_plugin_core_match.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_match::Match;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    serve_plugin(&mut Match::new()?);
-    Ok(())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_core_parse.rs b/old_nushell/src/plugins/nu_plugin_core_parse.rs
deleted file mode 100644
index 4a7d5ee3c..000000000
--- a/old_nushell/src/plugins/nu_plugin_core_parse.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_parse::Parse;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    serve_plugin(&mut Parse::new()?);
-    Ok(())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_core_textview.rs b/old_nushell/src/plugins/nu_plugin_core_textview.rs
deleted file mode 100644
index 1425efead..000000000
--- a/old_nushell/src/plugins/nu_plugin_core_textview.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_textview::TextView;
-
-fn main() {
-    serve_plugin(&mut TextView::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_binaryview.rs b/old_nushell/src/plugins/nu_plugin_extra_binaryview.rs
deleted file mode 100644
index 6ef5c529f..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_binaryview.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_binaryview::BinaryView;
-
-fn main() {
-    serve_plugin(&mut BinaryView::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_chart_bar.rs b/old_nushell/src/plugins/nu_plugin_extra_chart_bar.rs
deleted file mode 100644
index 20ada9666..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_chart_bar.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_chart::ChartBar;
-
-fn main() {
-    serve_plugin(&mut ChartBar::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_chart_line.rs b/old_nushell/src/plugins/nu_plugin_extra_chart_line.rs
deleted file mode 100644
index 82ae4a00d..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_chart_line.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_chart::ChartLine;
-
-fn main() {
-    serve_plugin(&mut ChartLine::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_from_bson.rs b/old_nushell/src/plugins/nu_plugin_extra_from_bson.rs
deleted file mode 100644
index ffc24fca4..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_from_bson.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_bson::FromBson;
-
-fn main() {
-    serve_plugin(&mut FromBson::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_from_mp4.rs b/old_nushell/src/plugins/nu_plugin_extra_from_mp4.rs
deleted file mode 100644
index 539b494cf..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_from_mp4.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_mp4::FromMp4;
-
-fn main() {
-    serve_plugin(&mut FromMp4::new())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_from_sqlite.rs b/old_nushell/src/plugins/nu_plugin_extra_from_sqlite.rs
deleted file mode 100644
index 26147638a..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_from_sqlite.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_from_sqlite::FromSqlite;
-
-fn main() {
-    serve_plugin(&mut FromSqlite::new())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_query_json.rs b/old_nushell/src/plugins/nu_plugin_extra_query_json.rs
deleted file mode 100644
index 19fecc26b..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_query_json.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_query_json::QueryJson;
-
-fn main() {
-    serve_plugin(&mut QueryJson::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_s3.rs b/old_nushell/src/plugins/nu_plugin_extra_s3.rs
deleted file mode 100644
index 6765c28eb..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_s3.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_s3::Handler;
-
-fn main() {
-    serve_plugin(&mut Handler::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_selector.rs b/old_nushell/src/plugins/nu_plugin_extra_selector.rs
deleted file mode 100644
index 3e1832f42..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_selector.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_selector::Selector;
-
-fn main() {
-    serve_plugin(&mut Selector::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_start.rs b/old_nushell/src/plugins/nu_plugin_extra_start.rs
deleted file mode 100644
index 43ef421b8..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_start.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_start::Start;
-
-fn main() {
-    serve_plugin(&mut Start::new());
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_to_bson.rs b/old_nushell/src/plugins/nu_plugin_extra_to_bson.rs
deleted file mode 100644
index 47d3f0468..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_to_bson.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_to_bson::ToBson;
-
-fn main() {
-    serve_plugin(&mut ToBson::new())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_to_sqlite.rs b/old_nushell/src/plugins/nu_plugin_extra_to_sqlite.rs
deleted file mode 100644
index 5f6923225..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_to_sqlite.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_to_sqlite::ToSqlite;
-
-fn main() {
-    serve_plugin(&mut ToSqlite::new())
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_tree.rs b/old_nushell/src/plugins/nu_plugin_extra_tree.rs
deleted file mode 100644
index 7ba6d9ea5..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_tree.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_tree::TreeViewer;
-
-fn main() {
-    serve_plugin(&mut TreeViewer);
-}
diff --git a/old_nushell/src/plugins/nu_plugin_extra_xpath.rs b/old_nushell/src/plugins/nu_plugin_extra_xpath.rs
deleted file mode 100644
index 66ae2ee15..000000000
--- a/old_nushell/src/plugins/nu_plugin_extra_xpath.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use nu_plugin::serve_plugin;
-use nu_plugin_xpath::Xpath;
-
-fn main() {
-    serve_plugin(&mut Xpath::new());
-}
diff --git a/old_nushell/tests/assets/nu_json/charset_result.hjson b/old_nushell/tests/assets/nu_json/charset_result.hjson
deleted file mode 100644
index d1573b616..000000000
--- a/old_nushell/tests/assets/nu_json/charset_result.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  ql-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-  js-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-  ml-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/charset_result.json b/old_nushell/tests/assets/nu_json/charset_result.json
deleted file mode 100644
index 6357d96db..000000000
--- a/old_nushell/tests/assets/nu_json/charset_result.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ql-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
-  "js-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
-  "ml-ascii": "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/charset_test.hjson b/old_nushell/tests/assets/nu_json/charset_test.hjson
deleted file mode 100644
index 7527b1e45..000000000
--- a/old_nushell/tests/assets/nu_json/charset_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-ql-ascii: ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-js-ascii: "! \"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-ml-ascii:
-  '''
-  ! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~
-  '''
diff --git a/old_nushell/tests/assets/nu_json/comments_result.hjson b/old_nushell/tests/assets/nu_json/comments_result.hjson
deleted file mode 100644
index a99ce23db..000000000
--- a/old_nushell/tests/assets/nu_json/comments_result.hjson
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  foo1: This is a string value. # part of the string
-  foo2: This is a string value.
-  bar1: This is a string value. // part of the string
-  bar2: This is a string value.
-  foobar1: This is a string value./* part of the string */
-  foobar2: This is a string value.
-  rem1: "# test"
-  rem2: "// test"
-  rem3: "/* test */"
-  num1: 0
-  num2: 0
-  num3: 2
-  true1: true
-  true2: true
-  true3: true
-  false1: false
-  false2: false
-  false3: false
-  null1: null
-  null2: null
-  null3: null
-  str1: 00 # part of the string
-  str2: 00.0 // part of the string
-  str3: 02 /* part of the string */
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/comments_result.json b/old_nushell/tests/assets/nu_json/comments_result.json
deleted file mode 100644
index e247803e6..000000000
--- a/old_nushell/tests/assets/nu_json/comments_result.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "foo1": "This is a string value. # part of the string",
-  "foo2": "This is a string value.",
-  "bar1": "This is a string value. // part of the string",
-  "bar2": "This is a string value.",
-  "foobar1": "This is a string value./* part of the string */",
-  "foobar2": "This is a string value.",
-  "rem1": "# test",
-  "rem2": "// test",
-  "rem3": "/* test */",
-  "num1": 0,
-  "num2": 0,
-  "num3": 2,
-  "true1": true,
-  "true2": true,
-  "true3": true,
-  "false1": false,
-  "false2": false,
-  "false3": false,
-  "null1": null,
-  "null2": null,
-  "null3": null,
-  "str1": "00 # part of the string",
-  "str2": "00.0 // part of the string",
-  "str3": "02 /* part of the string */"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/comments_test.hjson b/old_nushell/tests/assets/nu_json/comments_test.hjson
deleted file mode 100644
index 7f1dfdcab..000000000
--- a/old_nushell/tests/assets/nu_json/comments_test.hjson
+++ /dev/null
@@ -1,48 +0,0 @@
-// test
-# all
-// comment
-/*
-styles
-*/
-# with lf
-
-
-
-# !
-
-{
-  # hjson style comment
-  foo1: This is a string value. # part of the string
-  foo2: "This is a string value." # a comment
-
-  // js style comment
-  bar1: This is a string value. // part of the string
-  bar2: "This is a string value." // a comment
-
-  /* js block style comments */foobar1:/* more */This is a string value./* part of the string */
-  /* js block style comments */foobar2:/* more */"This is a string value."/* a comment */
-
-  rem1: "# test"
-  rem2: "// test"
-  rem3: "/* test */"
-
-  num1: 0 # comment
-  num2: 0.0 // comment
-  num3: 2 /* comment */
-
-  true1: true # comment
-  true2: true // comment
-  true3: true /* comment */
-
-  false1: false # comment
-  false2: false // comment
-  false3: false /* comment */
-
-  null1: null # comment
-  null2: null // comment
-  null3: null /* comment */
-
-  str1: 00 # part of the string
-  str2: 00.0 // part of the string
-  str3: 02 /* part of the string */
-}
diff --git a/old_nushell/tests/assets/nu_json/empty_result.hjson b/old_nushell/tests/assets/nu_json/empty_result.hjson
deleted file mode 100644
index a75b45b28..000000000
--- a/old_nushell/tests/assets/nu_json/empty_result.hjson
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "": empty
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/empty_result.json b/old_nushell/tests/assets/nu_json/empty_result.json
deleted file mode 100644
index 47f710fe2..000000000
--- a/old_nushell/tests/assets/nu_json/empty_result.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "": "empty"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/empty_test.hjson b/old_nushell/tests/assets/nu_json/empty_test.hjson
deleted file mode 100644
index ac97a9d7c..000000000
--- a/old_nushell/tests/assets/nu_json/empty_test.hjson
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "": empty
-}
diff --git a/old_nushell/tests/assets/nu_json/failCharset1_test.hjson b/old_nushell/tests/assets/nu_json/failCharset1_test.hjson
deleted file mode 100644
index da280393b..000000000
--- a/old_nushell/tests/assets/nu_json/failCharset1_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid \u char
-  char: "\uxxxx"
-}
diff --git a/old_nushell/tests/assets/nu_json/failJSON02_test.json b/old_nushell/tests/assets/nu_json/failJSON02_test.json
deleted file mode 100644
index 6b7c11e5a..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON02_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Unclosed array"
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON05_test.json b/old_nushell/tests/assets/nu_json/failJSON05_test.json
deleted file mode 100644
index ddf3ce3d2..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON05_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["double extra comma",,]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON06_test.json b/old_nushell/tests/assets/nu_json/failJSON06_test.json
deleted file mode 100644
index ed91580e1..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON06_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[   , "<-- missing value"]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON07_test.json b/old_nushell/tests/assets/nu_json/failJSON07_test.json
deleted file mode 100644
index 8a96af3e4..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON07_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Comma after the close"],
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON08_test.json b/old_nushell/tests/assets/nu_json/failJSON08_test.json
deleted file mode 100644
index b28479c6e..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON08_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Extra close"]]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON10_test.json b/old_nushell/tests/assets/nu_json/failJSON10_test.json
deleted file mode 100644
index 5d8c0047b..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON10_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON11_test.json b/old_nushell/tests/assets/nu_json/failJSON11_test.json
deleted file mode 100644
index 76eb95b45..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON11_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON12_test.json b/old_nushell/tests/assets/nu_json/failJSON12_test.json
deleted file mode 100644
index 77580a452..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON12_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal invocation": alert()}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON13_test.json b/old_nushell/tests/assets/nu_json/failJSON13_test.json
deleted file mode 100644
index 379406b59..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON13_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON14_test.json b/old_nushell/tests/assets/nu_json/failJSON14_test.json
deleted file mode 100644
index 0ed366b38..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON14_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON15_test.json b/old_nushell/tests/assets/nu_json/failJSON15_test.json
deleted file mode 100644
index fc8376b60..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON15_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON16_test.json b/old_nushell/tests/assets/nu_json/failJSON16_test.json
deleted file mode 100644
index 3fe21d4b5..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON16_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[\naked]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON17_test.json b/old_nushell/tests/assets/nu_json/failJSON17_test.json
deleted file mode 100644
index 62b9214ae..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON17_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON19_test.json b/old_nushell/tests/assets/nu_json/failJSON19_test.json
deleted file mode 100644
index 3b9c46fa9..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON19_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Missing colon" null}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON20_test.json b/old_nushell/tests/assets/nu_json/failJSON20_test.json
deleted file mode 100644
index 27c1af3e7..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON20_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Double colon":: null}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON21_test.json b/old_nushell/tests/assets/nu_json/failJSON21_test.json
deleted file mode 100644
index 62474573b..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON21_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead of colon", null}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON22_test.json b/old_nushell/tests/assets/nu_json/failJSON22_test.json
deleted file mode 100644
index a7752581b..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON22_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Colon instead of comma": false]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON23_test.json b/old_nushell/tests/assets/nu_json/failJSON23_test.json
deleted file mode 100644
index 494add1ca..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON23_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["Bad value", truth]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON24_test.json b/old_nushell/tests/assets/nu_json/failJSON24_test.json
deleted file mode 100644
index caff239bf..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON24_test.json
+++ /dev/null
@@ -1 +0,0 @@
-['single quote']
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON26_test.json b/old_nushell/tests/assets/nu_json/failJSON26_test.json
deleted file mode 100644
index 845d26a6a..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON26_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON28_test.json b/old_nushell/tests/assets/nu_json/failJSON28_test.json
deleted file mode 100644
index 621a0101c..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON28_test.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line\
-break"]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON29_test.json b/old_nushell/tests/assets/nu_json/failJSON29_test.json
deleted file mode 100644
index 47ec421bb..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON29_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON30_test.json b/old_nushell/tests/assets/nu_json/failJSON30_test.json
deleted file mode 100644
index 8ab0bc4b8..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON30_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON31_test.json b/old_nushell/tests/assets/nu_json/failJSON31_test.json
deleted file mode 100644
index 1cce602b5..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON31_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+-1]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON32_test.json b/old_nushell/tests/assets/nu_json/failJSON32_test.json
deleted file mode 100644
index 45cba7396..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON32_test.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead if closing brace": true,
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON33_test.json b/old_nushell/tests/assets/nu_json/failJSON33_test.json
deleted file mode 100644
index ca5eb19dc..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON33_test.json
+++ /dev/null
@@ -1 +0,0 @@
-["mismatch"}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/failJSON34_test.json b/old_nushell/tests/assets/nu_json/failJSON34_test.json
deleted file mode 100644
index 921436427..000000000
--- a/old_nushell/tests/assets/nu_json/failJSON34_test.json
+++ /dev/null
@@ -1,2 +0,0 @@
-A quoteless string is OK,
-but two must be contained in an array.
diff --git a/old_nushell/tests/assets/nu_json/failKey1_test.hjson b/old_nushell/tests/assets/nu_json/failKey1_test.hjson
deleted file mode 100644
index 0026d2a1a..000000000
--- a/old_nushell/tests/assets/nu_json/failKey1_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid name
-  wrong name: 0
-}
diff --git a/old_nushell/tests/assets/nu_json/failKey2_test.hjson b/old_nushell/tests/assets/nu_json/failKey2_test.hjson
deleted file mode 100644
index 4b5771a7d..000000000
--- a/old_nushell/tests/assets/nu_json/failKey2_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid name
-  {name: 0
-}
diff --git a/old_nushell/tests/assets/nu_json/failKey3_test.hjson b/old_nushell/tests/assets/nu_json/failKey3_test.hjson
deleted file mode 100644
index 3443a87f4..000000000
--- a/old_nushell/tests/assets/nu_json/failKey3_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid name
-  key,name: 0
-}
diff --git a/old_nushell/tests/assets/nu_json/failKey4_test.hjson b/old_nushell/tests/assets/nu_json/failKey4_test.hjson
deleted file mode 100644
index a7e9ce2ae..000000000
--- a/old_nushell/tests/assets/nu_json/failKey4_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid name
-  : 0
-}
diff --git a/old_nushell/tests/assets/nu_json/failMLStr1_test.hjson b/old_nushell/tests/assets/nu_json/failMLStr1_test.hjson
deleted file mode 100644
index ca6410720..000000000
--- a/old_nushell/tests/assets/nu_json/failMLStr1_test.hjson
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  # invalid multiline string
-  ml: '''
diff --git a/old_nushell/tests/assets/nu_json/failObj1_test.hjson b/old_nushell/tests/assets/nu_json/failObj1_test.hjson
deleted file mode 100644
index ac7b761fb..000000000
--- a/old_nushell/tests/assets/nu_json/failObj1_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  # invalid obj
-  noDelimiter
-  {
-  }
-}
diff --git a/old_nushell/tests/assets/nu_json/failObj2_test.hjson b/old_nushell/tests/assets/nu_json/failObj2_test.hjson
deleted file mode 100644
index cdad47eef..000000000
--- a/old_nushell/tests/assets/nu_json/failObj2_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  # invalid obj
-  noEnd
-  {
-
-}
diff --git a/old_nushell/tests/assets/nu_json/failObj3_test.hjson b/old_nushell/tests/assets/nu_json/failObj3_test.hjson
deleted file mode 100644
index f1176842d..000000000
--- a/old_nushell/tests/assets/nu_json/failObj3_test.hjson
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  # missing key
-
-  [
-    test
-  ]
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr1a_test.hjson b/old_nushell/tests/assets/nu_json/failStr1a_test.hjson
deleted file mode 100644
index 91b930ca4..000000000
--- a/old_nushell/tests/assets/nu_json/failStr1a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: ]
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr1b_test.hjson b/old_nushell/tests/assets/nu_json/failStr1b_test.hjson
deleted file mode 100644
index 91da1a8de..000000000
--- a/old_nushell/tests/assets/nu_json/failStr1b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: ]x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr1c_test.hjson b/old_nushell/tests/assets/nu_json/failStr1c_test.hjson
deleted file mode 100644
index 20a73079f..000000000
--- a/old_nushell/tests/assets/nu_json/failStr1c_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  ]
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr1d_test.hjson b/old_nushell/tests/assets/nu_json/failStr1d_test.hjson
deleted file mode 100644
index 555f88a91..000000000
--- a/old_nushell/tests/assets/nu_json/failStr1d_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  ]x
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr2a_test.hjson b/old_nushell/tests/assets/nu_json/failStr2a_test.hjson
deleted file mode 100644
index 5a8b28feb..000000000
--- a/old_nushell/tests/assets/nu_json/failStr2a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: }
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr2b_test.hjson b/old_nushell/tests/assets/nu_json/failStr2b_test.hjson
deleted file mode 100644
index a7fc00de7..000000000
--- a/old_nushell/tests/assets/nu_json/failStr2b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: }x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr2c_test.hjson b/old_nushell/tests/assets/nu_json/failStr2c_test.hjson
deleted file mode 100644
index 1fe46067b..000000000
--- a/old_nushell/tests/assets/nu_json/failStr2c_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  }
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr2d_test.hjson b/old_nushell/tests/assets/nu_json/failStr2d_test.hjson
deleted file mode 100644
index ea8c99adc..000000000
--- a/old_nushell/tests/assets/nu_json/failStr2d_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  }x
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr3a_test.hjson b/old_nushell/tests/assets/nu_json/failStr3a_test.hjson
deleted file mode 100644
index ec5d0ad20..000000000
--- a/old_nushell/tests/assets/nu_json/failStr3a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: {
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr3b_test.hjson b/old_nushell/tests/assets/nu_json/failStr3b_test.hjson
deleted file mode 100644
index 2d0fff1fb..000000000
--- a/old_nushell/tests/assets/nu_json/failStr3b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: {x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr3c_test.hjson b/old_nushell/tests/assets/nu_json/failStr3c_test.hjson
deleted file mode 100644
index 2872a4d95..000000000
--- a/old_nushell/tests/assets/nu_json/failStr3c_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  {
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr3d_test.hjson b/old_nushell/tests/assets/nu_json/failStr3d_test.hjson
deleted file mode 100644
index 949502ffc..000000000
--- a/old_nushell/tests/assets/nu_json/failStr3d_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  {x
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr4a_test.hjson b/old_nushell/tests/assets/nu_json/failStr4a_test.hjson
deleted file mode 100644
index 941f35bcd..000000000
--- a/old_nushell/tests/assets/nu_json/failStr4a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: [
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr4b_test.hjson b/old_nushell/tests/assets/nu_json/failStr4b_test.hjson
deleted file mode 100644
index b7bb23628..000000000
--- a/old_nushell/tests/assets/nu_json/failStr4b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: [x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr4c_test.hjson b/old_nushell/tests/assets/nu_json/failStr4c_test.hjson
deleted file mode 100644
index ee927a475..000000000
--- a/old_nushell/tests/assets/nu_json/failStr4c_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  [
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr4d_test.hjson b/old_nushell/tests/assets/nu_json/failStr4d_test.hjson
deleted file mode 100644
index db50a529d..000000000
--- a/old_nushell/tests/assets/nu_json/failStr4d_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  [x
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr5a_test.hjson b/old_nushell/tests/assets/nu_json/failStr5a_test.hjson
deleted file mode 100644
index 4093f7a58..000000000
--- a/old_nushell/tests/assets/nu_json/failStr5a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: :
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr5b_test.hjson b/old_nushell/tests/assets/nu_json/failStr5b_test.hjson
deleted file mode 100644
index eda96192b..000000000
--- a/old_nushell/tests/assets/nu_json/failStr5b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: :x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr5c_test.hjson b/old_nushell/tests/assets/nu_json/failStr5c_test.hjson
deleted file mode 100644
index 63280735b..000000000
--- a/old_nushell/tests/assets/nu_json/failStr5c_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  :
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr5d_test.hjson b/old_nushell/tests/assets/nu_json/failStr5d_test.hjson
deleted file mode 100644
index bfaef8e7d..000000000
--- a/old_nushell/tests/assets/nu_json/failStr5d_test.hjson
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  foo
-  # invalid quoteless string
-  :x
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr6a_test.hjson b/old_nushell/tests/assets/nu_json/failStr6a_test.hjson
deleted file mode 100644
index 522333773..000000000
--- a/old_nushell/tests/assets/nu_json/failStr6a_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: ,
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr6b_test.hjson b/old_nushell/tests/assets/nu_json/failStr6b_test.hjson
deleted file mode 100644
index 90ad67bf5..000000000
--- a/old_nushell/tests/assets/nu_json/failStr6b_test.hjson
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # invalid quoteless string
-  ql: ,x
-}
diff --git a/old_nushell/tests/assets/nu_json/failStr6c_test.hjson b/old_nushell/tests/assets/nu_json/failStr6c_test.hjson
deleted file mode 100644
index 81d2af4c9..000000000
--- a/old_nushell/tests/assets/nu_json/failStr6c_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  # invalid quoteless string
-  # note that if there were a preceding value the comma would
-  # be allowed/ignored as a separator/trailing comma
-  ,
-]
diff --git a/old_nushell/tests/assets/nu_json/failStr6d_test.hjson b/old_nushell/tests/assets/nu_json/failStr6d_test.hjson
deleted file mode 100644
index c1477293b..000000000
--- a/old_nushell/tests/assets/nu_json/failStr6d_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  # invalid quoteless string
-  # note that if there were a preceding value the comma would
-  # be allowed/ignored as a separator/trailing comma
-  ,x
-]
diff --git a/old_nushell/tests/assets/nu_json/kan_result.hjson b/old_nushell/tests/assets/nu_json/kan_result.hjson
deleted file mode 100644
index d2b839add..000000000
--- a/old_nushell/tests/assets/nu_json/kan_result.hjson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  numbers:
-  [
-    0
-    0
-    0
-    42
-    42.1
-    -5
-    -5.1
-    1701
-    -1701
-    12.345
-    -12.345
-  ]
-  native:
-  [
-    true
-    true
-    false
-    false
-    null
-    null
-  ]
-  strings:
-  [
-    x 0
-    .0
-    00
-    01
-    0 0 0
-    42 x
-    42.1 asdf
-    1.2.3
-    -5 0 -
-    -5.1 --
-    17.01e2 +
-    -17.01e2 :
-    12345e-3 @
-    -12345e-3 $
-    true true
-    x true
-    false false
-    x false
-    null null
-    x null
-  ]
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/kan_result.json b/old_nushell/tests/assets/nu_json/kan_result.json
deleted file mode 100644
index babb9d4e0..000000000
--- a/old_nushell/tests/assets/nu_json/kan_result.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "numbers": [
-    0,
-    0,
-    0,
-    42,
-    42.1,
-    -5,
-    -5.1,
-    1701,
-    -1701,
-    12.345,
-    -12.345
-  ],
-  "native": [
-    true,
-    true,
-    false,
-    false,
-    null,
-    null
-  ],
-  "strings": [
-    "x 0",
-    ".0",
-    "00",
-    "01",
-    "0 0 0",
-    "42 x",
-    "42.1 asdf",
-    "1.2.3",
-    "-5 0 -",
-    "-5.1 --",
-    "17.01e2 +",
-    "-17.01e2 :",
-    "12345e-3 @",
-    "-12345e-3 $",
-    "true true",
-    "x true",
-    "false false",
-    "x false",
-    "null null",
-    "x null"
-  ]
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/kan_test.hjson b/old_nushell/tests/assets/nu_json/kan_test.hjson
deleted file mode 100644
index 1e6906a96..000000000
--- a/old_nushell/tests/assets/nu_json/kan_test.hjson
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  # the comma forces a whitespace check
-  numbers:
-  [
-    0
-    0   ,
-    -0
-    42  ,
-    42.1  ,
-    -5
-    -5.1
-    17.01e2
-    -17.01e2
-    12345e-3  ,
-    -12345e-3  ,
-  ]
-  native:
-  [
-    true   ,
-    true
-    false  ,
-    false
-    null   ,
-    null
-  ]
-  strings:
-  [
-    x 0
-    .0
-    00
-    01
-    0 0 0
-    42 x
-    42.1 asdf
-    1.2.3
-    -5 0 -
-    -5.1 --
-    17.01e2 +
-    -17.01e2 :
-    12345e-3 @
-    -12345e-3 $
-    true true
-    x true
-    false false
-    x false
-    null null
-    x null
-  ]
-}
diff --git a/old_nushell/tests/assets/nu_json/keys_result.hjson b/old_nushell/tests/assets/nu_json/keys_result.hjson
deleted file mode 100644
index 876e6c346..000000000
--- a/old_nushell/tests/assets/nu_json/keys_result.hjson
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  unquoted_key: test
-  _unquoted: test
-  test-key: test
-  -test: test
-  .key: test
-  trailing: test
-  trailing2: test
-  "#c1": test
-  "foo#bar": test
-  "//bar": test
-  "foo//bar": test
-  "/*foo*/": test
-  "foo/*foo*/bar": test
-  "/*": test
-  "foo/*bar": test
-  "\"": test
-  "foo\"bar": test
-  "'''": test
-  "foo'''bar": test
-  ":": test
-  "foo:bar": test
-  "{": test
-  "foo{bar": test
-  "}": test
-  "foo}bar": test
-  "[": test
-  "foo[bar": test
-  "]": test
-  "foo]bar": test
-  nl1: test
-  nl2: test
-  nl3: test
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/keys_result.json b/old_nushell/tests/assets/nu_json/keys_result.json
deleted file mode 100644
index 81fa480b2..000000000
--- a/old_nushell/tests/assets/nu_json/keys_result.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "unquoted_key": "test",
-  "_unquoted": "test",
-  "test-key": "test",
-  "-test": "test",
-  ".key": "test",
-  "trailing": "test",
-  "trailing2": "test",
-  "#c1": "test",
-  "foo#bar": "test",
-  "//bar": "test",
-  "foo//bar": "test",
-  "/*foo*/": "test",
-  "foo/*foo*/bar": "test",
-  "/*": "test",
-  "foo/*bar": "test",
-  "\"": "test",
-  "foo\"bar": "test",
-  "'''": "test",
-  "foo'''bar": "test",
-  ":": "test",
-  "foo:bar": "test",
-  "{": "test",
-  "foo{bar": "test",
-  "}": "test",
-  "foo}bar": "test",
-  "[": "test",
-  "foo[bar": "test",
-  "]": "test",
-  "foo]bar": "test",
-  "nl1": "test",
-  "nl2": "test",
-  "nl3": "test"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/keys_test.hjson b/old_nushell/tests/assets/nu_json/keys_test.hjson
deleted file mode 100644
index 38f560381..000000000
--- a/old_nushell/tests/assets/nu_json/keys_test.hjson
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  # unquoted keys
-  unquoted_key: test
-  _unquoted: test
-  test-key: test
-  -test: test
-  .key: test
-  # trailing spaces in key names are ignored
-  trailing : test
-  trailing2  : test
-  # comment char in key name
-  "#c1": test
-  "foo#bar": test
-  "//bar": test
-  "foo//bar": test
-  "/*foo*/": test
-  "foo/*foo*/bar": test
-  "/*": test
-  "foo/*bar": test
-  # quotes in key name
-  "\"": test
-  "foo\"bar": test
-  "'''": test
-  "foo'''bar": test
-  # control char in key name
-  ":": test
-  "foo:bar": test
-  "{": test
-  "foo{bar": test
-  "}": test
-  "foo}bar": test
-  "[": test
-  "foo[bar": test
-  "]": test
-  "foo]bar": test
-  # newline
-  nl1:
-    test
-  nl2
-    :
-    test
-
-  nl3
-
-    :
-
-    test
-}
diff --git a/old_nushell/tests/assets/nu_json/oa_result.hjson b/old_nushell/tests/assets/nu_json/oa_result.hjson
deleted file mode 100644
index db42ac901..000000000
--- a/old_nushell/tests/assets/nu_json/oa_result.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  a
-  {}
-  {}
-  []
-  []
-  {
-    b: 1
-    c: []
-    d: {}
-  }
-  []
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/oa_result.json b/old_nushell/tests/assets/nu_json/oa_result.json
deleted file mode 100644
index f0955abeb..000000000
--- a/old_nushell/tests/assets/nu_json/oa_result.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  "a",
-  {},
-  {},
-  [],
-  [],
-  {
-    "b": 1,
-    "c": [],
-    "d": {}
-  },
-  []
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/oa_test.hjson b/old_nushell/tests/assets/nu_json/oa_test.hjson
deleted file mode 100644
index 35bcdb452..000000000
--- a/old_nushell/tests/assets/nu_json/oa_test.hjson
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-  a
-  {}
-  {}
-  []
-  []
-  {
-    b: 1
-    c: []
-    d: {}
-  }
-  []
-]
diff --git a/old_nushell/tests/assets/nu_json/pass1_result.hjson b/old_nushell/tests/assets/nu_json/pass1_result.hjson
deleted file mode 100644
index 2a3f4c97f..000000000
--- a/old_nushell/tests/assets/nu_json/pass1_result.hjson
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-  JSON Test Pattern pass1
-  {
-    "object with 1 member":
-    [
-      array with 1 element
-    ]
-  }
-  {}
-  []
-  -42
-  true
-  false
-  null
-  {
-    integer: 1234567890
-    real: -9876.54321
-    e: 1.23456789e-13
-    E: 1.23456789e+34
-    -: 2.3456789012e+76
-    zero: 0
-    one: 1
-    space: " "
-    quote: '''"'''
-    backslash: \
-    controls: "\b\f\n\r\t"
-    slash: / & /
-    alpha: abcdefghijklmnopqrstuvwyz
-    ALPHA: ABCDEFGHIJKLMNOPQRSTUVWYZ
-    digit: 0123456789
-    0123456789: digit
-    special: `1~!@#$%^&*()_+-={':[,]}|;.</>?
-    hex: ģ䕧覫췯ꯍ
-    true: true
-    false: false
-    null: null
-    array: []
-    object: {}
-    address: 50 St. James Street
-    url: http://www.JSON.org/
-    comment: "// /* <!-- --"
-    "# -- --> */": " "
-    " s p a c e d ":
-    [
-      1
-      2
-      3
-      4
-      5
-      6
-      7
-    ]
-    compact:
-    [
-      1
-      2
-      3
-      4
-      5
-      6
-      7
-    ]
-    jsontext: '''{"object with 1 member":["array with 1 element"]}'''
-    quotes: &#34; " %22 0x22 034 &#x22;
-    "/\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?": A key can be any string
-  }
-  0.5
-  98.6
-  99.44
-  1066
-  10
-  1
-  0.1
-  1
-  2
-  2
-  rosebud
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass1_result.json b/old_nushell/tests/assets/nu_json/pass1_result.json
deleted file mode 100644
index 69b354d05..000000000
--- a/old_nushell/tests/assets/nu_json/pass1_result.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-  "JSON Test Pattern pass1",
-  {
-    "object with 1 member": [
-      "array with 1 element"
-    ]
-  },
-  {},
-  [],
-  -42,
-  true,
-  false,
-  null,
-  {
-    "integer": 1234567890,
-    "real": -9876.54321,
-    "e": 1.23456789e-13,
-    "E": 1.23456789e+34,
-    "-": 2.3456789012e+76,
-    "zero": 0,
-    "one": 1,
-    "space": " ",
-    "quote": "\"",
-    "backslash": "\\",
-    "controls": "\b\f\n\r\t",
-    "slash": "/ & /",
-    "alpha": "abcdefghijklmnopqrstuvwyz",
-    "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-    "digit": "0123456789",
-    "0123456789": "digit",
-    "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-    "hex": "ģ䕧覫췯ꯍ",
-    "true": true,
-    "false": false,
-    "null": null,
-    "array": [],
-    "object": {},
-    "address": "50 St. James Street",
-    "url": "http://www.JSON.org/",
-    "comment": "// /* <!-- --",
-    "# -- --> */": " ",
-    " s p a c e d ": [
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7
-    ],
-    "compact": [
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7
-    ],
-    "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-    "quotes": "&#34; \" %22 0x22 034 &#x22;",
-    "/\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?": "A key can be any string"
-  },
-  0.5,
-  98.6,
-  99.44,
-  1066,
-  10,
-  1,
-  0.1,
-  1,
-  2,
-  2,
-  "rosebud"
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass1_test.json b/old_nushell/tests/assets/nu_json/pass1_test.json
deleted file mode 100644
index 61cfd90c9..000000000
--- a/old_nushell/tests/assets/nu_json/pass1_test.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "-":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "0123456789": "digit",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass2_result.hjson b/old_nushell/tests/assets/nu_json/pass2_result.hjson
deleted file mode 100644
index 5a9fd5e82..000000000
--- a/old_nushell/tests/assets/nu_json/pass2_result.hjson
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-  [
-    [
-      [
-        [
-          [
-            [
-              [
-                [
-                  [
-                    [
-                      [
-                        [
-                          [
-                            [
-                              [
-                                [
-                                  [
-                                    [
-                                      Not too deep
-                                    ]
-                                  ]
-                                ]
-                              ]
-                            ]
-                          ]
-                        ]
-                      ]
-                    ]
-                  ]
-                ]
-              ]
-            ]
-          ]
-        ]
-      ]
-    ]
-  ]
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass2_result.json b/old_nushell/tests/assets/nu_json/pass2_result.json
deleted file mode 100644
index 2a71f5850..000000000
--- a/old_nushell/tests/assets/nu_json/pass2_result.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-  [
-    [
-      [
-        [
-          [
-            [
-              [
-                [
-                  [
-                    [
-                      [
-                        [
-                          [
-                            [
-                              [
-                                [
-                                  [
-                                    [
-                                      "Not too deep"
-                                    ]
-                                  ]
-                                ]
-                              ]
-                            ]
-                          ]
-                        ]
-                      ]
-                    ]
-                  ]
-                ]
-              ]
-            ]
-          ]
-        ]
-      ]
-    ]
-  ]
-]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass2_test.json b/old_nushell/tests/assets/nu_json/pass2_test.json
deleted file mode 100644
index d3c63c7ad..000000000
--- a/old_nushell/tests/assets/nu_json/pass2_test.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass3_result.hjson b/old_nushell/tests/assets/nu_json/pass3_result.hjson
deleted file mode 100644
index 6db3fb61d..000000000
--- a/old_nushell/tests/assets/nu_json/pass3_result.hjson
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "JSON Test Pattern pass3":
-  {
-    "The outermost value": must be an object or array.
-    "In this test": It is an object.
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass3_result.json b/old_nushell/tests/assets/nu_json/pass3_result.json
deleted file mode 100644
index d98cd2f88..000000000
--- a/old_nushell/tests/assets/nu_json/pass3_result.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "JSON Test Pattern pass3": {
-    "The outermost value": "must be an object or array.",
-    "In this test": "It is an object."
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass3_test.json b/old_nushell/tests/assets/nu_json/pass3_test.json
deleted file mode 100644
index 4528d51f1..000000000
--- a/old_nushell/tests/assets/nu_json/pass3_test.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
diff --git a/old_nushell/tests/assets/nu_json/pass4_result.hjson b/old_nushell/tests/assets/nu_json/pass4_result.hjson
deleted file mode 100644
index 9a037142a..000000000
--- a/old_nushell/tests/assets/nu_json/pass4_result.hjson
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass4_result.json b/old_nushell/tests/assets/nu_json/pass4_result.json
deleted file mode 100644
index 9a037142a..000000000
--- a/old_nushell/tests/assets/nu_json/pass4_result.json
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/pass4_test.json b/old_nushell/tests/assets/nu_json/pass4_test.json
deleted file mode 100644
index 069c2ae6b..000000000
--- a/old_nushell/tests/assets/nu_json/pass4_test.json
+++ /dev/null
@@ -1,2 +0,0 @@
-
-10
diff --git a/old_nushell/tests/assets/nu_json/passSingle_result.hjson b/old_nushell/tests/assets/nu_json/passSingle_result.hjson
deleted file mode 100644
index e580fce15..000000000
--- a/old_nushell/tests/assets/nu_json/passSingle_result.hjson
+++ /dev/null
@@ -1 +0,0 @@
-allow quoteless strings
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/passSingle_result.json b/old_nushell/tests/assets/nu_json/passSingle_result.json
deleted file mode 100644
index 1829d36f8..000000000
--- a/old_nushell/tests/assets/nu_json/passSingle_result.json
+++ /dev/null
@@ -1 +0,0 @@
-"allow quoteless strings"
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/passSingle_test.hjson b/old_nushell/tests/assets/nu_json/passSingle_test.hjson
deleted file mode 100644
index e580fce15..000000000
--- a/old_nushell/tests/assets/nu_json/passSingle_test.hjson
+++ /dev/null
@@ -1 +0,0 @@
-allow quoteless strings
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/root_result.hjson b/old_nushell/tests/assets/nu_json/root_result.hjson
deleted file mode 100644
index 736372f62..000000000
--- a/old_nushell/tests/assets/nu_json/root_result.hjson
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  database:
-  {
-    host: 127.0.0.1
-    port: 555
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/root_result.json b/old_nushell/tests/assets/nu_json/root_result.json
deleted file mode 100644
index 21b01cd00..000000000
--- a/old_nushell/tests/assets/nu_json/root_result.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "database": {
-    "host": "127.0.0.1",
-    "port": 555
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/root_test.hjson b/old_nushell/tests/assets/nu_json/root_test.hjson
deleted file mode 100644
index c0acd16ee..000000000
--- a/old_nushell/tests/assets/nu_json/root_test.hjson
+++ /dev/null
@@ -1,6 +0,0 @@
-// a object with the root braces omitted
-database:
-{
-  host: 127.0.0.1
-  port: 555
-}
diff --git a/old_nushell/tests/assets/nu_json/stringify1_result.hjson b/old_nushell/tests/assets/nu_json/stringify1_result.hjson
deleted file mode 100644
index 77b2eddc1..000000000
--- a/old_nushell/tests/assets/nu_json/stringify1_result.hjson
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  quotes:
-  {
-    num1: "1,2"
-    num2: "-1.1 ,"
-    num3: "1e10 ,2"
-    num4: "-1e-10,"
-    kw1: "true,"
-    kw2: "false ,"
-    kw3: "null,123"
-    close1: "1}"
-    close1b: "1 }"
-    close2: "1]"
-    close2b: "1 ]"
-    close3: "1,"
-    close3b: "1 ,"
-    comment1: "1#str"
-    comment2: "1//str"
-    comment3: "1/*str*/"
-    punc1: "{"
-    punc1b: "{foo"
-    punc2: "}"
-    punc2b: "}foo"
-    punc3: "["
-    punc3b: "[foo"
-    punc4: "]"
-    punc4b: "]foo"
-    punc5: ","
-    punc5b: ",foo"
-    punc6: ":"
-    punc6b: ":foo"
-  }
-  noquotes:
-  {
-    num0: .1,2
-    num1: 1.1.1,2
-    num2: -.1,
-    num3: 1e10e,2
-    num4: -1e--10,
-    kw1: true1,
-    kw2: false0,
-    kw3: null0,
-    close1: a}
-    close2: a]
-    comment1: a#str
-    comment2: a//str
-    comment3: a/*str*/
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/stringify1_result.json b/old_nushell/tests/assets/nu_json/stringify1_result.json
deleted file mode 100644
index 12514f878..000000000
--- a/old_nushell/tests/assets/nu_json/stringify1_result.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "quotes": {
-    "num1": "1,2",
-    "num2": "-1.1 ,",
-    "num3": "1e10 ,2",
-    "num4": "-1e-10,",
-    "kw1": "true,",
-    "kw2": "false ,",
-    "kw3": "null,123",
-    "close1": "1}",
-    "close1b": "1 }",
-    "close2": "1]",
-    "close2b": "1 ]",
-    "close3": "1,",
-    "close3b": "1 ,",
-    "comment1": "1#str",
-    "comment2": "1//str",
-    "comment3": "1/*str*/",
-    "punc1": "{",
-    "punc1b": "{foo",
-    "punc2": "}",
-    "punc2b": "}foo",
-    "punc3": "[",
-    "punc3b": "[foo",
-    "punc4": "]",
-    "punc4b": "]foo",
-    "punc5": ",",
-    "punc5b": ",foo",
-    "punc6": ":",
-    "punc6b": ":foo"
-  },
-  "noquotes": {
-    "num0": ".1,2",
-    "num1": "1.1.1,2",
-    "num2": "-.1,",
-    "num3": "1e10e,2",
-    "num4": "-1e--10,",
-    "kw1": "true1,",
-    "kw2": "false0,",
-    "kw3": "null0,",
-    "close1": "a}",
-    "close2": "a]",
-    "comment1": "a#str",
-    "comment2": "a//str",
-    "comment3": "a/*str*/"
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/stringify1_test.hjson b/old_nushell/tests/assets/nu_json/stringify1_test.hjson
deleted file mode 100644
index b353bf19c..000000000
--- a/old_nushell/tests/assets/nu_json/stringify1_test.hjson
+++ /dev/null
@@ -1,50 +0,0 @@
-// test if stringify produces correct output
-{
-  quotes:
-  {
-    num1: "1,2"
-    num2: "-1.1 ,"
-    num3: "1e10 ,2"
-    num4: "-1e-10,"
-    kw1: "true,"
-    kw2: "false ,"
-    kw3: "null,123"
-    close1: "1}"
-    close1b: "1 }"
-    close2: "1]"
-    close2b: "1 ]"
-    close3: "1,"
-    close3b: "1 ,"
-    comment1: "1#str"
-    comment2: "1//str"
-    comment3: "1/*str*/"
-    punc1: "{"
-    punc1b: "{foo"
-    punc2: "}"
-    punc2b: "}foo"
-    punc3: "["
-    punc3b: "[foo"
-    punc4: "]"
-    punc4b: "]foo"
-    punc5: ","
-    punc5b: ",foo"
-    punc6: ":"
-    punc6b: ":foo"
-  }
-  noquotes:
-  {
-    num0: ".1,2"
-    num1: "1.1.1,2"
-    num2: "-.1,"
-    num3: "1e10e,2"
-    num4: "-1e--10,"
-    kw1: "true1,"
-    kw2: "false0,"
-    kw3: "null0,"
-    close1: "a}"
-    close2: "a]"
-    comment1: "a#str"
-    comment2: "a//str"
-    comment3: "a/*str*/"
-  }
-}
diff --git a/old_nushell/tests/assets/nu_json/strings_result.hjson b/old_nushell/tests/assets/nu_json/strings_result.hjson
deleted file mode 100644
index 6ef06f874..000000000
--- a/old_nushell/tests/assets/nu_json/strings_result.hjson
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  text1: This is a valid string value.
-  text2: a \ is just a \
-  text3: "You need quotes\tfor escapes"
-  text4a: " untrimmed "
-  text4b: " untrimmed"
-  text4c: "untrimmed "
-  multiline1:
-    '''
-    first line
-      indented line
-    last line
-    '''
-  multiline2:
-    '''
-    first line
-      indented line
-    last line
-    '''
-  multiline3:
-    '''
-    first line
-      indented line
-    last line
-
-    '''
-  foo1a: asdf\"'a\s\w
-  foo1b: asdf\"'a\s\w
-  foo1c: asdf\"'a\s\w
-  foo2a: '''"asdf"'''
-  foo2b: '''"asdf"'''
-  foo3a: asdf'''
-  foo3b: "'''asdf"
-  foo4a: "asdf'''\nasdf"
-  foo4b: "asdf\n'''asdf"
-  arr:
-  [
-    one
-    two
-    three
-    four
-  ]
-  not:
-  {
-    number: 5
-    negative: -4.2
-    yes: true
-    no: false
-    null: null
-    array:
-    [
-      1
-      2
-      3
-      4
-      5
-      6
-      7
-      8
-      9
-      0
-      -1
-      0.5
-    ]
-  }
-  special:
-  {
-    true: "true"
-    false: "false"
-    null: "null"
-    one: "1"
-    two: "2"
-    minus: "-3"
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/strings_result.json b/old_nushell/tests/assets/nu_json/strings_result.json
deleted file mode 100644
index 16321ba7a..000000000
--- a/old_nushell/tests/assets/nu_json/strings_result.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "text1": "This is a valid string value.",
-  "text2": "a \\ is just a \\",
-  "text3": "You need quotes\tfor escapes",
-  "text4a": " untrimmed ",
-  "text4b": " untrimmed",
-  "text4c": "untrimmed ",
-  "multiline1": "first line\n  indented line\nlast line",
-  "multiline2": "first line\n  indented line\nlast line",
-  "multiline3": "first line\n  indented line\nlast line\n",
-  "foo1a": "asdf\\\"'a\\s\\w",
-  "foo1b": "asdf\\\"'a\\s\\w",
-  "foo1c": "asdf\\\"'a\\s\\w",
-  "foo2a": "\"asdf\"",
-  "foo2b": "\"asdf\"",
-  "foo3a": "asdf'''",
-  "foo3b": "'''asdf",
-  "foo4a": "asdf'''\nasdf",
-  "foo4b": "asdf\n'''asdf",
-  "arr": [
-    "one",
-    "two",
-    "three",
-    "four"
-  ],
-  "not": {
-    "number": 5,
-    "negative": -4.2,
-    "yes": true,
-    "no": false,
-    "null": null,
-    "array": [
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      0,
-      -1,
-      0.5
-    ]
-  },
-  "special": {
-    "true": "true",
-    "false": "false",
-    "null": "null",
-    "one": "1",
-    "two": "2",
-    "minus": "-3"
-  }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/strings_test.hjson b/old_nushell/tests/assets/nu_json/strings_test.hjson
deleted file mode 100644
index 616895209..000000000
--- a/old_nushell/tests/assets/nu_json/strings_test.hjson
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  # simple
-
-  text1:        This is a valid string value.
-  text2:a \ is just a \
-
-  text3: "You need quotes\tfor escapes"
-
-  text4a: " untrimmed "
-  text4b: " untrimmed"
-  text4c: "untrimmed "
-
-  # multiline string
-
-  multiline1:
-    '''
-    first line
-      indented line
-    last line
-    '''
-
-  multiline2:
-    '''first line
-      indented line
-    last line'''
-
-  multiline3:
-    '''
-    first line
-      indented line
-    last line
-
-    ''' # trailing lf
-
-  # escapes/no escape
-
-  foo1a: asdf\"'a\s\w
-  foo1b: '''asdf\"'a\s\w'''
-  foo1c: "asdf\\\"'a\\s\\w"
-
-  foo2a: "\"asdf\""
-  foo2b: '''"asdf"'''
-
-  foo3a: "asdf'''"
-  foo3b: "'''asdf"
-
-  foo4a: "asdf'''\nasdf"
-  foo4b: "asdf\n'''asdf"
-
-  # in arrays
-  arr:
-  [
-    one
-    two
-    "three"
-    '''four'''
-  ]
-
-  # not strings
-  not:
-  {
-    number:      5
-    negative:    -4.2
-    yes:         true
-    no:          false
-    null:        null
-    array:       [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -1, 0.5 ]
-  }
-
-  # special quoted
-  special:
-  {
-    true: "true"
-    false: "false"
-    null: "null"
-    one: "1"
-    two: "2"
-    minus: "-3"
-  }
-}
diff --git a/old_nushell/tests/assets/nu_json/testlist.txt b/old_nushell/tests/assets/nu_json/testlist.txt
deleted file mode 100644
index debb52c83..000000000
--- a/old_nushell/tests/assets/nu_json/testlist.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-charset_test.hjson
-comments_test.hjson
-empty_test.hjson
-failCharset1_test.hjson
-failJSON02_test.json
-failJSON05_test.json
-failJSON06_test.json
-failJSON07_test.json
-failJSON08_test.json
-failJSON10_test.json
-failJSON11_test.json
-failJSON12_test.json
-failJSON13_test.json
-failJSON14_test.json
-failJSON15_test.json
-failJSON16_test.json
-failJSON17_test.json
-failJSON19_test.json
-failJSON20_test.json
-failJSON21_test.json
-failJSON22_test.json
-failJSON23_test.json
-failJSON24_test.json
-failJSON26_test.json
-failJSON28_test.json
-failJSON29_test.json
-failJSON30_test.json
-failJSON31_test.json
-failJSON32_test.json
-failJSON33_test.json
-failJSON34_test.json
-failKey1_test.hjson
-failKey2_test.hjson
-failKey3_test.hjson
-failKey4_test.hjson
-failMLStr1_test.hjson
-failObj1_test.hjson
-failObj2_test.hjson
-failObj3_test.hjson
-failStr1a_test.hjson
-failStr1b_test.hjson
-failStr1c_test.hjson
-failStr1d_test.hjson
-failStr2a_test.hjson
-failStr2b_test.hjson
-failStr2c_test.hjson
-failStr2d_test.hjson
-failStr3a_test.hjson
-failStr3b_test.hjson
-failStr3c_test.hjson
-failStr3d_test.hjson
-failStr4a_test.hjson
-failStr4b_test.hjson
-failStr4c_test.hjson
-failStr4d_test.hjson
-failStr5a_test.hjson
-failStr5b_test.hjson
-failStr5c_test.hjson
-failStr5d_test.hjson
-failStr6a_test.hjson
-failStr6b_test.hjson
-failStr6c_test.hjson
-failStr6d_test.hjson
-kan_test.hjson
-keys_test.hjson
-oa_test.hjson
-pass1_test.json
-pass2_test.json
-pass3_test.json
-pass4_test.json
-passSingle_test.hjson
-root_test.hjson
-stringify1_test.hjson
-strings_test.hjson
-trail_test.hjson
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/trail_result.hjson b/old_nushell/tests/assets/nu_json/trail_result.hjson
deleted file mode 100644
index 57ffc716b..000000000
--- a/old_nushell/tests/assets/nu_json/trail_result.hjson
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  foo: 0   -- this string starts at 0 and ends at 1, preceding and trailing whitespace is ignored --   1
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/trail_result.json b/old_nushell/tests/assets/nu_json/trail_result.json
deleted file mode 100644
index 451c8ceb9..000000000
--- a/old_nushell/tests/assets/nu_json/trail_result.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "foo": "0   -- this string starts at 0 and ends at 1, preceding and trailing whitespace is ignored --   1"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/assets/nu_json/trail_test.hjson b/old_nushell/tests/assets/nu_json/trail_test.hjson
deleted file mode 100644
index 62d98e98a..000000000
--- a/old_nushell/tests/assets/nu_json/trail_test.hjson
+++ /dev/null
@@ -1,2 +0,0 @@
-// the following line contains trailing whitespace:
-foo:     0   -- this string starts at 0 and ends at 1, preceding and trailing whitespace is ignored --   1 	  	       
diff --git a/old_nushell/tests/fixtures/formats/appveyor.yml b/old_nushell/tests/fixtures/formats/appveyor.yml
deleted file mode 100644
index 770f32a2a..000000000
--- a/old_nushell/tests/fixtures/formats/appveyor.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-image: Visual Studio 2017
-
-environment:
-  global:
-    PROJECT_NAME: nushell
-    RUST_BACKTRACE: 1
-  matrix:
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: nightly
-      BITS: 64
-
-install:
-  - set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH%
-  - curl -sSf -o rustup-init.exe https://win.rustup.rs
-  # Install rust
-  - rustup-init.exe -y --default-host %TARGET% --default-toolchain %CHANNEL%-%TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  # Required for Racer autoconfiguration
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-
-build: false
-
-test_script:
-  # compile #[cfg(not(test))] code
-  - cargo build --verbose
-  - cargo test --all --verbose
-
-cache:
-  - target -> Cargo.lock
-  - C:\Users\appveyor\.cargo\registry -> Cargo.lock
diff --git a/old_nushell/tests/fixtures/formats/caco3_plastics.csv b/old_nushell/tests/fixtures/formats/caco3_plastics.csv
deleted file mode 100644
index 1a01e22c6..000000000
--- a/old_nushell/tests/fixtures/formats/caco3_plastics.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-importer,shipper,tariff_item,name,origin,shipped_at,arrived_at,net_weight,fob_price,cif_price,cif_per_net_weight
-PLASTICOS RIVAL CIA LTDA,S A REVERTE,2509000000,CARBONATO DE CALCIO TIPO CALCIPORE 160 T AL,SPAIN,18/03/2016,17/04/2016,"81,000.00","14,417.58","18,252.34",0.23
-MEXICHEM ECUADOR S.A.,OMYA ANDINA S A,2836500000,CARBONATO,COLOMBIA,07/07/2016,10/07/2016,"26,000.00","7,072.00","8,127.18",0.31
-PLASTIAZUAY SA,SA REVERTE,2836500000,CARBONATO DE CALCIO,SPAIN,27/07/2016,09/08/2016,"81,000.00","8,100.00","11,474.55",0.14
-PLASTICOS RIVAL CIA LTDA,AND ENDUSTRIYEL HAMMADDELER DIS TCARET LTD.STI.,2836500000,CALCIUM CARBONATE ANADOLU ANDCARB CT-1,TURKEY,04/10/2016,11/11/2016,"100,000.00","17,500.00","22,533.75",0.23
-QUIMICA COMERCIAL QUIMICIAL CIA. LTDA.,SA REVERTE,2836500000,CARBONATO DE CALCIO,SPAIN,24/06/2016,12/07/2016,"27,000.00","3,258.90","5,585.00",0.21
-PICA PLASTICOS INDUSTRIALES C.A.,OMYA ANDINA S.A,3824909999,CARBONATO DE CALCIO,COLOMBIA,01/01/1900,18/01/2016,"66,500.00","12,635.00","18,670.52",0.28
-PLASTIQUIM S.A.,OMYA ANDINA S.A NIT 830.027.386-6,3824909999,CARBONATO DE CALCIO RECUBIERTO CON ACIDO ESTEARICO OMYA CARB 1T CG BBS 1000,COLOMBIA,01/01/1900,25/10/2016,"33,000.00","6,270.00","9,999.00",0.30
-QUIMICOS ANDINOS QUIMANDI S.A.,SIBELCO COLOMBIA SAS,3824909999,CARBONATO DE CALCIO RECUBIERTO,COLOMBIA,01/11/2016,03/11/2016,"52,000.00","8,944.00","13,039.05",0.25
-TIGRE ECUADOR S.A. ECUATIGRE,OMYA ANDINA S.A NIT 830.027.386-6,3824909999,CARBONATO DE  CALCIO RECUBIERTO CON ACIDO ESTEARICO OMYACARB 1T CG BPA 25 NO,COLOMBIA,01/01/1900,28/10/2016,"66,000.00","11,748.00","18,216.00",0.28
diff --git a/old_nushell/tests/fixtures/formats/caco3_plastics.tsv b/old_nushell/tests/fixtures/formats/caco3_plastics.tsv
deleted file mode 100644
index d31093fe3..000000000
--- a/old_nushell/tests/fixtures/formats/caco3_plastics.tsv
+++ /dev/null
@@ -1,10 +0,0 @@
-importer	shipper	tariff_item	name	origin	shipped_at	arrived_at	net_weight	fob_price	cif_price	cif_per_net_weight
-PLASTICOS RIVAL CIA LTDA	S A REVERTE	2509000000	CARBONATO DE CALCIO TIPO CALCIPORE 160 T AL	SPAIN	18/03/2016	17/04/2016	81,000.00	14,417.58	18,252.34	0.23
-MEXICHEM ECUADOR S.A.	OMYA ANDINA S A	2836500000	CARBONATO	COLOMBIA	07/07/2016	10/07/2016	26,000.00	7,072.00	8,127.18	0.31
-PLASTIAZUAY SA	SA REVERTE	2836500000	CARBONATO DE CALCIO	SPAIN	27/07/2016	09/08/2016	81,000.00	8,100.00	11,474.55	0.14
-PLASTICOS RIVAL CIA LTDA	AND ENDUSTRIYEL HAMMADDELER DIS TCARET LTD.STI.	2836500000	CALCIUM CARBONATE ANADOLU ANDCARB CT-1	TURKEY	04/10/2016	11/11/2016	100,000.00	17,500.00	22,533.75	0.23
-QUIMICA COMERCIAL QUIMICIAL CIA. LTDA.	SA REVERTE	2836500000	CARBONATO DE CALCIO	SPAIN	24/06/2016	12/07/2016	27,000.00	3,258.90	5,585.00	0.21
-PICA PLASTICOS INDUSTRIALES C.A.	OMYA ANDINA S.A	3824909999	CARBONATO DE CALCIO	COLOMBIA	01/01/1900	18/01/2016	66,500.00	12,635.00	18,670.52	0.28
-PLASTIQUIM S.A.	OMYA ANDINA S.A NIT 830.027.386-6	3824909999	CARBONATO DE CALCIO RECUBIERTO CON ACIDO ESTEARICO OMYA CARB 1T CG BBS 1000	COLOMBIA	01/01/1900	25/10/2016	33,000.00	6,270.00	9,999.00	0.30
-QUIMICOS ANDINOS QUIMANDI S.A.	SIBELCO COLOMBIA SAS	3824909999	CARBONATO DE CALCIO RECUBIERTO	COLOMBIA	01/11/2016	03/11/2016	52,000.00	8,944.00	13,039.05	0.25
-TIGRE ECUADOR S.A. ECUATIGRE	OMYA ANDINA S.A NIT 830.027.386-6	3824909999	CARBONATO DE  CALCIO RECUBIERTO CON ACIDO ESTEARICO OMYACARB 1T CG BPA 25 NO	COLOMBIA	01/01/1900	28/10/2016	66,000.00	11,748.00	18,216.00	0.28
diff --git a/old_nushell/tests/fixtures/formats/cargo_sample.toml b/old_nushell/tests/fixtures/formats/cargo_sample.toml
deleted file mode 100644
index c36a40e0a..000000000
--- a/old_nushell/tests/fixtures/formats/cargo_sample.toml
+++ /dev/null
@@ -1,55 +0,0 @@
-[package]
-name = "nu"
-version = "0.1.1"
-authors = ["The Nu Project Contributors"]
-description = "a new type of shell"
-license = "ISC"
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-rustyline = "4.1.0"
-sysinfo = "0.8.4"
-chrono = { version = "0.4.6", features = ["serde"] }
-chrono-tz = "0.5.1"
-derive-new = "0.5.6"
-prettytable-rs = "0.8.0"
-itertools = "0.8.0"
-ansi_term = "0.11.0"
-conch-parser = "0.1.1"
-nom = "5.0.0-beta1"
-dunce = "1.0.0"
-indexmap = { version = "1.0.2", features = ["serde-1"] }
-chrono-humanize = "0.0.11"
-byte-unit = "2.1.0"
-ordered-float = "1.0.2"
-prettyprint = "0.6.0"
-cursive = { version = "0.12.0", features = ["pancurses-backend"], default-features = false }
-futures-preview = { version = "0.3.0-alpha.16", features = ["compat", "io-compat"] }
-futures-sink-preview = "0.3.0-alpha.16"
-tokio-fs = "0.1.6"
-futures_codec = "0.2.2"
-term = "0.5.2"
-bytes = "0.4.12"
-log = "0.4.6"
-pretty_env_logger = "0.3.0"
-lalrpop-util = "0.17.0"
-regex = "1.1.6"
-serde = "1.0.91"
-serde_json = "1.0.39"
-serde_derive = "1.0.91"
-getset = "0.0.7"
-logos = "0.10.0-rc2"
-logos-derive = "0.10.0-rc2"
-language-reporting = "0.3.0"
-directories = "2.0.2"
-toml = "0.5.1"
-toml-query = "0.9.0"
-
-[dependencies.pancurses]
-version = "0.16"
-features = ["win32a"]
-
-[dev-dependencies]
-pretty_assertions = "0.6.1"
diff --git a/old_nushell/tests/fixtures/formats/jonathan.xml b/old_nushell/tests/fixtures/formats/jonathan.xml
deleted file mode 100644
index 0ce0016c1..000000000
--- a/old_nushell/tests/fixtures/formats/jonathan.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/">
-	<channel>
-		<title>Jonathan Turner</title>
-		<link>http://www.jonathanturner.org</link>
-		<atom:link href="http://www.jonathanturner.org/feed.xml" rel="self" type="application/rss+xml" />
-		
-			<item>
-				<title>Creating crossplatform Rust terminal apps</title>
-        <description>&lt;p&gt;&lt;img src=&quot;/images/pikachu.jpg&quot; alt=&quot;Pikachu animation in Windows&quot; /&gt;&lt;/p&gt;
-
-&lt;p&gt;&lt;em&gt;Look Mom, Pikachu running in Windows CMD!&lt;/em&gt;&lt;/p&gt;
-
-&lt;p&gt;Part of the adventure is not seeing the way ahead and going anyway.&lt;/p&gt;
-</description>
-				<pubDate>Mon, 05 Oct 2015 00:00:00 +0000</pubDate>
-				<link>http://www.jonathanturner.org/2015/10/off-to-new-adventures.html</link>
-				<guid isPermaLink="true">http://www.jonathanturner.org/2015/10/off-to-new-adventures.html</guid>
-			</item>
-		
-	</channel>
-</rss>
diff --git a/old_nushell/tests/fixtures/formats/lines_test.txt b/old_nushell/tests/fixtures/formats/lines_test.txt
deleted file mode 100644
index 034e56b61..000000000
--- a/old_nushell/tests/fixtures/formats/lines_test.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-yyy
diff --git a/old_nushell/tests/fixtures/formats/random_numbers.csv b/old_nushell/tests/fixtures/formats/random_numbers.csv
deleted file mode 100644
index 5e5c69465..000000000
--- a/old_nushell/tests/fixtures/formats/random_numbers.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-random numbers
-5
-2
-0
-5
-1
-3
-5
-2
-1
-1
-0
-5
-1
-0
-0
-4
-0
-4
-5
-2
-2
-4
-3
-2
-5
-3
-1
-0
-5
-1
-2
-2
-5
-0
-1
-1
-5
-1
-1
-3
-3
-1
-5
-0
-2
-1
-3
-1
-1
-2
diff --git a/old_nushell/tests/fixtures/formats/sample-ls-output.json b/old_nushell/tests/fixtures/formats/sample-ls-output.json
deleted file mode 100644
index 4636f0353..000000000
--- a/old_nushell/tests/fixtures/formats/sample-ls-output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"name":"a.txt","type":"File","size":3444,"modified":"2020-07-1918:26:30.560716967UTC"},{"name":"B.txt","type":"File","size":1341,"modified":"2020-07-1918:26:30.561021953UTC"},{"name":"C","type":"Dir","size":118253,"modified":"2020-07-1918:26:30.562092480UTC"}]
diff --git a/old_nushell/tests/fixtures/formats/sample-ps-output.json b/old_nushell/tests/fixtures/formats/sample-ps-output.json
deleted file mode 100644
index 7ae34d66e..000000000
--- a/old_nushell/tests/fixtures/formats/sample-ps-output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"pid":10390,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":132112384,"virtual":4989624320},{"pid":10461,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":126992384,"virtual":4995346432},{"pid":10530,"name":"kworker/6:1-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":10593,"name":"kworker/1:1-mm_percpu_wq","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":10650,"name":"chrome","status":"Sleeping","cpu":8.026974,"mem":262434816,"virtual":5217419264},{"pid":10803,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":48173056,"virtual":542531584},{"pid":11191,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":124092416,"virtual":4975763456},{"pid":11210,"name":"kworker/7:0-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":11254,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":113070080,"virtual":4971659264},{"pid":11279,"name":"kworker/u16:0-events_unbound","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":11476,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":88993792,"virtual":4937097216},{"pid":12755,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":163397632,"virtual":5034328064},{"pid":12772,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":113561600,"virtual":4985073664},{"pid":14351,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":111861760,"virtual":4962754560},{"pid":17818,"name":"udisksd","status":"Sleeping","cpu":0.0,"mem":14409728,"virtual":402935808},{"pid":17815,"name":".gvfs-udisks2-v","status":"Sleeping","cpu":0.0,"mem":16199680,"virtual":585306112},{"pid":17831,"name":".gvfs-mtp-volum","status":"Sleeping","cpu":0.0,"mem":6393856,"virtual":454680576},{"pid":17836,"name":".gvfs-gphoto2-v","status":"Sleeping","cpu":0.0,"mem":7110656,"virtual":456966144},{"pid":17841,"name":".gvfs-afc-volum","status":"Sleeping","cpu":0.0,"mem":8585216,"virtual":537448448},{"pid":17846,"name":".gvfsd-trash-wr","status":"Sleeping","cpu":0.0,"mem":12767232,"virtual":577998848},{"pid":17856,"name":".gvfsd-network-","status":"Sleeping","cpu":0.0,"mem":13295616,"virtual":654110720},{"pid":17862,"name":".gvfsd-dnssd-wr","status":"Sleeping","cpu":0.0,"mem":7639040,"virtual":533233664},{"pid":17869,"name":"dconf-service","status":"Sleeping","cpu":0.0,"mem":5365760,"virtual":158957568},{"pid":18153,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":183738368,"virtual":5128962048},{"pid":23033,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":166035456,"virtual":5074878464},{"pid":24101,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":101224448,"virtual":4956262400},{"pid":24832,"name":"kworker/7:2-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":24912,"name":"kworker/5:2-events_power_efficient","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":25228,"name":"kworker/4:3-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":25678,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":117522432,"virtual":4970983424},{"pid":25706,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":30760960,"virtual":528375808},{"pid":26080,"name":"kworker/1:0-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":26818,"name":"kworker/2:0-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":26827,"name":"kworker/6:2-mm_percpu_wq","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":26832,"name":"kworker/0:2-mm_percpu_wq","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":26843,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":116621312,"virtual":4982403072},{"pid":27163,"name":"kworker/3:2-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":27800,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":128200704,"virtual":4965363712},{"pid":27820,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":54960128,"virtual":4895596544},{"pid":27898,"name":"kworker/3:0-mm_percpu_wq","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":27977,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":141930496,"virtual":4982546432},{"pid":28035,"name":"kworker/u16:1-events_unbound","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":28104,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":126853120,"virtual":5003902976},{"pid":28158,"name":"nu","status":"Sleeping","cpu":0.0,"mem":27344896,"virtual":870764544},{"pid":28236,"name":"chrome","status":"Sleeping","cpu":0.0,"mem":450560000,"virtual":5389582336},{"pid":29186,"name":"kworker/5:0-events","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":30140,"name":"kworker/u16:2-events_unbound","status":"Idle","cpu":0.0,"mem":0,"virtual":0},{"pid":30142,"name":"nu_plugin_core_","status":"Zombie","cpu":0.0,"mem":0,"virtual":0},{"pid":30356,"name":"sh","status":"Sleeping","cpu":0.0,"mem":3743744,"virtual":224092160},{"pid":30360,"name":"nu_plugin_core_ps","status":"Sleeping","cpu":80.23046000000001,"mem":6422528,"virtual":633016320}]
\ No newline at end of file
diff --git a/old_nushell/tests/fixtures/formats/sample-simple.json b/old_nushell/tests/fixtures/formats/sample-simple.json
deleted file mode 100644
index 7986b6e54..000000000
--- a/old_nushell/tests/fixtures/formats/sample-simple.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "first": "first",
-    "second": "this\nshould\nbe\nseparate\nlines"
-}
\ No newline at end of file
diff --git a/old_nushell/tests/fixtures/formats/sample-sys-output.json b/old_nushell/tests/fixtures/formats/sample-sys-output.json
deleted file mode 100644
index 122fd8594..000000000
--- a/old_nushell/tests/fixtures/formats/sample-sys-output.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-    "host": {
-        "name": "Linux",
-        "release": "5.4.33",
-        "version": "#1-NixOS SMP Fri Apr 17 08:50:26 UTC 2020",
-        "hostname": "nixos",
-        "arch": "x86_64",
-        "uptime": 105126,
-        "sessions": [
-            "alexj"
-        ]
-    },
-    "cpu": {
-        "cores": 8,
-        "current ghz": 2.4200000000000004,
-        "min ghz": 0.39999999999999997,
-        "max ghz": 3.4000000000000004
-    },
-    "disks": [
-        {
-            "device": "/dev/disk/by-uuid/e9adff48-c37b-4631-b98b-eaec9b410ba3",
-            "type": "ext4",
-            "mount": "/",
-            "total": 483445473280,
-            "used": 121866776576,
-            "free": 336949624832
-        },
-        {
-            "device": "/dev/disk/by-uuid/e9adff48-c37b-4631-b98b-eaec9b410ba3",
-            "type": "ext4",
-            "mount": "/nix/store",
-            "total": 483445473280,
-            "used": 121866776576,
-            "free": 336949624832
-        },
-        {
-            "device": "/dev/sda3",
-            "type": "vfat",
-            "mount": "/boot",
-            "total": 534757376,
-            "used": 72650752,
-            "free": 462106624
-        }
-    ],
-    "mem": {
-        "total": 16256524000,
-        "free": 3082268000,
-        "swap total": 18874344000,
-        "swap free": 18874344000
-    },
-    "temp": [
-        {
-            "unit": "iwlwifi_1",
-            "temp": 42.0
-        },
-        {
-            "unit": "acpitz",
-            "temp": 53.00000000000001,
-            "critical": 103.0
-        },
-        {
-            "unit": "coretemp",
-            "label": "Core 1",
-            "temp": 52.00000000000001,
-            "high": 100.0,
-            "critical": 100.0
-        },
-        {
-            "unit": "coretemp",
-            "label": "Core 2",
-            "temp": 52.00000000000001,
-            "high": 100.0,
-            "critical": 100.0
-        },
-        {
-            "unit": "coretemp",
-            "label": "Package id 0",
-            "temp": 52.00000000000001,
-            "high": 100.0,
-            "critical": 100.0
-        },
-        {
-            "unit": "coretemp",
-            "label": "Core 3",
-            "temp": 51.00000000000001,
-            "high": 100.0,
-            "critical": 100.0
-        },
-        {
-            "unit": "coretemp",
-            "label": "Core 0",
-            "temp": 51.00000000000001,
-            "high": 100.0,
-            "critical": 100.0
-        },
-        {
-            "unit": "pch_skylake",
-            "temp": 48.00000000000001
-        }
-    ],
-    "net": [
-        {
-            "name": "wlp2s0",
-            "sent": 387642399,
-            "recv": 15324719784
-        },
-        {
-            "name": "lo",
-            "sent": 2667,
-            "recv": 2667
-        },
-        {
-            "name": "vboxnet0",
-            "sent": 0,
-            "recv": 0
-        }
-    ],
-    "battery": [
-        {
-            "vendor": "ASUSTeK",
-            "model": "ASUS Battery",
-            "cycles": 445
-        }
-    ]
-}
diff --git a/old_nushell/tests/fixtures/formats/sample.bson b/old_nushell/tests/fixtures/formats/sample.bson
deleted file mode 100644
index ff51ae207..000000000
Binary files a/old_nushell/tests/fixtures/formats/sample.bson and /dev/null differ
diff --git a/old_nushell/tests/fixtures/formats/sample.db b/old_nushell/tests/fixtures/formats/sample.db
deleted file mode 100644
index df67bfce3..000000000
Binary files a/old_nushell/tests/fixtures/formats/sample.db and /dev/null differ
diff --git a/old_nushell/tests/fixtures/formats/sample.eml b/old_nushell/tests/fixtures/formats/sample.eml
deleted file mode 100644
index d17e28868..000000000
--- a/old_nushell/tests/fixtures/formats/sample.eml
+++ /dev/null
@@ -1,20 +0,0 @@
-MIME-Version: 1.0
-Date: Fri, 28 Aug 2020 13:59:02 -0700
-Message-ID: <CAOSGo93NuHieXLAKy6iC-0fqO_CxFtUO9asdzyAzdG6wLjGeouw@example.com>
-Subject: Test Message
-From: "from@example.com" <from@example.com>
-Reply-To: "replyto@example.com" <replyto@example.com>
-To: to@example.com
-Content-Type: multipart/alternative; boundary="0000000000009d71fb05adf6528a"
-
---0000000000009d71fb05adf6528a
-Content-Type: text/plain; charset="UTF-8"
-
-Test Message
-
---0000000000009d71fb05adf6528a
-Content-Type: text/html; charset="UTF-8"
-
-<div dir="ltr">Test Message</div>
-
---0000000000009d71fb05adf6528a--
diff --git a/old_nushell/tests/fixtures/formats/sample.ini b/old_nushell/tests/fixtures/formats/sample.ini
deleted file mode 100644
index c8f248528..000000000
--- a/old_nushell/tests/fixtures/formats/sample.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[SectionOne]
-
-key = value
-integer = 1234
-real = 3.14
-string1 = 'Case 1'
-string2 = "Case 2"
-
-[SectionTwo]
-
-; comment line
-key = new value
-integer = 5678
-real = 3.14
-string1 = 'Case 1'
-string2 = "Case 2"
-string3 = 'Case 3'
-
-
diff --git a/old_nushell/tests/fixtures/formats/sample.url b/old_nushell/tests/fixtures/formats/sample.url
deleted file mode 100644
index 361d70dbb..000000000
--- a/old_nushell/tests/fixtures/formats/sample.url
+++ /dev/null
@@ -1 +0,0 @@
-bread=baguette&cheese=comt%C3%A9&meat=ham&fat=butter
\ No newline at end of file
diff --git a/old_nushell/tests/fixtures/formats/sample_data.ods b/old_nushell/tests/fixtures/formats/sample_data.ods
deleted file mode 100644
index 5bcd2bda4..000000000
Binary files a/old_nushell/tests/fixtures/formats/sample_data.ods and /dev/null differ
diff --git a/old_nushell/tests/fixtures/formats/sample_data.xlsx b/old_nushell/tests/fixtures/formats/sample_data.xlsx
deleted file mode 100644
index 1cd1b832a..000000000
Binary files a/old_nushell/tests/fixtures/formats/sample_data.xlsx and /dev/null differ
diff --git a/old_nushell/tests/fixtures/formats/sample_headers.xlsx b/old_nushell/tests/fixtures/formats/sample_headers.xlsx
deleted file mode 100644
index f05428dd5..000000000
Binary files a/old_nushell/tests/fixtures/formats/sample_headers.xlsx and /dev/null differ
diff --git a/old_nushell/tests/fixtures/formats/script.nu b/old_nushell/tests/fixtures/formats/script.nu
deleted file mode 100644
index b79dfdcbb..000000000
--- a/old_nushell/tests/fixtures/formats/script.nu
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/Users/gedge/src/github.com/nushell/nushell/target/debug/nu
-echo "done"
diff --git a/old_nushell/tests/fixtures/formats/script_multiline.nu b/old_nushell/tests/fixtures/formats/script_multiline.nu
deleted file mode 100644
index 389a3148a..000000000
--- a/old_nushell/tests/fixtures/formats/script_multiline.nu
+++ /dev/null
@@ -1,2 +0,0 @@
-echo [1 4] | length
-echo [2 3 5] | length
diff --git a/old_nushell/tests/fixtures/formats/sgml_description.json b/old_nushell/tests/fixtures/formats/sgml_description.json
deleted file mode 100644
index d76af0fe9..000000000
--- a/old_nushell/tests/fixtures/formats/sgml_description.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "glossary": {
-        "title": "example glossary",
-        "GlossDiv": {
-            "title": "S",
-            "GlossList": {
-                "GlossEntry": {
-                    "ID": "SGML",
-                    "SortAs": "SGML",
-                    "GlossTerm": "Standard Generalized Markup Language",
-                    "Acronym": "SGML",
-                    "Abbrev": "ISO 8879:1986",
-                    "Height": 10,
-                    "GlossDef": {
-                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
-                        "GlossSeeAlso": [
-                            "GML",
-                            "XML"
-                        ]
-                    },
-                    "Sections": [
-                        101,
-                        102
-                    ],
-                    "GlossSee": "markup"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/old_nushell/tests/fixtures/formats/utf16.ini b/old_nushell/tests/fixtures/formats/utf16.ini
deleted file mode 100644
index c68b44ccd..000000000
Binary files a/old_nushell/tests/fixtures/formats/utf16.ini and /dev/null differ
diff --git a/old_nushell/tests/fixtures/playground/config/default.toml b/old_nushell/tests/fixtures/playground/config/default.toml
deleted file mode 100644
index 5939aacd4..000000000
--- a/old_nushell/tests/fixtures/playground/config/default.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-skip_welcome_message = true
-filesize_format = "auto"
-rm_always_trash = false
diff --git a/old_nushell/tests/fixtures/playground/config/startup.toml b/old_nushell/tests/fixtures/playground/config/startup.toml
deleted file mode 100644
index c4b9e0678..000000000
--- a/old_nushell/tests/fixtures/playground/config/startup.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-skip_welcome_message = true
-
-startup = ["def hello-world [] { echo 'Nu World' }"]
diff --git a/old_nushell/tests/main.rs b/old_nushell/tests/main.rs
deleted file mode 100644
index 30f5e27fe..000000000
--- a/old_nushell/tests/main.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate nu_test_support;
-
-mod path;
-mod plugins;
-mod shell;
diff --git a/old_nushell/tests/path/canonicalize.rs b/old_nushell/tests/path/canonicalize.rs
deleted file mode 100644
index 2db66c800..000000000
--- a/old_nushell/tests/path/canonicalize.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-use std::path::Path;
-
-use nu_test_support::fs::Stub::EmptyFile;
-use nu_test_support::playground::Playground;
-
-use nu_path::{canonicalize, canonicalize_with};
-
-#[test]
-fn canonicalize_path() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let mut spam = dirs.test().clone();
-        spam.push("spam.txt");
-
-        let actual = canonicalize(spam).expect("Failed to canonicalize");
-
-        assert!(actual.ends_with("spam.txt"));
-    });
-}
-
-#[test]
-fn canonicalize_unicode_path() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("🚒.txt")]);
-
-        let mut spam = dirs.test().clone();
-        spam.push("🚒.txt");
-
-        let actual = canonicalize(spam).expect("Failed to canonicalize");
-
-        assert!(actual.ends_with("🚒.txt"));
-    });
-}
-
-#[ignore]
-#[test]
-fn canonicalize_non_utf8_path() {
-    // TODO
-}
-
-#[test]
-fn canonicalize_path_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with("spam.txt", dirs.test()).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_unicode_path_relative_to_unicode_path_with_spaces() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("e-$ èрт🚒♞中片-j");
-        sandbox.with_files(vec![EmptyFile("e-$ èрт🚒♞中片-j/🚒.txt")]);
-
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("e-$ èрт🚒♞中片-j");
-
-        let actual = canonicalize_with("🚒.txt", relative_to).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("e-$ èрт🚒♞中片-j/🚒.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[ignore]
-#[test]
-fn canonicalize_non_utf8_path_relative_to_non_utf8_path_with_spaces() {
-    // TODO
-}
-
-#[test]
-fn canonicalize_absolute_path_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let mut absolute_path = dirs.test().clone();
-        absolute_path.push("spam.txt");
-
-        let actual = canonicalize_with(&absolute_path, "non/existent/directory")
-            .expect("Failed to canonicalize");
-        let expected = absolute_path;
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_dot() {
-    let actual = canonicalize(".").expect("Failed to canonicalize");
-    let expected = std::env::current_dir().expect("Could not get current directory");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn canonicalize_many_dots() {
-    let actual = canonicalize("././/.//////./././//.///").expect("Failed to canonicalize");
-    let expected = std::env::current_dir().expect("Could not get current directory");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn canonicalize_path_with_dot_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with("./spam.txt", dirs.test()).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_many_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with("././/.//////./././//.////spam.txt", dirs.test())
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_double_dot() {
-    let actual = canonicalize("..").expect("Failed to canonicalize");
-    let cwd = std::env::current_dir().expect("Could not get current directory");
-    let expected = cwd
-        .parent()
-        .expect("Could not get parent of current directory");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn canonicalize_path_with_double_dot_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual =
-            canonicalize_with("foo/../spam.txt", dirs.test()).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_many_double_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with("foo/bar/baz/../../../spam.txt", dirs.test())
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_ndots() {
-    let actual = canonicalize("...").expect("Failed to canonicalize");
-    let cwd = std::env::current_dir().expect("Could not get current directory");
-    let expected = cwd
-        .parent()
-        .expect("Could not get parent of current directory")
-        .parent()
-        .expect("Could not get parent of a parent of current directory");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn canonicalize_path_with_3_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual =
-            canonicalize_with("foo/bar/.../spam.txt", dirs.test()).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_many_3_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz/eggs/sausage/bacon");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with(
-            "foo/bar/baz/eggs/sausage/bacon/.../.../.../spam.txt",
-            dirs.test(),
-        )
-        .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_4_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with("foo/bar/baz/..../spam.txt", dirs.test())
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_many_4_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz/eggs/sausage/bacon");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let actual = canonicalize_with(
-            "foo/bar/baz/eggs/sausage/bacon/..../..../spam.txt",
-            dirs.test(),
-        )
-        .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_path_with_way_too_many_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz/eggs/sausage/bacon/vikings");
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("foo/bar/baz/eggs/sausage/bacon/vikings");
-
-        let actual = canonicalize_with("././..////././...///././.....///spam.txt", relative_to)
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_unicode_path_with_way_too_many_dots_relative_to_unicode_path_with_spaces() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/áčěéí  +šř=é/baz/eggs/e-$ èрт🚒♞中片-j/bacon/öäöä öäöä");
-        sandbox.with_files(vec![EmptyFile("🚒.txt")]);
-
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("foo/áčěéí  +šř=é/baz/eggs/e-$ èрт🚒♞中片-j/bacon/öäöä öäöä");
-
-        let actual = canonicalize_with("././..////././...///././.....///🚒.txt", relative_to)
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("🚒.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_tilde() {
-    let tilde_path = "~";
-
-    let actual = canonicalize(tilde_path).expect("Failed to canonicalize");
-
-    assert!(actual.is_absolute());
-    assert!(!actual.starts_with("~"));
-}
-
-#[test]
-fn canonicalize_tilde_relative_to() {
-    let tilde_path = "~";
-
-    let actual =
-        canonicalize_with(tilde_path, "non/existent/path").expect("Failed to canonicalize");
-
-    assert!(actual.is_absolute());
-    assert!(!actual.starts_with("~"));
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[test]
-fn canonicalize_symlink() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-        sandbox.symlink("spam.txt", "link_to_spam.txt");
-
-        let mut symlink_path = dirs.test().clone();
-        symlink_path.push("link_to_spam.txt");
-
-        let actual = canonicalize(symlink_path).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[test]
-fn canonicalize_symlink_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-        sandbox.symlink("spam.txt", "link_to_spam.txt");
-
-        let actual =
-            canonicalize_with("link_to_spam.txt", dirs.test()).expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[cfg(not(windows))] // seems like Windows symlink requires existing file or dir
-#[test]
-fn canonicalize_symlink_loop_relative_to_should_fail() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        // sandbox.with_files(vec![EmptyFile("spam.txt")]);
-        sandbox.symlink("spam.txt", "link_to_spam.txt");
-        sandbox.symlink("link_to_spam.txt", "spam.txt");
-
-        let actual = canonicalize_with("link_to_spam.txt", dirs.test());
-
-        assert!(actual.is_err());
-    });
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[test]
-fn canonicalize_nested_symlink_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![EmptyFile("spam.txt")]);
-        sandbox.symlink("spam.txt", "link_to_spam.txt");
-        sandbox.symlink("link_to_spam.txt", "link_to_link_to_spam.txt");
-
-        let actual = canonicalize_with("link_to_link_to_spam.txt", dirs.test())
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-#[test]
-fn canonicalize_nested_symlink_within_symlink_dir_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar/baz");
-        sandbox.with_files(vec![EmptyFile("foo/bar/baz/spam.txt")]);
-        sandbox.symlink("foo/bar/baz/spam.txt", "foo/bar/link_to_spam.txt");
-        sandbox.symlink("foo/bar/link_to_spam.txt", "foo/link_to_link_to_spam.txt");
-        sandbox.symlink("foo", "link_to_foo");
-
-        let actual = canonicalize_with("link_to_foo/link_to_link_to_spam.txt", dirs.test())
-            .expect("Failed to canonicalize");
-        let mut expected = dirs.test().clone();
-        expected.push("foo/bar/baz/spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn canonicalize_should_fail() {
-    let path = Path::new("/foo/bar/baz"); // hopefully, this path does not exist
-
-    assert!(canonicalize(path).is_err());
-}
-
-#[test]
-fn canonicalize_with_should_fail() {
-    let relative_to = "/foo";
-    let path = "bar/baz";
-
-    assert!(canonicalize_with(path, relative_to).is_err());
-}
diff --git a/old_nushell/tests/path/expand_path.rs b/old_nushell/tests/path/expand_path.rs
deleted file mode 100644
index 9453e1300..000000000
--- a/old_nushell/tests/path/expand_path.rs
+++ /dev/null
@@ -1,294 +0,0 @@
-use std::path::PathBuf;
-
-use nu_test_support::playground::Playground;
-
-use nu_path::{expand_path, expand_path_with};
-
-#[test]
-fn expand_path_with_and_without_relative() {
-    let relative_to = "/foo/bar";
-    let path = "../..";
-    let full_path = "/foo/bar/../..";
-
-    assert_eq!(expand_path(full_path), expand_path_with(path, relative_to),);
-}
-
-#[test]
-fn expand_path_with_relative() {
-    let relative_to = "/foo/bar";
-    let path = "../..";
-
-    assert_eq!(PathBuf::from("/"), expand_path_with(path, relative_to),);
-}
-
-#[test]
-fn expand_path_no_change() {
-    let path = "/foo/bar";
-
-    let actual = expand_path(&path);
-
-    assert_eq!(actual, PathBuf::from(path));
-}
-
-#[test]
-fn expand_unicode_path_no_change() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let mut spam = dirs.test().clone();
-        spam.push("🚒.txt");
-
-        let actual = expand_path(spam);
-        let mut expected = dirs.test().clone();
-        expected.push("🚒.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[ignore]
-#[test]
-fn expand_non_utf8_path() {
-    // TODO
-}
-
-#[test]
-fn expand_path_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_unicode_path_relative_to_unicode_path_with_spaces() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("e-$ èрт🚒♞中片-j");
-
-        let actual = expand_path_with("🚒.txt", relative_to);
-        let mut expected = dirs.test().clone();
-        expected.push("e-$ èрт🚒♞中片-j/🚒.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[ignore]
-#[test]
-fn expand_non_utf8_path_relative_to_non_utf8_path_with_spaces() {
-    // TODO
-}
-
-#[test]
-fn expand_absolute_path_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let mut absolute_path = dirs.test().clone();
-        absolute_path.push("spam.txt");
-
-        let actual = expand_path_with(&absolute_path, "non/existent/directory");
-        let expected = absolute_path;
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_dot() {
-    let actual = expand_path(".");
-    let expected = PathBuf::from(".");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_many_dots() {
-    let actual = expand_path("././/.//////./././//.///");
-    let expected = PathBuf::from("././././././.");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_with_dot_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("./spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_double_dot() {
-    let actual = expand_path("..");
-    let expected = PathBuf::from("..");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_dot_double_dot() {
-    let actual = expand_path("./..");
-    let expected = PathBuf::from("./..");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_double_dot_dot() {
-    let actual = expand_path("../.");
-    let expected = PathBuf::from("..");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_with_many_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("././/.//////./././//.////spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_double_dot_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("foo/../spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_many_double_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("foo/bar/baz/../../../spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_ndots() {
-    let actual = expand_path("...");
-    let mut expected = PathBuf::from("..");
-    expected.push("..");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_normal_path_ndots() {
-    let actual = expand_path("foo/bar/baz/...");
-    let expected = PathBuf::from("foo");
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn expand_path_with_3_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("foo/bar/.../spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_many_3_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with(
-            "foo/bar/baz/eggs/sausage/bacon/.../.../.../spam.txt",
-            dirs.test(),
-        );
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_4_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with("foo/bar/baz/..../spam.txt", dirs.test());
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_many_4_ndots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let actual = expand_path_with(
-            "foo/bar/baz/eggs/sausage/bacon/..../..../spam.txt",
-            dirs.test(),
-        );
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_with_way_too_many_dots_relative_to() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("foo/bar/baz/eggs/sausage/bacon/vikings");
-
-        let actual = expand_path_with("././..////././...///././.....///spam.txt", relative_to);
-        let mut expected = dirs.test().clone();
-        expected.push("spam.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_unicode_path_with_way_too_many_dots_relative_to_unicode_path_with_spaces() {
-    Playground::setup("nu_path_test_1", |dirs, _| {
-        let mut relative_to = dirs.test().clone();
-        relative_to.push("foo/áčěéí  +šř=é/baz/eggs/e-$ èрт🚒♞中片-j/bacon/öäöä öäöä");
-
-        let actual = expand_path_with("././..////././...///././.....///🚒.txt", relative_to);
-        let mut expected = dirs.test().clone();
-        expected.push("🚒.txt");
-
-        assert_eq!(actual, expected);
-    });
-}
-
-#[test]
-fn expand_path_tilde() {
-    let tilde_path = "~";
-
-    let actual = expand_path(tilde_path);
-
-    assert!(actual.is_absolute());
-    assert!(!actual.starts_with("~"));
-}
-
-#[test]
-fn expand_path_tilde_relative_to() {
-    let tilde_path = "~";
-
-    let actual = expand_path_with(tilde_path, "non/existent/path");
-
-    assert!(actual.is_absolute());
-    assert!(!actual.starts_with("~"));
-}
diff --git a/old_nushell/tests/path/mod.rs b/old_nushell/tests/path/mod.rs
deleted file mode 100644
index 2b679c72b..000000000
--- a/old_nushell/tests/path/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod canonicalize;
-mod expand_path;
diff --git a/old_nushell/tests/plugins/core_inc.rs b/old_nushell/tests/plugins/core_inc.rs
deleted file mode 100644
index af7e26143..000000000
--- a/old_nushell/tests/plugins/core_inc.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::nu_with_plugins;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn can_only_apply_one() {
-    let actual = nu_with_plugins!(
-        cwd: "tests/fixtures/formats",
-        "open cargo_sample.toml | first 1 | inc package.version --major --minor"
-    );
-
-    assert!(actual
-        .err
-        .contains("Usage: inc field [--major|--minor|--patch]"));
-}
-
-#[test]
-fn by_one_with_field_passed() {
-    Playground::setup("plugin_inc_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    edition = "2018"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | inc package.edition | get package.edition"
-        );
-
-        assert_eq!(actual.out, "2019");
-    })
-}
-
-#[test]
-fn by_one_with_no_field_passed() {
-    Playground::setup("plugin_inc_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    contributors = "2"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | get package.contributors | inc"
-        );
-
-        assert_eq!(actual.out, "3");
-    })
-}
-
-#[test]
-fn semversion_major_inc() {
-    Playground::setup("plugin_inc_test_3", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    version = "0.1.3"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | inc package.version -M | get package.version"
-        );
-
-        assert_eq!(actual.out, "1.0.0");
-    })
-}
-
-#[test]
-fn semversion_minor_inc() {
-    Playground::setup("plugin_inc_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    version = "0.1.3"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | inc package.version --minor | get package.version"
-        );
-
-        assert_eq!(actual.out, "0.2.0");
-    })
-}
-
-#[test]
-fn semversion_patch_inc() {
-    Playground::setup("plugin_inc_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    version = "0.1.3"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | inc package.version --patch | get package.version"
-        );
-
-        assert_eq!(actual.out, "0.1.4");
-    })
-}
-
-#[test]
-fn semversion_without_passing_field() {
-    Playground::setup("plugin_inc_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            "sample.toml",
-            r#"
-                    [package]
-                    version = "0.1.3"
-                "#,
-        )]);
-
-        let actual = nu_with_plugins!(
-            cwd: dirs.test(),
-            "open sample.toml | get package.version | inc --patch"
-        );
-
-        assert_eq!(actual.out, "0.1.4");
-    })
-}
diff --git a/old_nushell/tests/plugins/mod.rs b/old_nushell/tests/plugins/mod.rs
deleted file mode 100644
index 23310d10b..000000000
--- a/old_nushell/tests/plugins/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#[cfg(features = "inc")]
-mod core_inc;
diff --git a/old_nushell/tests/shell/environment/configuration.rs b/old_nushell/tests/shell/environment/configuration.rs
deleted file mode 100644
index d44dd7e75..000000000
--- a/old_nushell/tests/shell/environment/configuration.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use nu_test_support::fs::{file_contents, Stub::FileWithContent};
-use nu_test_support::fs::{AbsolutePath, DisplayPath};
-use nu_test_support::pipeline as input;
-use nu_test_support::playground::{says, Executable, Playground};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn clears_the_configuration() {
-    Playground::setup("config_clear_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-            pivot_mode = "arepas"
-            "#,
-        )]);
-
-        assert!(nu.pipeline("config clear").execute().is_ok());
-        assert!(file_contents(&file).is_empty());
-    });
-}
-
-#[test]
-fn retrieves_config_values() {
-    Playground::setup("config_get_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-
-            [arepa]
-            colors = ["yellow", "white"]
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config get arepa.colors.0"),
-            says().stdout("yellow")
-        );
-    })
-}
-
-#[test]
-fn sets_a_config_value() {
-    Playground::setup("config_set_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-            
-            [nu]
-            meal = "taco"
-            "#,
-        )]);
-
-        assert!(nu.pipeline("config set nu.meal 'arepa'").execute().is_ok());
-
-        assert_that!(nu.pipeline("config get nu.meal"), says().stdout("arepa"));
-    })
-}
-
-#[test]
-fn sets_config_values_into_one_property() {
-    Playground::setup("config_set_into_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-            "#,
-        )]);
-
-        assert!(nu
-            .pipeline(&input(
-                r#"
-            echo ["amarillo", "blanco"]
-            | config set_into arepa_colors
-        "#,
-            ))
-            .execute()
-            .is_ok());
-
-        assert_that!(
-            nu.pipeline("config get arepa_colors.1"),
-            says().stdout("blanco")
-        );
-    })
-}
-
-#[test]
-fn config_path() {
-    Playground::setup("config_path_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-            "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config path"),
-            says().stdout(&file.display_path())
-        );
-    })
-}
-
-#[test]
-fn removes_config_values() {
-    Playground::setup("config_remove_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-            skip_welcome_message = true
-            "#,
-        )]);
-
-        assert!(nu
-            .pipeline("config remove skip_welcome_message")
-            .execute()
-            .is_ok());
-        assert!(file_contents(&file).is_empty());
-    })
-}
diff --git a/old_nushell/tests/shell/environment/env.rs b/old_nushell/tests/shell/environment/env.rs
deleted file mode 100644
index 960c7c884..000000000
--- a/old_nushell/tests/shell/environment/env.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use super::support::Trusted;
-
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::nu;
-use nu_test_support::playground::Playground;
-
-use serial_test::serial;
-
-#[test]
-fn env_shorthand() {
-    let actual = nu!(cwd: ".", r#"
-        FOO=bar echo $nu.env.FOO
-        "#);
-    assert_eq!(actual.out, "bar");
-}
-
-#[test]
-fn env_shorthand_with_equals() {
-    let actual = nu!(cwd: ".", r#"
-        RUST_LOG=my_module=info $nu.env.RUST_LOG
-    "#);
-    assert_eq!(actual.out, "my_module=info");
-}
-
-#[test]
-fn env_shorthand_with_comma_equals() {
-    let actual = nu!(cwd: ".", r#"
-        RUST_LOG=info,my_module=info $nu.env.RUST_LOG
-    "#);
-    assert_eq!(actual.out, "info,my_module=info");
-}
-
-#[test]
-fn env_shorthand_with_comma_colons_equals() {
-    let actual = nu!(cwd: ".", r#"
-        RUST_LOG=info,my_module=info,lib_crate::lib_mod=trace $nu.env.RUST_LOG
-    "#);
-    assert_eq!(actual.out, "info,my_module=info,lib_crate::lib_mod=trace");
-}
-
-#[test]
-fn env_shorthand_multi_second_with_comma_colons_equals() {
-    let actual = nu!(cwd: ".", r#"
-        FOO=bar RUST_LOG=info,my_module=info,lib_crate::lib_mod=trace $nu.env.FOO + $nu.env.RUST_LOG
-    "#);
-    assert_eq!(
-        actual.out,
-        "barinfo,my_module=info,lib_crate::lib_mod=trace"
-    );
-}
-
-#[test]
-fn env_shorthand_multi_first_with_comma_colons_equals() {
-    let actual = nu!(cwd: ".", r#"
-        RUST_LOG=info,my_module=info,lib_crate::lib_mod=trace FOO=bar $nu.env.FOO + $nu.env.RUST_LOG
-    "#);
-    assert_eq!(
-        actual.out,
-        "barinfo,my_module=info,lib_crate::lib_mod=trace"
-    );
-}
-
-#[test]
-fn env_shorthand_multi() {
-    let actual = nu!(cwd: ".", r#"
-        FOO=bar BAR=baz $nu.env.FOO + $nu.env.BAR
-    "#);
-    assert_eq!(actual.out, "barbaz");
-}
-
-#[test]
-fn passes_let_env_env_var_to_external_process() {
-    let actual = nu!(cwd: ".", r#"
-        let-env FOO = foo
-        nu --testbin echo_env FOO
-        "#);
-    assert_eq!(actual.out, "foo");
-}
-
-#[test]
-fn passes_with_env_env_var_to_external_process() {
-    let actual = nu!(cwd: ".", r#"
-        with-env [FOO foo] {nu --testbin echo_env FOO}
-        "#);
-    assert_eq!(actual.out, "foo");
-}
-
-#[test]
-#[serial]
-fn passes_env_from_local_cfg_to_external_process() {
-    Playground::setup("autoenv_dir", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"[env]
-            FOO = "foo"
-            "#,
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                nu --testbin echo_env FOO
-            "#)
-        });
-
-        assert_eq!(actual.out, "foo");
-    })
-}
diff --git a/old_nushell/tests/shell/environment/in_sync.rs b/old_nushell/tests/shell/environment/in_sync.rs
deleted file mode 100644
index ea537c6c3..000000000
--- a/old_nushell/tests/shell/environment/in_sync.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::fs::{AbsolutePath, DisplayPath};
-use nu_test_support::playground::{says, Playground};
-
-use std::path::PathBuf;
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[test]
-fn setting_environment_value_to_configuration_should_pick_up_into_in_memory_environment_on_runtime()
-{
-    Playground::setup("environment_syncing_test_1", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_config(&file);
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-
-                [env]
-                SHELL = "/local/nu"
-                "#,
-        )]);
-
-        assert_that!(
-            nu.pipeline("config set env.USER NUNO | ignore")
-                .and_then("echo $nu.env.USER"),
-            says().stdout("NUNO")
-        );
-    });
-}
-
-#[test]
-fn inherited_environment_values_not_present_in_configuration_should_pick_up_into_in_memory_environment(
-) {
-    Playground::setup("environment_syncing_test_2", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-
-                [env]
-                SHELL = "/local/nu"
-                "#,
-        )])
-        .with_config(&file)
-        .with_env("USER", "NUNO");
-
-        assert_that!(nu.pipeline("echo $nu.env.USER"), says().stdout("NUNO"));
-    });
-}
-
-#[test]
-fn environment_values_present_in_configuration_overwrites_inherited_environment_values() {
-    Playground::setup("environment_syncing_test_3", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-
-                [env]
-                SHELL = "/usr/bin/you_already_made_the_nu_choice"
-                "#,
-        )])
-        .with_config(&file)
-        .with_env("SHELL", "/usr/bin/sh");
-
-        assert_that!(
-            nu.pipeline("echo $nu.env.SHELL"),
-            says().stdout("/usr/bin/you_already_made_the_nu_choice")
-        );
-    });
-}
-
-#[test]
-fn inherited_environment_path_values_not_present_in_configuration_should_pick_up_into_in_memory_environment(
-) {
-    Playground::setup("environment_syncing_test_4", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.test().join("config.toml"));
-
-        let expected_paths = vec![
-            PathBuf::from("/Users/andresrobalino/.volta/bin"),
-            PathBuf::from("/Users/mosqueteros/bin"),
-            PathBuf::from("/path/to/be/added"),
-        ]
-        .iter()
-        .map(|p| p.display_path())
-        .collect::<Vec<_>>()
-        .join("-");
-
-        nu.with_files(vec![FileWithContent(
-            "config.toml",
-            r#"
-                skip_welcome_message = true
-
-                path = ["/Users/andresrobalino/.volta/bin", "/Users/mosqueteros/bin"]
-                "#,
-        )])
-        .with_config(&file)
-        .with_env(
-            nu_test_support::NATIVE_PATH_ENV_VAR,
-            &PathBuf::from("/path/to/be/added").display_path(),
-        );
-
-        assert_that!(
-            nu.pipeline("echo $nu.path | str collect '-'"),
-            says().stdout(&expected_paths)
-        );
-    });
-}
diff --git a/old_nushell/tests/shell/environment/mod.rs b/old_nushell/tests/shell/environment/mod.rs
deleted file mode 100644
index f505dcbf3..000000000
--- a/old_nushell/tests/shell/environment/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-mod configuration;
-mod env;
-mod in_sync;
-mod nu_env;
-
-pub mod support {
-    use nu_test_support::{nu, playground::*, Outcome};
-
-    pub struct Trusted;
-
-    impl Trusted {
-        pub fn in_path(dirs: &Dirs, block: impl FnOnce() -> Outcome) -> Outcome {
-            let for_env_manifest = dirs.test().to_string_lossy();
-
-            nu!(cwd: dirs.root(), format!("autoenv trust \"{}\"", for_env_manifest));
-            let out = block();
-            nu!(cwd: dirs.root(), format!("autoenv untrust \"{}\"", for_env_manifest));
-
-            out
-        }
-    }
-}
diff --git a/old_nushell/tests/shell/environment/nu_env.rs b/old_nushell/tests/shell/environment/nu_env.rs
deleted file mode 100644
index e22baf0a4..000000000
--- a/old_nushell/tests/shell/environment/nu_env.rs
+++ /dev/null
@@ -1,672 +0,0 @@
-use super::support::Trusted;
-
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::playground::Playground;
-use nu_test_support::{nu, pipeline};
-
-use serial_test::serial;
-
-const SCRIPTS: &str = r#"startup = ["touch hello.txt"]
-    on_exit = ["touch bye.txt"]"#;
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "testvalue";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $nu.env.testkey"));
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[cfg(feature = "which-support")]
-#[test]
-#[serial]
-fn picks_up_and_lets_go_env_keys_when_entering_trusted_directory_with_implied_cd() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-               testkey = "testvalue"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"
-                [env]
-               bar = "true"
-                "#,
-            ),
-        ]);
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-            do {autoenv trust -q foo ; = $nothing }
-            foo
-            echo $nu.env.testkey"#
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is gone when leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-            do {autoenv trust -q foo; = $nothing } ;
-            foo
-            ..
-            echo $nu.env.testkey
-            "#
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-            do {autoenv trust -q foo; = $nothing } ;
-            do {autoenv trust -q foo/bar; = $nothing } ;
-            foo/bar
-            echo $nu.env.testkey
-            echo $nu.env.bar
-            "#
-        );
-        assert_eq!(actual.out, "testvaluetrue");
-        //Assert bar removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo;
-               foo/bar
-               ../..
-               echo $nu.env.bar"#
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[test]
-#[serial]
-#[ignore]
-fn picks_up_script_vars_when_entering_trusted_directory() {
-    Playground::setup("autoenv_test_2", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let expected = "myval";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $nu.env.myscript"));
-
-        // scriptvars are not supported
-        // and why is myval expected when myscript is "echo myval"
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn picks_up_env_keys_when_entering_trusted_directory_indirectly() {
-    Playground::setup("autoenv_test_3", |dirs, sandbox| {
-        sandbox.mkdir("crates");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"[env]
-                nu-ver = "0.30.0" "#,
-        )]);
-
-        let expected = "0.30.0";
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().join("crates"), r#"
-                cd ../../autoenv_test_3
-                echo $nu.env.nu-ver
-            "#)
-        });
-
-        assert_eq!(actual.out, expected);
-    })
-}
-
-#[test]
-#[serial]
-fn entering_a_trusted_directory_runs_entry_scripts() {
-    Playground::setup("autoenv_test_4", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), pipeline(r#"
-                ls
-                | where name == "hello.txt"
-                | get name
-            "#))
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn leaving_a_trusted_directory_runs_exit_scripts() {
-    Playground::setup("autoenv_test_5", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-              cd ..
-              ls autoenv_test_5 | get name | path basename | where $it == "bye.txt"
-            "#)
-        });
-
-        assert_eq!(actual.out, "bye.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn entry_scripts_are_called_when_revisiting_a_trusted_directory() {
-    Playground::setup("autoenv_test_6", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                do { rm hello.txt | ignore } ; # Silence file deletion message from output
-                cd ..
-                cd autoenv_test_6
-                ls | where name == "hello.txt" | get name
-            "#)
-        });
-
-        assert_eq!(actual.out, "hello.txt");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_entry_scripts_when_entering_a_subdirectory_entry_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_7", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "hello.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_trusted_directory_with_exit_scripts_when_entering_a_subdirectory_exit_scripts_are_not_called(
-) {
-    Playground::setup("autoenv_test_8", |dirs, sandbox| {
-        sandbox.mkdir("time_to_cook_arepas");
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            &format!(
-                "{}\n{}",
-                SCRIPTS,
-                r#"[env]
-                testkey = "testvalue"
-
-               [scriptvars]
-                myscript = "echo myval"
-            "#
-            ),
-        )]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                cd time_to_cook_arepas
-                ls | where name == "bye.txt" | length
-            "#)
-        });
-
-        assert_eq!(actual.out, "0");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierachy_of_trusted_directories_when_entering_in_any_nested_ones_should_carry_over_variables_set_from_the_root(
-) {
-    Playground::setup("autoenv_test_9", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                language = "Ruby""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), r#"
-                do { autoenv trust -q autoenv_test_9/nu_plugin_rb ; = $nothing } # Silence autoenv trust -q message from output
-                cd autoenv_test_9/nu_plugin_rb
-                echo $nu.env.organization
-            "#)
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[test]
-#[serial]
-fn given_a_hierachy_of_trusted_directories_nested_ones_should_overwrite_variables_from_parent_directories(
-) {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), r#"
-                do { autoenv trust -q autoenv_test_10/nu_plugin_rb ; = $nothing } # Silence autoenv trust -q message from output
-                cd autoenv_test_10/nu_plugin_rb
-                echo $nu.env.organization
-            "#)
-        });
-
-        assert_eq!(actual.out, "Andrab");
-    })
-}
-
-#[test]
-#[serial]
-#[cfg(not(windows))] //TODO figure out why this test doesn't work on windows
-fn local_config_should_not_be_added_when_running_scripts() {
-    Playground::setup("autoenv_test_10", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nu""#,
-            ),
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                organization = "foo""#,
-            ),
-            FileWithContent(
-                "script.nu",
-                r#"cd foo
-                echo $nu.env.organization"#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test(), r#"
-                do { autoenv trust -q foo } # Silence autoenv trust message from output
-                nu script.nu
-            "#)
-        });
-
-        assert_eq!(actual.out, "nu");
-    })
-}
-#[test]
-#[serial]
-fn given_a_hierachy_of_trusted_directories_going_back_restores_overwritten_variables() {
-    Playground::setup("autoenv_test_11", |dirs, sandbox| {
-        sandbox.mkdir("nu_plugin_rb");
-        sandbox.with_files(vec![
-            FileWithContent(
-                ".nu-env",
-                r#"[env]
-                organization = "nushell""#,
-            ),
-            FileWithContent(
-                "nu_plugin_rb/.nu-env",
-                r#"[env]
-                organization = "Andrab""#,
-            ),
-        ]);
-
-        let actual = Trusted::in_path(&dirs, || {
-            nu!(cwd: dirs.test().parent().unwrap(), r#"
-                do { autoenv trust -q autoenv_test_11/nu_plugin_rb } # Silence autoenv trust message from output
-                cd autoenv_test_11
-                cd nu_plugin_rb
-                do { rm ../.nu-env | ignore } # By deleting the root nu-env we have guarantees that the variable gets restored (not by autoenv when re-entering)
-                cd ..
-                echo $nu.env.organization
-            "#)
-        });
-
-        assert_eq!(actual.out, "nushell");
-    })
-}
-
-#[cfg(feature = "which-support")]
-#[test]
-#[serial]
-fn local_config_env_var_present_and_removed_correctly() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![FileWithContent(
-            "foo/.nu-env",
-            r#"[env]
-               testkey = "testvalue"
-                "#,
-        )]);
-        //Assert testkey is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo;
-               echo $nu.env.testkey"#
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert testkey is present in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; cd foo
-               echo $nu.env.testkey"#
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also in subdirectories
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; cd foo
-               cd bar
-               echo $nu.env.testkey"#
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; cd foo/bar
-               echo $nu.env.testkey"#
-        );
-        assert_eq!(actual.out, "testvalue");
-        //Assert testkey removed after leaving foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; cd foo
-               cd ..
-               echo $nu.env.testkey"#
-        );
-        assert!(actual.err.contains("Unknown"));
-    });
-}
-
-#[cfg(feature = "which-support")]
-#[test]
-#[serial]
-fn local_config_env_var_gets_overwritten() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo");
-        sandbox.mkdir("foo/bar");
-        sandbox.with_files(vec![
-            FileWithContent(
-                "foo/.nu-env",
-                r#"[env]
-                overwrite_me = "foo"
-                "#,
-            ),
-            FileWithContent(
-                "foo/bar/.nu-env",
-                r#"[env]
-                overwrite_me = "bar"
-                "#,
-            ),
-        ]);
-        //Assert overwrite_me is not present before entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo;
-               echo $nu.env.overwrite_me"#
-        );
-        assert!(actual.err.contains("Unknown"));
-        //Assert overwrite_me is foo in foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; cd foo
-               echo $nu.env.overwrite_me"#
-        );
-        assert_eq!(actual.out, "foo");
-        //Assert overwrite_me is bar in bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               autoenv trust -q foo/bar
-               cd foo
-               cd bar
-               echo $nu.env.overwrite_me"#
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me is present also when jumping over foo
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; autoenv trust -q foo/bar; cd foo/bar
-               echo $nu.env.overwrite_me
-            "#
-        );
-        assert_eq!(actual.out, "bar");
-        //Assert overwrite_me removed after leaving bar
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo; autoenv trust -q foo/bar; cd foo
-               cd bar
-               cd ..
-               echo $nu.env.overwrite_me"#
-        );
-        assert_eq!(actual.out, "foo");
-    });
-}
-
-#[cfg(feature = "which-support")]
-#[test]
-#[serial]
-fn autoenv_test_entry_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = if cfg!(target_os = "windows") {
-            r#"startup = ["echo nul > hello.txt"]"#
-        } else {
-            r#"startup = ["touch hello.txt"]"#
-        };
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure entryscript is run when entering directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               ls | where name == "hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Make sure entry scripts are also run when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               ls .. | where name == "../hello.txt" | get name"#
-        );
-        assert!(actual.out.contains("hello.txt"));
-
-        // Entryscripts should not run after changing to a subdirectory.
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               rm hello.txt
-               cd bar
-               ls .. | where name == "../hello.txt" | length"#
-        );
-        assert!(actual.out.contains('0'));
-    });
-}
-
-#[cfg(feature = "which-support")]
-#[test]
-#[serial]
-fn autoenv_test_exit_scripts() {
-    use nu_test_support::fs::Stub::FileWithContent;
-    Playground::setup("autoenv_test", |dirs, sandbox| {
-        sandbox.mkdir("foo/bar");
-
-        // Windows uses a different command to create an empty file so we need to have different content on windows.
-        let nu_env = r#"on_exit = ["touch bye.txt"]"#;
-
-        sandbox.with_files(vec![FileWithContent("foo/.nu-env", nu_env)]);
-
-        // Make sure exitscript is run
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd ..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd .
-               "#
-        );
-        assert_eq!(actual.out, "1");
-
-        // Entering a subdir should not trigger exitscripts
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo
-               cd bar
-               ls .. | where name =~ "bye.txt" | length"#
-        );
-        assert_eq!(actual.out, "0");
-
-        // Also run exitscripts when jumping over directory
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"autoenv trust -q foo
-               cd foo/bar
-               cd ../..
-               ls foo | where name =~ "bye.txt" | length
-               rm foo/bye.txt | ignore; cd ."#
-        );
-        assert_eq!(actual.out, "1");
-    });
-}
-
-#[test]
-#[serial]
-#[cfg(unix)]
-fn prepends_path_from_local_config() {
-    //If this test fails for you, make sure that your environment from which you start nu
-    //contains some env vars
-    Playground::setup("autoenv_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContent(
-            ".nu-env",
-            r#"
-            path = ["/hi", "/nushell"]
-            "#,
-        )]);
-
-        let expected = "[\"/hi\",\"/nushell\",";
-
-        let actual = Trusted::in_path(&dirs, || nu!(cwd: dirs.test(), "echo $nu.path | to json"));
-        // assert_eq!("", actual.out);
-        assert!(actual.out.starts_with(expected));
-        assert!(actual.out.len() > expected.len());
-    })
-}
diff --git a/old_nushell/tests/shell/mod.rs b/old_nushell/tests/shell/mod.rs
deleted file mode 100644
index 07fd1d17b..000000000
--- a/old_nushell/tests/shell/mod.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use nu_test_support::fs::AbsolutePath;
-use nu_test_support::playground::{says, Playground};
-use nu_test_support::{nu, pipeline};
-
-use hamcrest2::assert_that;
-use hamcrest2::prelude::*;
-
-#[cfg(feature = "which-support")]
-mod environment;
-
-mod pipeline;
-
-#[test]
-fn runs_configuration_startup_commands() {
-    Playground::setup("init_config_startup_commands_test", |dirs, nu| {
-        let file = AbsolutePath::new(dirs.config_fixtures().join("startup.toml"));
-
-        nu.with_config(&file);
-
-        assert_that!(nu.pipeline("hello-world"), says().stdout("Nu World"));
-    });
-}
-
-#[test]
-fn plugins_are_declared_with_wix() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-            open Cargo.toml
-            | get bin.name
-            | str find-replace "nu_plugin_(extra|core)_(.*)" "nu_plugin_$2"
-            | drop
-            | sort-by
-            | wrap cargo | merge {
-                open wix/main.wxs --raw | from xml
-                | get Wix.children.Product.children.0.Directory.children.0
-                | where Directory.attributes.Id == "$(var.PlatformProgramFilesFolder)"
-                | get Directory.children.Directory.children.0 | last
-                | get Directory.children.Component.children
-                | each { echo $it | first }
-                | skip
-                | where File.attributes.Name =~ "nu_plugin"
-                | str substring [_, -4] File.attributes.Name
-                | get File.attributes.Name
-                | sort-by
-                | wrap wix
-            }
-            | default wix _
-            | each { if $it.wix != $it.cargo { 1 } { 0 } }
-            | math sum
-            "#
-    ));
-
-    assert_eq!(actual.out, "0");
-}
-
-#[test]
-#[cfg(not(windows))]
-fn do_not_panic_if_broken_pipe() {
-    // `nu -h | false`
-    // used to panic with a BrokenPipe error
-    let child_output = std::process::Command::new("sh")
-        .arg("-c")
-        .arg(format!(
-            "{:?} -h | false",
-            nu_test_support::fs::executable_path()
-        ))
-        .output()
-        .expect("failed to execute process");
-
-    assert!(child_output.stderr.is_empty());
-}
diff --git a/old_nushell/tests/shell/pipeline/commands/external.rs b/old_nushell/tests/shell/pipeline/commands/external.rs
deleted file mode 100644
index c95e1a9cb..000000000
--- a/old_nushell/tests/shell/pipeline/commands/external.rs
+++ /dev/null
@@ -1,448 +0,0 @@
-use nu_test_support::nu;
-
-#[cfg(feature = "which")]
-#[test]
-fn shows_error_for_command_not_found() {
-    let actual = nu!(
-        cwd: ".",
-        "ferris_is_not_here.exe"
-    );
-
-    assert!(actual.err.contains("Command not found"));
-}
-
-#[cfg(feature = "which")]
-#[test]
-fn shows_error_for_command_not_found_in_pipeline() {
-    let actual = nu!(
-        cwd: ".",
-        "ferris_is_not_here.exe | echo done"
-    );
-
-    assert!(actual.err.contains("Command not found"));
-}
-
-#[cfg(feature = "which")]
-#[test]
-fn automatically_change_directory() {
-    use nu_test_support::playground::Playground;
-
-    Playground::setup("cd_test_5_1", |dirs, sandbox| {
-        sandbox.mkdir("autodir");
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                autodir
-                echo (pwd)
-            "#
-        );
-
-        assert!(actual.out.ends_with("autodir"));
-    })
-}
-
-#[test]
-fn automatically_change_directory_with_trailing_slash_and_same_name_as_command() {
-    use nu_test_support::playground::Playground;
-
-    Playground::setup("cd_test_5_1", |dirs, sandbox| {
-        sandbox.mkdir("cd");
-
-        let actual = nu!(
-            cwd: dirs.test(),
-            r#"
-                cd/
-                pwd
-            "#
-        );
-
-        assert!(actual.out.ends_with("cd"));
-    })
-}
-
-#[test]
-fn correctly_escape_external_arguments() {
-    let actual = nu!(cwd: ".", r#"^echo '$0'"#);
-
-    assert_eq!(actual.out, "$0");
-}
-
-#[test]
-fn execute_binary_in_string() {
-    let actual = nu!(
-    cwd: ".",
-    r#"
-        let cmd = echo
-        ^$"($cmd)" '$0'
-    "#);
-
-    assert_eq!(actual.out, "$0");
-}
-
-#[test]
-fn redirects_custom_command_external() {
-    let actual = nu!(cwd: ".", r#"def foo [] { nu --testbin cococo foo bar }; foo | str length "#);
-
-    assert_eq!(actual.out, "8");
-}
-
-mod it_evaluation {
-    use super::nu;
-    use nu_test_support::fs::Stub::{EmptyFile, FileWithContent, FileWithContentToBeTrimmed};
-    use nu_test_support::{pipeline, playground::Playground};
-
-    #[test]
-    fn takes_rows_of_nu_value_strings() {
-        Playground::setup("it_argument_test_1", |dirs, sandbox| {
-            sandbox.with_files(vec![
-                EmptyFile("jonathan_likes_cake.txt"),
-                EmptyFile("andres_likes_arepas.txt"),
-            ]);
-
-            let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                ls
-                | sort-by name
-                | get name
-                | each { nu --testbin cococo $it | lines }
-                | nth 1
-                "#
-            ));
-
-            assert_eq!(actual.out, "jonathan_likes_cake.txt");
-        })
-    }
-
-    #[test]
-    fn takes_rows_of_nu_value_lines() {
-        Playground::setup("it_argument_test_2", |dirs, sandbox| {
-            sandbox.with_files(vec![FileWithContentToBeTrimmed(
-                "nu_candies.txt",
-                r#"
-                    AndrásWithKitKatzz
-                    AndrásWithKitKatz
-                "#,
-            )]);
-
-            let actual = nu!(
-            cwd: dirs.test(), pipeline(
-            r#"
-                open nu_candies.txt
-                | lines
-                | each { nu --testbin chop $it | lines}
-                | nth 1
-                "#
-            ));
-
-            assert_eq!(actual.out, "AndrásWithKitKat");
-        })
-    }
-
-    #[test]
-    fn can_properly_buffer_lines_externally() {
-        let actual = nu!(
-            cwd: ".",
-            r#"
-                nu --testbin repeater c 8197 | lines | length
-            "#
-        );
-
-        assert_eq!(actual.out, "1");
-    }
-    #[test]
-    fn supports_fetching_given_a_column_path_to_it() {
-        Playground::setup("it_argument_test_3", |dirs, sandbox| {
-            sandbox.with_files(vec![FileWithContent(
-                "sample.toml",
-                r#"
-                    nu_party_venue = "zion"
-                "#,
-            )]);
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    open sample.toml
-                    | each { nu --testbin cococo $it.nu_party_venue }
-                "#
-            ));
-
-            assert_eq!(actual.out, "zion");
-        })
-    }
-}
-
-mod stdin_evaluation {
-    use super::nu;
-    use nu_test_support::pipeline;
-
-    #[test]
-    fn does_not_panic_with_no_newline_in_stream() {
-        let actual = nu!(
-            cwd: ".",
-            pipeline(r#"
-                nu --testbin nonu "where's the nuline?"
-                | length
-            "#
-        ));
-
-        assert_eq!(actual.err, "");
-    }
-
-    #[test]
-    fn does_not_block_indefinitely() {
-        let stdout = nu!(
-            cwd: ".",
-            pipeline(r#"
-                nu --testbin iecho yes
-                | nu --testbin chop
-                | nu --testbin chop
-                | lines
-                | first 1
-            "#
-        ))
-        .out;
-
-        assert_eq!(stdout, "y");
-    }
-}
-
-mod external_words {
-    use super::nu;
-    use nu_test_support::fs::Stub::FileWithContent;
-    use nu_test_support::{pipeline, playground::Playground};
-    #[test]
-    fn relaxed_external_words() {
-        let actual = nu!(cwd: ".", r#"
-        nu --testbin cococo joturner@foo.bar.baz
-        "#);
-
-        assert_eq!(actual.out, "joturner@foo.bar.baz");
-    }
-
-    #[test]
-    fn no_escaping_for_single_quoted_strings() {
-        let actual = nu!(cwd: ".", r#"
-        nu --testbin cococo 'test "things"'
-        "#);
-
-        assert_eq!(actual.out, "test \"things\"");
-    }
-
-    #[rstest::rstest]
-    #[case("sample.toml", r#""sample.toml""#)]
-    #[case("a sample file.toml", r#""a sample file.toml""#)]
-    #[case("quote'mark.toml", r#""quote'mark.toml""#)]
-    #[cfg_attr(
-        not(target_os = "windows"),
-        case(r#"quote"mark.toml"#, r#"$"quote(char double_quote)mark.toml""#)
-    )]
-    #[cfg_attr(not(target_os = "windows"), case("?mark.toml", r#""?mark.toml""#))]
-    #[cfg_attr(not(target_os = "windows"), case("*.toml", r#""*.toml""#))]
-    #[cfg_attr(not(target_os = "windows"), case("*.toml", "*.toml"))]
-    #[case("$ sign.toml", r#""$ sign.toml""#)]
-    fn external_arg_with_special_characters(#[case] path: &str, #[case] nu_path_argument: &str) {
-        Playground::setup("external_arg_with_quotes", |dirs, sandbox| {
-            sandbox.with_files(vec![FileWithContent(
-                path,
-                r#"
-                    nu_party_venue = "zion"
-                "#,
-            )]);
-
-            let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                &format!(r#"
-                    nu --testbin meow {} | from toml | get nu_party_venue
-                "#, nu_path_argument)
-            ));
-
-            assert_eq!(actual.out, "zion");
-        })
-    }
-}
-
-mod nu_commands {
-    use super::nu;
-
-    #[test]
-    fn echo_internally_externally() {
-        let actual = nu!(cwd: ".", r#"
-        nu -c "echo 'foo'"
-        "#);
-
-        assert_eq!(actual.out, "foo");
-    }
-}
-
-mod nu_script {
-    use super::nu;
-
-    #[test]
-    fn run_nu_script() {
-        let actual = nu!(cwd: "tests/fixtures/formats", r#"
-        nu script.nu
-        "#);
-
-        assert_eq!(actual.out, "done");
-    }
-
-    #[test]
-    fn run_nu_script_multiline() {
-        let actual = nu!(cwd: "tests/fixtures/formats", r#"
-        nu script_multiline.nu
-        "#);
-
-        assert_eq!(actual.out, "23");
-    }
-}
-
-mod tilde_expansion {
-    use super::nu;
-
-    #[test]
-    fn as_home_directory_when_passed_as_argument_and_begins_with_tilde() {
-        let actual = nu!(
-            cwd: ".",
-            r#"
-            nu --testbin cococo  ~
-        "#
-        );
-
-        assert!(!actual.out.contains('~'));
-    }
-
-    #[test]
-    fn does_not_expand_when_passed_as_argument_and_does_not_start_with_tilde() {
-        let actual = nu!(
-            cwd: ".",
-            r#"
-                nu --testbin cococo  "1~1"
-                "#
-        );
-
-        assert_eq!(actual.out, "1~1");
-    }
-}
-
-mod external_command_arguments {
-    use super::nu;
-    use nu_test_support::fs::Stub::EmptyFile;
-    use nu_test_support::{pipeline, playground::Playground};
-    #[test]
-    fn expands_table_of_primitives_to_positional_arguments() {
-        Playground::setup(
-            "expands_table_of_primitives_to_positional_arguments",
-            |dirs, sandbox| {
-                sandbox.with_files(vec![
-                    EmptyFile("jonathan_likes_cake.txt"),
-                    EmptyFile("andres_likes_arepas.txt"),
-                    EmptyFile("ferris_not_here.txt"),
-                ]);
-
-                let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    nu --testbin cococo (ls | get name)
-                "#
-                ));
-
-                assert_eq!(
-                    actual.out,
-                    "andres_likes_arepas.txt ferris_not_here.txt jonathan_likes_cake.txt"
-                );
-            },
-        )
-    }
-
-    #[test]
-    fn proper_subexpression_paths_in_external_args() {
-        Playground::setup(
-            "expands_table_of_primitives_to_positional_arguments",
-            |dirs, sandbox| {
-                sandbox.with_files(vec![
-                    EmptyFile("jonathan_likes_cake.txt"),
-                    EmptyFile("andres_likes_arepas.txt"),
-                    EmptyFile("ferris_not_here.txt"),
-                ]);
-
-                let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    nu --testbin cococo (ls | sort-by name | get name).1
-                "#
-                ));
-
-                assert_eq!(actual.out, "ferris_not_here.txt");
-            },
-        )
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn string_interpolation_with_an_external_command() {
-        Playground::setup(
-            "string_interpolation_with_an_external_command",
-            |dirs, sandbox| {
-                sandbox.mkdir("cd");
-
-                sandbox.with_files(vec![EmptyFile("cd/jonathan_likes_cake.txt")]);
-
-                let actual = nu!(
-                cwd: dirs.test(), pipeline(
-                r#"
-                    ^ls $"(pwd)/cd"
-                "#
-                ));
-
-                assert_eq!(actual.out, "jonathan_likes_cake.txt");
-            },
-        )
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn semicolons_are_sanitized_before_passing_to_subshell() {
-        let actual = nu!(
-            cwd: ".",
-            "^echo \"a;b\""
-        );
-
-        assert_eq!(actual.out, "a;b");
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn ampersands_are_sanitized_before_passing_to_subshell() {
-        let actual = nu!(
-            cwd: ".",
-            "^echo \"a&b\""
-        );
-
-        assert_eq!(actual.out, "a&b");
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn subcommands_are_sanitized_before_passing_to_subshell() {
-        let actual = nu!(
-            cwd: ",",
-            "^echo \"$(ls)\""
-        );
-
-        assert_eq!(actual.out, "$(ls)");
-    }
-
-    #[cfg(not(windows))]
-    #[test]
-    fn shell_arguments_are_sanitized_even_if_coming_from_other_commands() {
-        let actual = nu!(
-            cwd: ",",
-            "^echo (echo \"a;&$(hello)\")"
-        );
-
-        assert_eq!(actual.out, "a;&$(hello)");
-    }
-}
diff --git a/old_nushell/tests/shell/pipeline/commands/internal.rs b/old_nushell/tests/shell/pipeline/commands/internal.rs
deleted file mode 100644
index ef64fbee4..000000000
--- a/old_nushell/tests/shell/pipeline/commands/internal.rs
+++ /dev/null
@@ -1,1448 +0,0 @@
-#[cfg(feature = "which")]
-use nu_test_support::fs::Stub::FileWithContent;
-use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
-use nu_test_support::nu;
-use nu_test_support::pipeline;
-use nu_test_support::playground::Playground;
-
-#[test]
-fn takes_rows_of_nu_value_strings_and_pipes_it_to_stdin_of_external() {
-    Playground::setup("internal_to_external_pipe_test_1", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu_times.csv",
-            r#"
-                name,rusty_luck,origin
-                Jason,1,Canada
-                Jonathan,1,New Zealand
-                Andrés,1,Ecuador
-                AndKitKatz,1,Estados Unidos
-            "#,
-        )]);
-
-        let actual = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-            open nu_times.csv
-            | get origin
-            | each { ^echo $it | nu --testbin chop | lines }
-            | nth 2
-            "#
-        ));
-
-        // chop will remove the last escaped double quote from \"Estados Unidos\"
-        assert_eq!(actual.out, "Ecuado");
-    })
-}
-
-#[test]
-fn treats_dot_dot_as_path_not_range() {
-    Playground::setup("dot_dot_dir", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu_times.csv",
-            r#"
-                name,rusty_luck,origin
-                Jason,1,Canada
-            "#,
-        )]);
-
-        let actual = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-            mkdir temp;
-            cd temp;
-            echo (open ../nu_times.csv).name | autoview;
-            cd ..;
-            rmdir temp
-            "#
-        ));
-
-        // chop will remove the last escaped double quote from \"Estados Unidos\"
-        assert_eq!(actual.out, "Jason");
-    })
-}
-
-#[test]
-fn tags_dont_persist_through_column_path() {
-    Playground::setup("dot_dot_dir", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu_times.csv",
-            r#"
-                name,rusty_luck,origin
-                Jason,1,Canada
-            "#,
-        )]);
-
-        let actual = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-            mkdir temp;
-            cd temp;
-            let x = (open ../nu_times.csv).name;
-            $x | tags | get anchor | autoview;
-            cd ..;
-            rmdir temp
-            "#
-        ));
-
-        // chop will remove the last escaped double quote from \"Estados Unidos\"
-        assert!(actual.err.contains("isn't a column"));
-    })
-}
-
-#[test]
-fn tags_persist_through_vars() {
-    Playground::setup("dot_dot_dir", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu_times.csv",
-            r#"
-                name,rusty_luck,origin
-                Jason,1,Canada
-            "#,
-        )]);
-
-        let actual = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-            mkdir temp;
-            cd temp;
-            let x = (open ../nu_times.csv);
-            $x | tags | get anchor.file | autoview;
-            cd ..;
-            rmdir temp
-            "#
-        ));
-
-        // chop will remove the last escaped double quote from \"Estados Unidos\"
-        assert!(actual.out.contains("nu_times.csv"));
-    })
-}
-
-#[test]
-fn subexpression_properly_redirects() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo (nu --testbin cococo "hello") | str collect
-        "#
-    );
-
-    assert_eq!(actual.out, "hello");
-}
-
-#[test]
-fn argument_subexpression() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo "foo" | each { echo (echo $it) }
-        "#
-    );
-
-    assert_eq!(actual.out, "foo");
-}
-
-#[test]
-fn subexpression_handles_dot() {
-    Playground::setup("subexpression_handles_dot", |dirs, sandbox| {
-        sandbox.with_files(vec![FileWithContentToBeTrimmed(
-            "nu_times.csv",
-            r#"
-                name,rusty_luck,origin
-                Jason,1,Canada
-                Jonathan,1,New Zealand
-                Andrés,1,Ecuador
-                AndKitKatz,1,Estados Unidos
-            "#,
-        )]);
-
-        let actual = nu!(
-        cwd: dirs.test(), pipeline(
-        r#"
-            echo (open nu_times.csv)
-            | get name
-            | each { nu --testbin chop $it | lines }
-            | nth 3
-            "#
-        ));
-
-        assert_eq!(actual.out, "AndKitKat");
-    })
-}
-
-#[test]
-fn string_interpolation_with_it() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-                    echo "foo" | each { echo $"($it)" }
-            "#
-    );
-
-    assert_eq!(actual.out, "foo");
-}
-
-#[test]
-fn string_interpolation_with_it_column_path() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-                    echo [[name]; [sammie]] | each { echo $"($it.name)" }
-        "#
-    );
-
-    assert_eq!(actual.out, "sammie");
-}
-
-#[test]
-fn string_interpolation_shorthand_overlap() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-                    $"3 + 4 = (3 + 4)"
-        "#
-    );
-
-    assert_eq!(actual.out, "3 + 4 = 7");
-}
-
-#[test]
-fn string_interpolation_and_paren() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-                    $"a paren is ('(')"
-        "#
-    );
-
-    assert_eq!(actual.out, "a paren is (");
-}
-
-#[test]
-fn string_interpolation_with_unicode() {
-    //カ = U+30AB : KATAKANA LETTER KA
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            $"カ"
-        "#
-    );
-
-    assert_eq!(actual.out, "カ");
-}
-
-#[test]
-fn bignum_large_integer() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo 91231720741731287123917
-        "#
-    );
-
-    assert_eq!(actual.out, "91231720741731287123917");
-}
-
-#[test]
-fn bignum_large_decimal() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo 91231720741731287123917.1
-        "#
-    );
-
-    assert_eq!(actual.out, "91231720741731287123917.1");
-}
-
-#[test]
-fn run_custom_command() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def add-me [x y] { $x + $y}; add-me 10 5
-        "#
-    );
-
-    assert_eq!(actual.out, "15");
-}
-
-#[test]
-fn run_custom_command_with_flag() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        def foo [--bar:number] { if ($bar | empty?) { echo "empty" } { echo $bar } }; foo --bar 10
-        "#
-    );
-
-    assert_eq!(actual.out, "10");
-}
-
-#[test]
-fn run_custom_command_with_flag_missing() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        def foo [--bar:number] { if ($bar | empty?) { echo "empty" } { echo $bar } }; foo
-        "#
-    );
-
-    assert_eq!(actual.out, "empty");
-}
-
-#[test]
-fn run_custom_subcommand() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        def "str double" [x] { echo $x $x | str collect }; str double bob
-        "#
-    );
-
-    assert_eq!(actual.out, "bobbob");
-}
-
-#[test]
-fn run_inner_custom_command() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-          def outer [x] { def inner [y] { echo $y }; inner $x }; outer 10
-        "#
-    );
-
-    assert_eq!(actual.out, "10");
-}
-
-#[test]
-fn run_broken_inner_custom_command() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        def outer [x] { def inner [y] { echo $y }; inner $x }; inner 10
-        "#
-    );
-
-    assert!(actual.err.contains("not found"));
-}
-
-#[test]
-fn run_custom_command_with_rest() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def rest-me [...rest: string] { echo $rest.1 $rest.0}; rest-me "hello" "world" | to json
-        "#
-    );
-
-    assert_eq!(actual.out, r#"["world","hello"]"#);
-}
-
-#[test]
-fn run_custom_command_with_rest_and_arg() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def rest-me-with-arg [name: string, ...rest: string] { echo $rest.1 $rest.0 $name}; rest-me-with-arg "hello" "world" "yay" | to json
-        "#
-    );
-
-    assert_eq!(actual.out, r#"["yay","world","hello"]"#);
-}
-
-#[test]
-fn run_custom_command_with_rest_and_flag() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def rest-me-with-flag [--name: string, ...rest: string] { echo $rest.1 $rest.0 $name}; rest-me-with-flag "hello" "world" --name "yay" | to json
-        "#
-    );
-
-    assert_eq!(actual.out, r#"["world","hello","yay"]"#);
-}
-
-#[test]
-fn run_custom_command_with_empty_rest() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def rest-me-with-empty-rest [...rest: string] { echo $rest }; rest-me-with-empty-rest
-        "#
-    );
-
-    assert_eq!(actual.out, r#""#);
-    assert_eq!(actual.err, r#""#);
-}
-
-#[test]
-fn run_custom_command_with_rest_other_name() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def say-hello [
-                greeting:string,
-                ...names:string # All of the names
-                ] {
-                    echo $"($greeting), ($names | sort-by | str collect ' ')"
-                }
-            say-hello Salutations E D C A B
-        "#
-    );
-
-    assert_eq!(actual.out, r#"Salutations, A B C D E"#);
-    assert_eq!(actual.err, r#""#);
-}
-
-#[test]
-fn alias_a_load_env() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def activate-helper [] { [[name, value]; [BOB, SAM]] }; alias activate = load-env (activate-helper); activate; $nu.env.BOB
-        "#
-    );
-
-    assert_eq!(actual.out, r#"SAM"#);
-}
-
-#[test]
-fn let_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let x = 5
-            let y = 12
-            $x + $y
-        "#
-    );
-
-    assert_eq!(actual.out, "17");
-}
-
-#[test]
-fn let_doesnt_leak() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        do { let x = 5 }; echo $x
-        "#
-    );
-
-    assert!(actual.err.contains("unknown variable"));
-}
-
-#[test]
-fn let_env_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let-env TESTENVVAR = "hello world"
-            echo $nu.env.TESTENVVAR
-        "#
-    );
-
-    assert_eq!(actual.out, "hello world");
-}
-
-#[test]
-fn let_env_hides_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let-env TESTENVVAR = "hello world"
-            echo $nu.env.TESTENVVAR
-            let-env TESTENVVAR = $nothing
-            echo $nu.env.TESTENVVAR
-        "#
-    );
-
-    assert_eq!(actual.out, "hello world");
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Unknown column"));
-}
-
-#[test]
-fn let_env_hides_variable_in_parent_scope() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let-env TESTENVVAR = "hello world"
-            echo $nu.env.TESTENVVAR
-            do {
-                let-env TESTENVVAR = $nothing
-                echo $nu.env.TESTENVVAR
-            }
-            echo $nu.env.TESTENVVAR
-        "#
-    );
-
-    assert_eq!(actual.out, "hello worldhello world");
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Unknown column"));
-}
-
-#[test]
-fn unlet_env_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let-env TEST_VAR = "hello world"
-            unlet-env TEST_VAR
-            echo $nu.env.TEST_VAR
-        "#
-    );
-    assert!(actual.err.contains("did you mean"));
-}
-
-#[test]
-fn unlet_nonexistent_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            unlet-env NONEXISTENT_VARIABLE
-        "#
-    );
-
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Not an environment variable"));
-}
-
-#[test]
-fn unlet_variable_in_parent_scope() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let-env DEBUG = "1"
-            echo $nu.env.DEBUG
-            do {
-                let-env DEBUG = "2"
-                echo $nu.env.DEBUG
-                unlet-env DEBUG
-                echo $nu.env.DEBUG
-            }
-            echo $nu.env.DEBUG
-        "#
-    );
-
-    assert_eq!(actual.out, "1211");
-}
-
-#[test]
-fn let_env_doesnt_leak() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        do { let-env xyz = "my message" }; echo $nu.env.xyz
-        "#
-    );
-
-    assert!(actual.err.contains("did you mean"));
-}
-
-#[test]
-fn proper_shadow_let_env_aliases() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let-env DEBUG = true; echo $nu.env.DEBUG | autoview; do { let-env DEBUG = false; echo $nu.env.DEBUG } | autoview; echo $nu.env.DEBUG
-        "#
-    );
-    assert_eq!(actual.out, "truefalsetrue");
-}
-
-#[test]
-fn load_env_variable() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo [[name, value]; [TESTENVVAR, "hello world"]] | load-env
-            echo $nu.env.TESTENVVAR
-        "#
-    );
-
-    assert_eq!(actual.out, "hello world");
-}
-
-#[test]
-fn load_env_variable_arg() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            load-env [[name, value]; [TESTENVVAR, "hello world"]]
-            echo $nu.env.TESTENVVAR
-        "#
-    );
-
-    assert_eq!(actual.out, "hello world");
-}
-
-#[test]
-fn load_env_variable_arg_and_stream() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo [[name, value]; [TESTVARSTREAM, "true"]] | load-env [[name, value]; [TESTVARARG, "false"]]
-            echo $nu.env | format "{TESTVARSTREAM} {TESTVARARG}"
-        "#
-    );
-
-    assert_eq!(actual.out, "true false");
-}
-
-#[test]
-fn load_env_doesnt_leak() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        do { echo [[name, value]; [xyz, "my message"]] | load-env }; echo $nu.env.xyz
-        "#
-    );
-
-    assert!(actual.err.contains("did you mean"));
-}
-
-#[test]
-fn proper_shadow_load_env_aliases() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let-env DEBUG = true; echo $nu.env.DEBUG | autoview; do { echo [[name, value]; [DEBUG, false]] | load-env; echo $nu.env.DEBUG } | autoview; echo $nu.env.DEBUG
-        "#
-    );
-    assert_eq!(actual.out, "truefalsetrue");
-}
-
-#[test]
-fn load_env_can_hide_var_envs() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let-env DEBUG = "1"
-        echo $nu.env.DEBUG
-        load-env [[name, value]; [DEBUG $nothing]]
-        echo $nu.env.DEBUG
-        "#
-    );
-    assert_eq!(actual.out, "1");
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Unknown column"));
-}
-
-#[test]
-fn load_env_can_hide_var_envs_in_parent_scope() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let-env DEBUG = "1"
-        echo $nu.env.DEBUG
-        do {
-            load-env [[name, value]; [DEBUG $nothing]]
-            echo $nu.env.DEBUG
-        }
-        echo $nu.env.DEBUG
-        "#
-    );
-    assert_eq!(actual.out, "11");
-    assert!(actual.err.contains("error"));
-    assert!(actual.err.contains("Unknown column"));
-}
-
-#[test]
-fn proper_shadow_let_aliases() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let DEBUG = false; echo $DEBUG | autoview; do { let DEBUG = true; echo $DEBUG } | autoview; echo $DEBUG
-        "#
-    );
-    assert_eq!(actual.out, "falsetruefalse");
-}
-
-#[test]
-fn block_params_override() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        [1, 2, 3] | each { |a| echo $it }
-        "#
-    );
-    assert!(actual.err.contains("unknown variable"));
-}
-
-#[test]
-fn block_params_override_correct() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        [1, 2, 3] | each { |a| echo $a } | to json
-        "#
-    );
-    assert_eq!(actual.out, "[1,2,3]");
-}
-
-#[test]
-fn hex_number() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        0x10
-        "#
-    );
-    assert_eq!(actual.out, "16");
-}
-
-#[test]
-fn binary_number() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        0b10
-        "#
-    );
-    assert_eq!(actual.out, "2");
-}
-
-#[test]
-fn octal_number() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        0o10
-        "#
-    );
-    assert_eq!(actual.out, "8");
-}
-
-#[test]
-fn run_dynamic_blocks() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let block = { echo "holaaaa" }; do $block
-        "#
-    );
-    assert_eq!(actual.out, "holaaaa");
-}
-
-#[cfg(feature = "which")]
-#[test]
-fn argument_subexpression_reports_errors() {
-    let actual = nu!(
-        cwd: ".",
-        "echo (ferris_is_not_here.exe)"
-    );
-
-    assert!(actual.err.contains("Command not found"));
-}
-
-#[test]
-fn can_process_one_row_from_internal_and_pipes_it_to_stdin_of_external() {
-    let actual = nu!(
-        cwd: ".",
-        r#"echo "nushelll" | nu --testbin chop"#
-    );
-
-    assert_eq!(actual.out, "nushell");
-}
-
-#[test]
-fn bad_operator() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            2 $ 2
-        "#
-    );
-
-    assert!(actual.err.contains("operator"));
-}
-
-#[test]
-fn index_out_of_bounds() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            let foo = [1, 2, 3]; echo $foo.5
-        "#
-    );
-
-    assert!(actual.err.contains("unknown row"));
-}
-
-#[test]
-fn dash_def() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            def - [x, y] { $x - $y }; - 4 1
-        "#
-    );
-
-    assert_eq!(actual.out, "3");
-}
-
-#[test]
-fn negative_decimal_start() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            -1.3 + 4
-        "#
-    );
-
-    assert_eq!(actual.out, "2.7");
-}
-
-#[test]
-fn string_inside_of() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            "bob" in "bobby"
-        "#
-    );
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn string_not_inside_of() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            "bob" not-in "bobby"
-        "#
-    );
-
-    assert_eq!(actual.out, "false");
-}
-
-#[test]
-fn index_row() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let foo = [[name]; [joe] [bob]]; echo $foo.1 | to json
-        "#
-    );
-
-    assert_eq!(actual.out, r#"{"name":"bob"}"#);
-}
-
-#[test]
-fn index_cell() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let foo = [[name]; [joe] [bob]]; echo $foo.name.1
-        "#
-    );
-
-    assert_eq!(actual.out, "bob");
-}
-
-#[test]
-fn index_cell_alt() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        let foo = [[name]; [joe] [bob]]; echo $foo.1.name
-        "#
-    );
-
-    assert_eq!(actual.out, "bob");
-}
-
-#[test]
-fn not_echoing_ranges_without_numbers() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo ..
-        "#
-    );
-
-    assert_eq!(actual.out, "..");
-}
-
-#[test]
-fn not_echoing_exclusive_ranges_without_numbers() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo ..<
-        "#
-    );
-
-    assert_eq!(actual.out, "..<");
-}
-
-#[test]
-fn echoing_ranges() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo 1..3 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn echoing_exclusive_ranges() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo 1..<4 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn table_literals1() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-            echo [[name age]; [foo 13]] | get age
-        "#
-    );
-
-    assert_eq!(actual.out, "13");
-}
-
-#[test]
-fn table_literals2() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [[name age] ; [bob 13] [sally 20]] | get age | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "33");
-}
-
-#[test]
-fn list_with_commas() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [1, 2, 3] | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn range_with_left_var() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [[size]; [3]] | each { echo $it.size..10 } | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "52");
-}
-
-#[test]
-fn range_with_right_var() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [[size]; [30]] | each { echo 4..$it.size } | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "459");
-}
-
-#[test]
-fn range_with_open_left() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo ..30 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "465");
-}
-
-#[test]
-fn exclusive_range_with_open_left() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo ..<31 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "465");
-}
-
-#[test]
-fn range_with_open_right() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo 5.. | first 10 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "95");
-}
-
-#[test]
-fn exclusive_range_with_open_right() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo 5..< | first 10 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "95");
-}
-
-#[test]
-fn range_with_mixed_types() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo 1..10.5 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "55");
-}
-
-#[test]
-fn filesize_math() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        100 * 10kb
-        "#
-    );
-
-    assert_eq!(actual.out, "1000.0 KB");
-    // why 1000.0 KB instead of 1.0 MB?
-    // looks like `byte.get_appropriate_unit(false)` behaves this way
-}
-
-#[test]
-fn filesize_math2() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        100 / 10kb
-        "#
-    );
-
-    assert!(actual.err.contains("Coercion"));
-}
-
-#[test]
-fn filesize_math3() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        100kb / 10
-        "#
-    );
-
-    assert_eq!(actual.out, "10.0 KB");
-}
-#[test]
-fn filesize_math4() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        100kb * 5
-        "#
-    );
-
-    assert_eq!(actual.out, "500.0 KB");
-}
-
-#[test]
-fn filesize_math5() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        1001 * 1kb
-        "#
-    );
-
-    assert_eq!(actual.out, "1.0 MB");
-}
-
-#[test]
-fn filesize_math6() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        1001 * 1mb
-        "#
-    );
-
-    assert_eq!(actual.out, "1.0 GB");
-}
-
-#[test]
-fn filesize_math7() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        1001 * 1gb
-        "#
-    );
-
-    assert_eq!(actual.out, "1.0 TB");
-}
-
-#[test]
-fn exclusive_range_with_mixed_types() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo 1..<10.5 | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "55");
-}
-
-#[test]
-fn table_with_commas() {
-    let actual = nu!(
-        cwd: ".",
-        r#"
-        echo [[name, age, height]; [JT, 42, 185] [Unknown, 99, 99]] | get age | math sum
-        "#
-    );
-
-    assert_eq!(actual.out, "141");
-}
-
-#[test]
-fn duration_overflow() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        ls | get modified | each { $it + 10000000000000000day }
-        "#)
-    );
-
-    assert!(actual.err.contains("Duration overflow"));
-}
-
-#[test]
-fn date_and_duration_overflow() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        ls | get modified | each { $it + 1000000000day }
-        "#)
-    );
-
-    // assert_eq!(actual.err, "overflow");
-    assert!(actual.err.contains("Duration and date addition overflow"));
-}
-
-#[test]
-fn pipeline_params_simple() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1 2 3 | $in.1 * $in.2
-        "#)
-    );
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn pipeline_params_inner() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        echo 1 2 3 | (echo $in.2 6 7 | $in.0 * $in.1 * $in.2)
-        "#)
-    );
-
-    assert_eq!(actual.out, "126");
-}
-
-#[test]
-fn better_table_lex() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        let table = [
-            [name, size];
-            [small, 7]
-            [medium, 10]
-            [large, 12]
-        ];
-        $table.1.size
-        "#)
-    );
-
-    assert_eq!(actual.out, "10");
-}
-
-#[test]
-fn better_subexpr_lex() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        (echo boo
-        sam | str length | math sum)
-        "#)
-    );
-
-    assert_eq!(actual.out, "6");
-}
-
-#[test]
-fn subsubcommand() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        def "aws s3 rb" [url] { $url + " loaded" }; aws s3 rb localhost
-        "#)
-    );
-
-    assert_eq!(actual.out, "localhost loaded");
-}
-
-#[test]
-fn manysubcommand() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        def "aws s3 rb ax vf qqqq rrrr" [url] { $url + " loaded" }; aws s3 rb ax vf qqqq rrrr localhost
-        "#)
-    );
-
-    assert_eq!(actual.out, "localhost loaded");
-}
-
-#[test]
-fn nothing_string_1() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        $nothing == "foo"
-        "#)
-    );
-
-    assert_eq!(actual.out, "false");
-}
-
-#[test]
-fn nothing_string_2() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        "" == $nothing
-        "#)
-    );
-
-    assert_eq!(actual.out, "true");
-}
-
-#[test]
-fn unalias_shadowing() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        def test-shadowing [] {
-            alias greet = echo hello;
-            let xyz = { greet };
-            unalias greet;
-            do $xyz
-        };
-        test-shadowing
-        "#)
-    );
-    assert_eq!(actual.out, "hello");
-}
-
-#[test]
-fn unalias_does_not_escape_scope() {
-    let actual = nu!(
-        cwd: ".", pipeline(
-        r#"
-        def test-alias [] {
-            alias greet = echo hello;
-            (unalias greet);
-            greet
-        };
-        test-alias
-        "#)
-    );
-    assert_eq!(actual.out, "hello");
-}
-
-#[test]
-fn unalias_hides_alias() {
-    let actual = nu!(cwd: ".", pipeline(
-        r#"
-        def test-alias [] {
-            alias ll = ls -l;
-            unalias ll;
-            ll
-        };
-        test-alias
-        "#)
-    );
-
-    assert!(actual.err.contains("not found"));
-}
-
-mod parse {
-    use nu_test_support::nu;
-
-    /*
-        The debug command's signature is:
-
-        Usage:
-        > debug {flags}
-
-        flags:
-        -h, --help: Display this help message
-        -r, --raw: Prints the raw value representation.
-    */
-
-    #[test]
-    fn errors_if_flag_passed_is_not_exact() {
-        let actual = nu!(cwd: ".", "debug -ra");
-
-        assert!(actual.err.contains("unexpected flag"),);
-
-        let actual = nu!(cwd: ".", "debug --rawx");
-
-        assert!(actual.err.contains("unexpected flag"),);
-    }
-
-    #[test]
-    fn errors_if_flag_is_not_supported() {
-        let actual = nu!(cwd: ".", "debug --ferris");
-
-        assert!(actual.err.contains("unexpected flag"),);
-    }
-
-    #[test]
-    fn errors_if_passed_an_unexpected_argument() {
-        let actual = nu!(cwd: ".", "debug ferris");
-
-        assert!(actual.err.contains("unexpected argument"),);
-    }
-}
-
-mod tilde_expansion {
-    use nu_test_support::nu;
-
-    #[test]
-    #[should_panic]
-    fn as_home_directory_when_passed_as_argument_and_begins_with_tilde() {
-        let actual = nu!(
-            cwd: ".",
-            r#"
-            echo ~
-        "#
-        );
-
-        assert!(!actual.out.contains('~'),);
-    }
-
-    #[test]
-    fn does_not_expand_when_passed_as_argument_and_does_not_start_with_tilde() {
-        let actual = nu!(
-            cwd: ".",
-            r#"
-                    echo "1~1"
-                "#
-        );
-
-        assert_eq!(actual.out, "1~1");
-    }
-}
-
-mod variable_scoping {
-    use nu_test_support::nu;
-
-    macro_rules! test_variable_scope {
-        ($func:literal == $res:literal $(,)*) => {
-            let actual = nu!(
-                cwd: ".",
-                $func
-            );
-
-            assert_eq!(actual.out, $res);
-        };
-    }
-    macro_rules! test_variable_scope_list {
-        ($func:literal == $res:expr $(,)*) => {
-            let actual = nu!(
-                cwd: ".",
-                $func
-            );
-
-            let result: Vec<&str> = actual.out.matches("ZZZ").collect();
-            assert_eq!(result, $res);
-        };
-    }
-
-    #[test]
-    fn access_variables_in_scopes() {
-        test_variable_scope!(
-            r#" def test [input] { echo [0 1 2] | do { do { echo $input } } }
-                test ZZZ "#
-                == "ZZZ"
-        );
-        test_variable_scope!(
-            r#" def test [input] { echo [0 1 2] | do { do { if $input == "ZZZ" { echo $input } { echo $input } } } }
-                test ZZZ "#
-                == "ZZZ"
-        );
-        test_variable_scope!(
-            r#" def test [input] { echo [0 1 2] | do { do { if $input == "ZZZ" { echo $input } { echo $input } } } }
-                test ZZZ "#
-                == "ZZZ"
-        );
-        test_variable_scope!(
-            r#" def test [input] { echo [0 1 2] | do { echo $input } }
-                test ZZZ "#
-                == "ZZZ"
-        );
-        test_variable_scope!(
-            r#" def test [input] { echo [0 1 2] | do { if $input == $input { echo $input } { echo $input } } }
-                test ZZZ "#
-                == "ZZZ"
-        );
-        test_variable_scope_list!(
-            r#" def test [input] { echo [0 1 2] | each { echo $input } }
-                test ZZZ "#
-                == ["ZZZ", "ZZZ", "ZZZ"]
-        );
-        test_variable_scope_list!(
-            r#" def test [input] { echo [0 1 2] | each { if $it > 0 {echo $input} {echo $input}} }
-                test ZZZ "#
-                == ["ZZZ", "ZZZ", "ZZZ"]
-        );
-        test_variable_scope_list!(
-            r#" def test [input] { echo [0 1 2] | each { if $input == $input {echo $input} {echo $input}} }
-                test ZZZ "#
-                == ["ZZZ", "ZZZ", "ZZZ"]
-        );
-    }
-}
diff --git a/old_nushell/tests/shell/pipeline/commands/mod.rs b/old_nushell/tests/shell/pipeline/commands/mod.rs
deleted file mode 100644
index 5b7aa7e19..000000000
--- a/old_nushell/tests/shell/pipeline/commands/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod external;
-mod internal;
diff --git a/old_nushell/tests/shell/pipeline/mod.rs b/old_nushell/tests/shell/pipeline/mod.rs
deleted file mode 100644
index e8fb3af05..000000000
--- a/old_nushell/tests/shell/pipeline/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-mod commands;
-
-use nu_test_support::nu;
-
-#[test]
-fn doesnt_break_on_utf8() {
-    let actual = nu!(cwd: ".", "echo ö");
-
-    assert_eq!(actual.out, "ö", "'{}' should contain ö", actual.out);
-}