diff --git a/.planning/backlog/client-requirements-pre-beta.md b/.planning/backlog/client-requirements-pre-beta.md
index 3b7f68d..3cd9952 100644
--- a/.planning/backlog/client-requirements-pre-beta.md
+++ b/.planning/backlog/client-requirements-pre-beta.md
@@ -39,7 +39,11 @@
 
 ---
 
-## Recommended integration (after Phase 3)
-1. `/gsd-new-milestone` OR extend the current milestone: add these as REQUIREMENTS.md entries (finalize IDs).
-2. Insert a **new engine phase** (collections + validation) before the beta; renumber: current Phase 4 (AOT/docs) and Phase 5 (beta) shift out so the beta stays last.
-3. Discuss-phase for the new phase (COLL-02/03 sequencing, VAL-01 pipeline hook point, the S1 re-verification gate for COLL-03).
+## Integration decision — APPROVED 2026-07-14 (owner)
+**Chosen: new engine phase before the beta** (renumber, beta stays last). Phase 3 shipped separately as PR #31.
+
+1. Add these as `REQUIREMENTS.md` entries (finalize IDs COLL-02/COLL-03/VAL-01/VAL-02/API-02).
+2. Insert as **new Phase 4 "Collection & Validation Binding"** via `/gsd-phase`; renumber current Phase 4 (AOT/docs) → **Phase 5**, current Phase 5 (beta) → **Phase 6**.
+3. `/gsd-discuss-phase 4` → plan → execute. Discussion must cover: COLL-02/03 sequencing, VAL-01 pipeline hook point, the **S1 secret-redaction re-verification gate for COLL-03** (it edits `BindPropertySettings`), and the load-bearing comma-scalar compatibility.
+
+Staged on branch `gsd/phase-4-collection-validation-binding` (forked off the Phase 3 tip; rebase onto `master` after PR #31 merges).
diff --git a/SESSION-HANDOFF.md b/SESSION-HANDOFF.md
index 6d2f830..73ecfff 100644
--- a/SESSION-HANDOFF.md
+++ b/SESSION-HANDOFF.md
@@ -4,48 +4,34 @@ _Last updated: 2026-07-14 · owner: Guy Ludvig (guy@frontegg.com)_
 
 ## TL;DR
 **GSD is the source of truth** (`.planning/`); `FIX-PLAN.md` is frozen historical reference only.
-Phases **1 & 2 are complete and merged** (PR #30 squash → `master` @ `67aa72f`). `master` is now @ **`8750359`** (a follow-up commit that tracks the `.claude/`/`.codex/` tooling + a handoff refresh — pushed, so it publishes a throwaway alpha; the "remove later" cleanup is still pending).
+Phases **1 & 2 merged** (PR #30 → `master` @ `67aa72f`; `master` now @ **`8750359`**). **Phase 3 — Public Surface, Packaging & Binder Cleanup — is COMPLETE and in open PR #31** (`https://github.com/existall/SimpleSettings/pull/31`, base `master`, head `gsd/phase-3-public-surface-packaging-binder-cleanup` @ `cf69197`). Verified **4/4 must-haves**, review-clean, suite **208/208** (net8+net10), build 0 warnings.
 
-**Active work: Phase 3 — Public Surface, Packaging & Binder Cleanup**, on feature branch **`gsd/phase-3-public-surface-packaging-binder-cleanup`** (forked off `master` @ `8750359`). **Discuss is DONE** (CONTEXT + DISCUSSION-LOG committed) and **research is DONE** (`03-RESEARCH.md`, committed `d8e7a89`, HIGH confidence). **Planning resumes at the planner step** — re-run `/gsd-plan-phase 3` and it auto-uses the existing research. Suite **94 tests net10** (CI net8 + net10).
+**Next milestone work is decided:** a **new engine phase goes in BEFORE the beta** to satisfy client requirements (approved 2026-07-14). Currently on a LOCAL staging branch **`gsd/phase-4-collection-validation-binding`** (forked off the Phase 3 tip `cf69197`, NOT pushed). The roadmap has NOT been restructured yet.
 
 ## Do this first (new session)
-1. **Verify git state** (`git log -3`, `git branch --show-current`, `gh pr list`): expect to be on **`gsd/phase-3-…`**, `master` @ `8750359` (pushed), PR #30 merged, no open PRs. Working tree may carry an uncommitted handoff refresh + untracked build noise.
-2. **Check Phase 3 planning progress:** `ls .planning/phases/03-public-surface-packaging-binder-cleanup/`
-   - `03-CONTEXT.md` + `03-DISCUSSION-LOG.md` are committed (discuss done).
-   - **If `03-RESEARCH.md` exists and NO `03-*-PLAN.md` yet** → resume planning: **`/gsd-plan-phase 3`** — it auto-uses the existing RESEARCH.md (no re-prompt) and continues: VALIDATION.md → pattern-mapper → gsd-planner → gsd-plan-checker (revision loop, max 3) → coverage gates → PLANNED.
-   - **If `03-*-PLAN.md` files exist** → planning finished; run **`/gsd-execute-phase 3`**.
-3. **Stay on the feature branch.** Ship Phase 3 as one PR to `master` via `guy-lud` after it verifies — never commit docs directly to `master` (burns an alpha).
-
-## Phase 3 — locked decisions (from discuss; full detail + file:line refs in `03-CONTEXT.md`)
-- **API-01:** `SettingsHolder` (`SettingsHolder.cs:5`) `public class` → **`internal sealed`**. `ISettingsHolder` already internal; only `SettingsCollection` uses it; tests keep access via `InternalsVisibleTo` (`Info.cs:3-4`).
-- **PKG-01:** **DROP the `Core.AspNet` package** (its only type is `internal static Environments` → zero public surface). Remove `SimpleSettings.slnx:13` entry + `UnitTests.csproj:19` ProjectReference; confirm no test uses `Environments`.
-- **PKG-02:** **Float `Microsoft.Extensions.*` per-TFM** in `Directory.Packages.props:8-12` (all four): net8 → **latest `8.0.x`**, net10 → `10.0.x`, via CPM conditional `PackageVersion`.
-- **SRC-02:** CLI binder (`CommandLineSettingsBinder.cs`): **add space-separated `--key value`** (lookahead; a prefixed next token = new key) + keep inline `=`/`:`; **skip `arg[0]` by default** via a new `SkipFirstArgument` option (default true) on `CommandLineSettingsBinderOptions`.
-
-## Phase 3 — verified research findings (feed the planner; full detail in `03-RESEARCH.md`)
-- **PKG-02 (verified by live restore, 0 warnings, no NU1504):** per-TFM conditional `<PackageVersion Include=... Condition="'$(TargetFramework)'=='net8.0'">` works. **Exact net8 floors differ per package:** `Configuration`=`8.0.0`, `Configuration.Json`=`8.0.1`, `DependencyInjection`=`8.0.1`, `DependencyInjection.Abstractions`=`8.0.2`. net10 stays `10.0.9`. `CentralPackageTransitivePinningEnabled` stays off.
-- **PKG-01:** `Core.AspNet` **is published on NuGet** (`1.0.0` + a `2.0.0-alpha.0.N` run) → pair removal with **unlisting** the alphas (owner choice, low-stakes). The `UnitTests.csproj:19` ProjectReference is **DEAD** (the package's `Environments` is internal w/ no `InternalsVisibleTo`; tests use a local duplicate) → safe to remove.
-- **API-01:** flip is self-contained — no test references `SettingsHolder`; no PublicAPI analyzer/baseline in the repo.
-- **SRC-02:** our lookahead **deliberately diverges** from Microsoft's provider (which consumes the next token unconditionally). The `arg[0]` skip is needed because `AddCommandLine()` uses `Environment.CommandLine.Split(' ')` (includes exe path + quote-unsafe). Existing `ArgumentsTests` stay green under `SkipFirstArgument=true` (fixture's leading space makes `args[0]` empty).
-- **Open questions for planning:**
-  1. **(recommend YES, in-scope)** Switch `AddCommandLine()` from `Environment.CommandLine.Split(' ')` → `Environment.GetCommandLineArgs()` so the "quoted value with spaces" criterion holds end-to-end for that entry point.
-  2. **(resolved)** net8 floor = latest-patch-per-package (above), not a uniform `8.0.0`.
-
-## Current state
-- On **`gsd/phase-3-public-surface-packaging-binder-cleanup`**. Phase-3 commits so far: `e945d99` (03-CONTEXT + 03-DISCUSSION-LOG), `6cbf370` (STATE record-session). Research step ran after that.
-- **Phases 1–2 merged.** Build clean (0 warnings, both TFMs). Suite **94 net10**.
-- The merged branch `chore/gsd-ownership-cutover` is deleted locally but **still exists on `origin`** (optional cleanup via `guy-lud`).
-- A **`gh-pages`** branch holds the benchmark baseline (`dev/bench/`) — do **not** delete it.
-
-## What shipped in Phases 1–2 (merged via PR #30)
-- **Phase 1** — S1 secret redaction (#27), C2 public exception hierarchy (#28): `SettingsPropertyValueException` carries no value / chains no inner; all exceptions derive from `public abstract SimpleSettingsException`.
-- **Phase 2** — engine test hardening (test-only): `ValuesPopulatorTests` (TEST-01 precedence/default), `TypeConverterTests` (TEST-02 null/nullable/ConverterType), `ScalarConversionTests` (TEST-03 Uri/DateTime), ENG-01 verify-only (generator concurrency gate from #29 confirmed; `..._IsRaceFree` is the load-bearing proof). COLL-01 owner-deferred.
-
-## Remaining roadmap (5 phases; 1–2 done)
-- **Phase 3 (active):** API-01, PKG-01, PKG-02, SRC-02 — above.
-- **Phase 4:** AOT-01 (reflection/AOT-trim annotations), DOC-01 (README refresh).
-- **Phase 5:** REL-01 (cut the first `v2.0.0-beta`; suite green net8 + net10).
-- **Owner-deferred / held:** COLL-01 (`List<T>` support), D1 Validations, D2 EqualityCompererCreator.
+1. **Verify git state** (`git log -3`, `git branch --show-current`, `gh pr list`): expect current branch **`gsd/phase-4-collection-validation-binding`** (local), PR **#31 open** (Phase 3), PR #30 merged. `master` @ `8750359`.
+2. **Decide the Phase-3 PR #31 disposition:** merge it to `master` via `guy-lud` (publishes a throwaway alpha — expected pre-stable), or leave open while stacking Phase 4. If #31 merges, **rebase `gsd/phase-4-collection-validation-binding` onto updated `master`** (it's currently stacked on the unmerged Phase 3 tip).
+3. **Formalize the new engine phase** (client reqs — full detail in `.planning/backlog/client-requirements-pre-beta.md`):
+   - Add 5 requirements to `REQUIREMENTS.md`: **COLL-02** (empty-collection default), **COLL-03** (YAML-sequence / indexed-child binding), **VAL-01** (wire `ISettingValidation<T>`/`ValidatorType`), **VAL-02** (tighter `AllowEmpty`), **API-02** (`AddSimpleSettings` exposes `ISettingsCollection`).
+   - Insert them as **new Phase 4 "Collection & Validation Binding"** via `/gsd-phase` (use it for safe renumbering): current **Phase 4 (AOT/Trim & Docs) → Phase 5**, current **Phase 5 (beta) → Phase 6**. Beta stays last.
+   - Then **`/gsd-discuss-phase 4`** → plan → execute (fresh session per phase; `/clear` between).
+
+## Phase 3 — SHIPPED (in PR #31, awaiting merge)
+- **API-01** `SettingsHolder` → `internal sealed`. **PKG-01** `Core.AspNet` package removed (+ dead test ref). **PKG-02** per-TFM `Microsoft.Extensions.*` floors (net8: `Configuration` 8.0.0, `DependencyInjection.Abstractions` 8.0.2; net10 10.0.9) + restore-time NU1901–1904 audit gate. **SRC-02** CLI binder: space-separated `--k v` + quoted-value binding, `SkipFirstArgument` (default **false**), `AddCommandLine()` → `GetCommandLineArgs()` owns exe-skip.
+- **D-05 was refined mid-planning (owner-approved):** the exe-skip is split by entry point (NOT a shared default-true) — see `03-CONTEXT.md` D-05.
+- **Owner follow-up (not automated):** unlist the published `Core.AspNet` `2.0.0-alpha.0.*` prereleases on NuGet.org (guy-lud account).
+
+## New engine phase — client requirements (APPROVED; to formalize)
+Source detail + provisional IDs + file locations + load-bearing constraints: **`.planning/backlog/client-requirements-pre-beta.md`**. Summary:
+- **COLL-02 / COLL-03** pull deferred **COLL-01** forward and expand it (empty-collection default; sequence binding). **VAL-01** is the held **D1 Validations**.
+- **Load-bearing constraints to preserve when planning:** (a) comma-scalar collection binding MUST keep working (prod env-var overrides `MultiHost__CommonHosts` depend on it); (b) **COLL-03 changes `ConfigurationBinder.BindPropertySettings`** — the redaction-critical method Phase 3 deliberately left untouched — so the **S1/SEC-01 secret-redaction invariant MUST be re-verified** when it lands; (c) collection converter chain must still run per element (int[]/enum arrays).
+- Engine files in scope (different from Phase 3's CLI files): `TypeConverter.ConvertValue` / `ValidateNullAcceptance`, `ConfigurationBinder.BindPropertySettings`, `SettingsPropertyAttribute`/`ISettingValidation<T>`, the `AddSimpleSettings` DI extension.
+
+## Remaining roadmap (after the insert/renumber)
+- **Phase 4 (NEW, engine):** COLL-02, COLL-03, VAL-01, VAL-02, API-02.
+- **Phase 5 (was 4):** AOT-01 (reflection/AOT-trim annotations), DOC-01 (README refresh — MUST add the review's "spaced secrets now bind via `AddCommandLine`" migration note + the Phase-3 breaking-change list).
+- **Phase 6 (was 5):** REL-01 (cut the first `v2.0.0-beta`; suite green net8 + net10).
+- **Still held:** D2 EqualityComparerCreator.
 
 ## How releasing works (durable)
 - **`ci.yml`** — PRs to `master`: build + test (net8.0 + net10.0). **`release.yml`**: push to `master` → auto-publishes a MinVer height-based `-alpha` (NO `paths` filter — every push, incl. docs, publishes). Manual **Release** (`workflow_dispatch`, channel beta/rc/stable + bump) tags `v*`.
@@ -53,22 +39,24 @@ Phases **1 & 2 are complete and merged** (PR #30 squash → `master` @ `67aa72f`
 - **Versioning = MinVer**, tag prefix `v`, baseline **2.0.0**, keyless NuGet Trusted Publishing (OIDC). Workflows use `SOLUTION=SimpleSettings.slnx`. **Everything goes through PRs.**
 
 ## Gotchas a new session MUST know
-- **TUnit test filtering:** `dotnet test --filter "*Name*"` is **rejected** by Microsoft.Testing.Platform/TUnit — exits **5**, zero tests (looks green at a glance). Use `--treenode-filter "/*/*/ClassNameTests/*"` or run unfiltered. Several `*-PLAN.md` `<verify>` blocks still carry the wrong `--filter` form. See `[[simplesettings-test-stack]]`.
-- **Run `dotnet` from `src/`** (global.json → Microsoft.Testing.Platform). net10 runtime only locally → net8 build-only locally; CI runs both. Don't `cd <repo-root>` before `dotnet`.
-- **Pushing / PRs:** active `git`/`gh` identity (`guy-frontegg`) is **read-only** here; push/PR/merge via **`guy-lud`**. `origin` uses SSH alias **`github-guy-lud`** → `git push` already uses guy-lud. For `gh` writes: `gh auth switch --user guy-lud`, then switch back to `guy-frontegg`. See `[[simplesettings-push-access]]`.
-- **Never commit docs to `master`** (release.yml has no `paths` filter → burns an alpha). Wrap ritual: refresh THIS file so it rides the current work branch (currently committed on `gsd/phase-3-…`). See `[[simplesettings-handoff-workflow]]`.
-- **GSD branching:** `config.json` `branching_strategy: none` → `/gsd-execute-phase` commits on the *current* branch. Keep Phase 3 on its feature branch; do NOT execute on `master`. See `[[simplesettings-gsd-source-of-truth]]`.
-- **Review workflow (`[[dotnet-review-workflow]]`):** plan → review the plan with `dotnet-architect`/`performance-analyst`/`security-auditor` → implement → review finished code with `code-reviewer`. All four kit agents fired cleanly recently; still verify each returns real tool calls; `/code-review` skill is a reliable fallback.
+- **TUnit test filtering:** `dotnet test --filter "*Name*"` is **rejected** by Microsoft.Testing.Platform/TUnit — exits **5**, zero tests (looks green at a glance). Use `--treenode-filter "/*/*/ClassNameTests/*"` or run unfiltered. See `[[simplesettings-test-stack]]`.
+- **Run `dotnet` from `src/`** (global.json → Microsoft.Testing.Platform). net10 runtime only locally (both TFM test DLLs run on it); net8 runs natively in CI. Don't `cd <repo-root>` before `dotnet`.
+- **Pushing / PRs:** active `git`/`gh` identity (`guy-frontegg`) is **read-only** here; push/PR/merge via **`guy-lud`**. `origin` uses SSH alias **`github-guy-lud`** → `git push` already uses guy-lud. For `gh` writes: `gh auth switch --user guy-lud`, do the write, then `gh auth switch --user guy-frontegg`. See `[[simplesettings-push-access]]`.
+- **Never commit docs to `master`** (release.yml has no `paths` filter → burns an alpha). Wrap ritual: refresh THIS file on the current work branch (now committed on `gsd/phase-4-…`). See `[[simplesettings-handoff-workflow]]`.
+- **GSD branching:** `config.json` `branching_strategy: none` → `/gsd-execute-phase` commits on the *current* branch. Keep each phase on its own feature branch; never execute on `master`. See `[[simplesettings-gsd-source-of-truth]]`.
+- **Review workflow (`[[dotnet-review-workflow]]`):** plan → review the plan with `dotnet-architect`/`performance-analyst`/`security-auditor` → implement → review finished code with `code-reviewer`. Phase 3 ran all of these; the architect caught a HIGH false-green (a vacuous verify), so **take the specialist reviews seriously — they earn their cost.**
+- **VALIDATION.md gotcha (`[[gsd-plan-phase-validation-md]]`):** with Nyquist on, `/gsd-plan-phase` §5.5 writes only VALIDATION.md frontmatter → the plan-checker BLOCKS on the stub. Populate its body from RESEARCH's "## Validation Architecture" before the checker runs.
 - Commits/PRs here **omit** the Co-Authored-By / Generated-with trailer (project preference).
 
 ## Key decisions & context (carry forward)
-- **Exception-redaction invariant (S1+C2, locked).** `SettingsPropertyValueException` never carries the bound value / never chains an inner; `SettingsBindingException` stores primitives; `SettingsPropertyNullException` = value-free "required missing". Don't weaken.
-- **Generator concurrency (ENG-01/T7, #29).** One `_generationGate` over all generation (double-checked lock; warm path lock-free). Don't switch to `Lazy`-per-type (distinct-interface `DefineType` also races the shared `ModuleBuilder`).
-- **Benchmark tracking gates on ALLOCATIONS, not time** (`gh-pages` baseline).
-- **C3** = provider-level cache (option 2); reload/`IOptionsMonitor` is future "option 3".
+- **Exception-redaction invariant (S1+C2, locked).** `SettingsPropertyValueException` never carries the bound value / never chains an inner; `SettingsBindingException` stores primitives; `SettingsPropertyNullException` = value-free "required missing". Don't weaken. **Re-verify for COLL-03 (touches `BindPropertySettings`).**
+- **Generator concurrency (ENG-01/T7, #29).** One `_generationGate` over all generation (double-checked lock; warm path lock-free). Don't switch to `Lazy`-per-type.
+- **Benchmark tracking gates on ALLOCATIONS, not time** (`gh-pages` baseline). The CLI binder is NOT in the benchmark set.
 - **Pre-stable window:** no `v*` tag; breaking changes free until the first `v2.0.0-beta`.
 
 ## Minor tracked follow-ups (non-blocking)
-- **`.claude/`/`.codex/` are tracked on `master`** (commit `8750359`, "remove later"). Cleanup: add to `.gitignore` + `git rm --cached` — do it on a **branch/PR** (on `master` = another alpha).
-- **Cosmetic NITs** (Phase 2 code review) in `Core/TypeConverterTests.cs`: add `using System;`; optionally rename `Convert_NullForNonNullableValueType_ReturnsTypeDefault` → `..._WithoutAttribute_...`.
-- **REQUIREMENTS.md traceability:** 13 brownfield baseline IDs (`BIND-01…NAME-01`) are in the body but not the traceability table (pre-existing; surfaces in `/gsd-progress`).
+- **`.claude/`/`.codex/` tracked on `master`** (`8750359`, "remove later"): add to `.gitignore` + `git rm --cached` on a **branch/PR** (never on `master`).
+- **REQUIREMENTS.md traceability:** 13 brownfield baseline IDs (`BIND-01…NAME-01`) are in the body but not the traceability table (pre-existing; surfaces in `/gsd-progress` and on `phase.complete`).
+- **Phase 2 cosmetic NITs** in `Core/TypeConverterTests.cs`: add `using System;`; optional test rename.
+- **Stale remote branch** `origin/chore/gsd-ownership-cutover` (merged) — safe to delete via `guy-lud`.
+- **Codebase-map drift:** root files (README, LICENSE, SESSION-HANDOFF.md, …) predate the map — refresh via `/gsd-map-codebase` when convenient (non-blocking).
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinder.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinder.cs
index bc001a9..c0b8748 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinder.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinder.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using ExistForAll.SimpleSettings;
-using ExistForAll.SimpleSettings.Binders;
-
 namespace ExistForAll.SimpleSettings.Binders
 {
    public class CommandLineSettingsBinder : ISectionBinder
@@ -26,6 +20,7 @@ public CommandLineSettingsBinder(string[] args, CommandLineSettingsBinderOptions
 
       public void BindPropertySettings(BindingContext context)
       {
+         
          var key = _options.NameFormatter != null ? _options.NameFormatter(context.Section, context.Key) : context.Key;
          
          if(_argumentStore.TryGetValue(key, out var value))
@@ -34,7 +29,7 @@ public void BindPropertySettings(BindingContext context)
          }
       }
       
-      private void Parse(string[] args)
+      private void Parse(string[]? args)
       {
          _argumentStore.Clear();
 
@@ -61,7 +56,6 @@ private void Parse(string[] args)
             if (!tokenWasPrefixed || index + 1 >= args.Length) continue;
 
             var next = args[index + 1];
-            if (next is null) continue;
             if (next.Length > 0 && Array.IndexOf(prefixes, next[0]) >= 0) continue;
 
             _argumentStore[name] = next;
@@ -69,7 +63,7 @@ private void Parse(string[] args)
          }
       }
 
-      private static Tuple<string, string?>? SplitByDelimiter(string str, CommandLineSettingsBinderOptions options)
+      private static Tuple<string, string?>? SplitByDelimiter(string? str, CommandLineSettingsBinderOptions options)
       {
          if (str == null)
             return null;
@@ -77,31 +71,24 @@ private void Parse(string[] args)
          string key;
          string? value;
 
-         if (!options.Delimiters.Any())
+         if (!options.Delimiters.Any()) 
+            return new Tuple<string, string?>(str.Trim(), null);
+         
+         var indices = options.Delimiters
+            .Select(d => str.IndexOf(d, StringComparison.Ordinal))
+            .Where(d => d != -1).ToList();
+
+         if (indices.Count == 0)
          {
             key = str.Trim();
             value = null;
          }
          else
          {
-
-            var indices = options.Delimiters.Where(delimiter => delimiter != null)
-               .Select(d => str.IndexOf(d))
-               .Where(d => d != -1).ToList();
-
-            if (indices.Count == 0)
-            {
-               key = str.Trim();
-               value = null;
-            }
-            else
-            {
-               var idx = indices.OrderBy(i => i).First();
-               key = str.Substring(0, idx);
-               value = str.Substring(idx + 1);
-            }
+            var idx = indices.OrderBy(i => i).First();
+            key = str[..idx];
+            value = str[(idx + 1)..];
          }
-
          return new Tuple<string, string?>(key, value);
       }
    }
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinderOptions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinderOptions.cs
index 5a51ded..e6702c6 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinderOptions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/CommandLineSettingsBinderOptions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using ExistForAll.SimpleSettings.Binder;
 
 namespace ExistForAll.SimpleSettings.Binders
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinder.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinder.cs
index 9630732..6df59f9 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinder.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinder.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 
 namespace ExistForAll.SimpleSettings.Binders
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinderOptions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinderOptions.cs
index 91a78bf..262cc58 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinderOptions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/EnvironmentVariableBinderOptions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Binders
 {
     public class EnvironmentVariableBinderOptions
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/SettingsBuilderFactoryExtensions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/SettingsBuilderFactoryExtensions.cs
index 073c136..ba14e84 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/SettingsBuilderFactoryExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.Binders/SettingsBuilderFactoryExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.Extensions.Configuration;
 
 namespace ExistForAll.SimpleSettings.Binders
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsBuilderOptions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsBuilderOptions.cs
index edfdcb8..00f36e5 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsBuilderOptions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsBuilderOptions.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsProvider.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsProvider.cs
index 5999487..4b2eb44 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsProvider.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ISettingsProvider.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Extensions.GenericHost
+namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
     public interface ISettingsProvider
     {
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ServicesSettingsBuilderExtensions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ServicesSettingsBuilderExtensions.cs
index d740734..d938ebe 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ServicesSettingsBuilderExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/ServicesSettingsBuilderExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptions.cs
index f01b6df..8527457 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptionsExtensions.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptionsExtensions.cs
index 132db64..a802f25 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptionsExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsBuilderOptionsExtensions.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
diff --git a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsProvider.cs b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsProvider.cs
index 2ae8f66..86f9811 100644
--- a/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsProvider.cs
+++ b/src/Core/ExistForAll.SimpleSettings.Extensions.GenericHost/SettingsProvider.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Extensions.GenericHost
 {
     internal class SettingsProvider : ISettingsProvider
diff --git a/src/Core/ExistForAll.SimpleSettings/Binder/InMemoryCollection.cs b/src/Core/ExistForAll.SimpleSettings/Binder/InMemoryCollection.cs
index 8488ed6..8047d1e 100644
--- a/src/Core/ExistForAll.SimpleSettings/Binder/InMemoryCollection.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Binder/InMemoryCollection.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings.Binder
+namespace ExistForAll.SimpleSettings.Binder
 {
 	public class InMemoryCollection : IInMemoryCollection
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/BindingContext.cs b/src/Core/ExistForAll.SimpleSettings/BindingContext.cs
index 1b960e0..e2936e3 100644
--- a/src/Core/ExistForAll.SimpleSettings/BindingContext.cs
+++ b/src/Core/ExistForAll.SimpleSettings/BindingContext.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/ArrayTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/ArrayTypeConverter.cs
index 112dbe1..54e558b 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/ArrayTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/ArrayTypeConverter.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class ArrayTypeConverter : CollectionTypeConverter
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/CollectionTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/CollectionTypeConverter.cs
index 32496b9..302a068 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/CollectionTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/CollectionTypeConverter.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Conversion
 {
 	// Shared conversion for the two collection shapes — arrays and IEnumerable<T> properties. Both split a
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/DateTimeTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/DateTimeTypeConverter.cs
index d3dded6..75b4c56 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/DateTimeTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/DateTimeTypeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/DefaultTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/DefaultTypeConverter.cs
index 6beab48..418355e 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/DefaultTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/DefaultTypeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Globalization;
+using System.Globalization;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/EnumTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/EnumTypeConverter.cs
index 3261bfe..bb6d575 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/EnumTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/EnumTypeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Conversion
 {
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/EnumerableTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/EnumerableTypeConverter.cs
index bb3e4b4..e3b7eaf 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/EnumerableTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/EnumerableTypeConverter.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 using ExistForAll.SimpleSettings.Core.Reflection;
 
 namespace ExistForAll.SimpleSettings.Conversion
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/ISettingsTypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/ISettingsTypeConverter.cs
index 69c46f0..1646074 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/ISettingsTypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/ISettingsTypeConverter.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	/// <summary>
 	/// Converts a bound settings value to a property's target type.
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/PropertyConversion.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/PropertyConversion.cs
index 8e3e8d9..30232e6 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/PropertyConversion.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/PropertyConversion.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.Conversion
 {
 	// A per-property conversion resolved once (at plan build) instead of on every populate: the chosen
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/TypeConvertersCollections.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/TypeConvertersCollections.cs
index 67986a1..d64747f 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/TypeConvertersCollections.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/TypeConvertersCollections.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class TypeConvertersCollections : LinkedList<ISettingsTypeConverter>
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/Conversion/UriTypeConvertor.cs b/src/Core/ExistForAll.SimpleSettings/Conversion/UriTypeConvertor.cs
index 2167320..6347e37 100644
--- a/src/Core/ExistForAll.SimpleSettings/Conversion/UriTypeConvertor.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Conversion/UriTypeConvertor.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Conversion
+namespace ExistForAll.SimpleSettings.Conversion
 {
 	internal class UriTypeConvertor : ISettingsTypeConverter
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/ISettingsTypesExtractor.cs b/src/Core/ExistForAll.SimpleSettings/Core/ISettingsTypesExtractor.cs
index f79da49..a7c876c 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/ISettingsTypesExtractor.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/ISettingsTypesExtractor.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core
 {
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/EqualityCompererCreator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/EqualityCompererCreator.cs
index c6e7957..05ad040 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/EqualityCompererCreator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/EqualityCompererCreator.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IEqualityCompererCreator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IEqualityCompererCreator.cs
index af7598e..c9ca8cd 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IEqualityCompererCreator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IEqualityCompererCreator.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 using System.Reflection.Emit;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IPropertyCreator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IPropertyCreator.cs
index 17f00c2..4ab5a2f 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IPropertyCreator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/IPropertyCreator.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ISettingsClassGenerator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ISettingsClassGenerator.cs
index 81b0d36..cd9e7a5 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ISettingsClassGenerator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ISettingsClassGenerator.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings.Core.Reflection
+namespace ExistForAll.SimpleSettings.Core.Reflection
 {
 	internal interface ISettingsClassGenerator
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ITypePropertiesExtractor.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ITypePropertiesExtractor.cs
index 1b97243..4472aa5 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ITypePropertiesExtractor.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/ITypePropertiesExtractor.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/PropertyCreator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/PropertyCreator.cs
index e933fb5..8e1e0b7 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/PropertyCreator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/PropertyCreator.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 using System.Reflection.Emit;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/SettingsClassGenerator.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/SettingsClassGenerator.cs
index f9fd29a..c210f36 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/SettingsClassGenerator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/SettingsClassGenerator.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Reflection;
 using System.Reflection.Emit;
 
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeConverter.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeConverter.cs
index 464661e..663338f 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeConverter.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeConverter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Conversion;
 
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeExtensions.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeExtensions.cs
index d0a0b9a..1d6db31 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypeExtensions.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
 {
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypePropertiesExtractor.cs b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypePropertiesExtractor.cs
index ebde463..df2ab6c 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypePropertiesExtractor.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/Reflection/TypePropertiesExtractor.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core.Reflection
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/SettingsOptionsValidator.cs b/src/Core/ExistForAll.SimpleSettings/Core/SettingsOptionsValidator.cs
index 8da767c..bd7d863 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/SettingsOptionsValidator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/SettingsOptionsValidator.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core
diff --git a/src/Core/ExistForAll.SimpleSettings/Core/SettingsTypesExtractor.cs b/src/Core/ExistForAll.SimpleSettings/Core/SettingsTypesExtractor.cs
index 58102bc..2fbe6af 100644
--- a/src/Core/ExistForAll.SimpleSettings/Core/SettingsTypesExtractor.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Core/SettingsTypesExtractor.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings.Core
diff --git a/src/Core/ExistForAll.SimpleSettings/ISettingsCollection.cs b/src/Core/ExistForAll.SimpleSettings/ISettingsCollection.cs
index bd2c374..d9416bb 100644
--- a/src/Core/ExistForAll.SimpleSettings/ISettingsCollection.cs
+++ b/src/Core/ExistForAll.SimpleSettings/ISettingsCollection.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	public interface ISettingsCollection : IEnumerable<KeyValuePair<Type, object>>
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/ISettingsHolder.cs b/src/Core/ExistForAll.SimpleSettings/ISettingsHolder.cs
index 49d8b21..9c0d9ff 100644
--- a/src/Core/ExistForAll.SimpleSettings/ISettingsHolder.cs
+++ b/src/Core/ExistForAll.SimpleSettings/ISettingsHolder.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	internal interface ISettingsHolder
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/IValuesPopulator.cs b/src/Core/ExistForAll.SimpleSettings/IValuesPopulator.cs
index 13b426e..217b665 100644
--- a/src/Core/ExistForAll.SimpleSettings/IValuesPopulator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/IValuesPopulator.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace ExistForAll.SimpleSettings
 {
 	internal interface IValuesPopulator
diff --git a/src/Core/ExistForAll.SimpleSettings/Resources.cs b/src/Core/ExistForAll.SimpleSettings/Resources.cs
index 7b3c101..69f9dd6 100644
--- a/src/Core/ExistForAll.SimpleSettings/Resources.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Resources.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsBindingException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsBindingException.cs
index 0d9b223..cf43640 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsBindingException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsBindingException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	// Raised when an ISectionBinder throws while binding a property. It carries the binder type, section, and
 	// key as primitives and deliberately does NOT retain the BindingContext — the context holds the bound value
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsBuilder.cs b/src/Core/ExistForAll.SimpleSettings/SettingsBuilder.cs
index e5dbfdd..e654203 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsBuilder.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Core;
 using ExistForAll.SimpleSettings.Core.Reflection;
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderExtensions.cs b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderExtensions.cs
index 5d30992..e5a5784 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactory.cs b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactory.cs
index 4f6c85e..7bb3443 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactory.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactory.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace ExistForAll.SimpleSettings
 {
     internal class SettingsBuilderFactory : ISettingsBuilderFactory
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactoryExtensions.cs b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactoryExtensions.cs
index 3ac53d3..6ac01c8 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactoryExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsBuilderFactoryExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
 using ExistForAll.SimpleSettings.Conversion;
 
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsCollection.cs b/src/Core/ExistForAll.SimpleSettings/SettingsCollection.cs
index 276225f..047ef3d 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsCollection.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsCollection.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsCollectionExtensions.cs b/src/Core/ExistForAll.SimpleSettings/SettingsCollectionExtensions.cs
index 6b1d899..af22e97 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsCollectionExtensions.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsCollectionExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
     public static class SettingsCollectionExtensions
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsExtractionException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsExtractionException.cs
index ee83fae..dad267c 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsExtractionException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsExtractionException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Moved to the root namespace (was ExistForAll.SimpleSettings.Core) so the public exception surface is
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsHolder.cs b/src/Core/ExistForAll.SimpleSettings/SettingsHolder.cs
index 704c02a..822a929 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsHolder.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsHolder.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	internal sealed class SettingsHolder : ISettingsHolder
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsOptionNonAttributeException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsOptionNonAttributeException.cs
index 5cf54dc..52c0b62 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsOptionNonAttributeException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsOptionNonAttributeException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	public class SettingsOptionNonAttributeException : SimpleSettingsException
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsOptions.cs b/src/Core/ExistForAll.SimpleSettings/SettingsOptions.cs
index 31ccc74..285d740 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsOptions.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using ExistForAll.SimpleSettings.Conversion;
+using ExistForAll.SimpleSettings.Conversion;
 using ExistForAll.SimpleSettings.Core.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentMissingException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentMissingException.cs
index 38ccd7f..3c4184a 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentMissingException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentMissingException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	public class SettingsOptionsArgumentMissingException : SimpleSettingsException
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentNullException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentNullException.cs
index e6175df..4493b57 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentNullException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsOptionsArgumentNullException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	public class SettingsOptionsArgumentNullException : SimpleSettingsException
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsPlan.cs b/src/Core/ExistForAll.SimpleSettings/SettingsPlan.cs
index fd1fd54..0dad595 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsPlan.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsPlan.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Conversion;
 using ExistForAll.SimpleSettings.Core.Reflection;
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyAttribute.cs b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyAttribute.cs
index 36e2958..4c96d18 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyAttribute.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	[AttributeUsage(AttributeTargets.Property)]
 	public class SettingsPropertyAttribute : Attribute
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyExtractionException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyExtractionException.cs
index a20bb78..7c9f63f 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyExtractionException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyExtractionException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Promoted to public and moved to the root namespace (was internal in ExistForAll.SimpleSettings.Core.Reflection):
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyNullException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyNullException.cs
index 8d5ec97..769bf40 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyNullException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyNullException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Raised when a property marked [SettingsProperty(AllowEmpty = false)] resolves to no value. Distinct from
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyValueException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyValueException.cs
index 7a469af..a5a9b61 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsPropertyValueException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsPropertyValueException.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 
 namespace ExistForAll.SimpleSettings
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsSectionAttribute.cs b/src/Core/ExistForAll.SimpleSettings/SettingsSectionAttribute.cs
index 51ea9a0..50de319 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsSectionAttribute.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsSectionAttribute.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	[AttributeUsage(AttributeTargets.Interface)]
 	public class SettingsSectionAttribute : Attribute
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotFoundException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotFoundException.cs
index 3e8a715..6f54049 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotFoundException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotFoundException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace ExistForAll.SimpleSettings
+namespace ExistForAll.SimpleSettings
 {
 	public class SettingsTypeNotFoundException : SimpleSettingsException
 	{
diff --git a/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotInterfaceException.cs b/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotInterfaceException.cs
index 1d728ce..904d580 100644
--- a/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotInterfaceException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SettingsTypeNotInterfaceException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Raised when a type handed to the builder/collection is not an interface (SimpleSettings generates its
diff --git a/src/Core/ExistForAll.SimpleSettings/SimpleSettingsException.cs b/src/Core/ExistForAll.SimpleSettings/SimpleSettingsException.cs
index 6deea51..be08fa8 100644
--- a/src/Core/ExistForAll.SimpleSettings/SimpleSettingsException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/SimpleSettingsException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Common base for every exception the library throws, so consumers can catch the whole family with a single
diff --git a/src/Core/ExistForAll.SimpleSettings/TypeGenerationException.cs b/src/Core/ExistForAll.SimpleSettings/TypeGenerationException.cs
index c099ac6..e1d848a 100644
--- a/src/Core/ExistForAll.SimpleSettings/TypeGenerationException.cs
+++ b/src/Core/ExistForAll.SimpleSettings/TypeGenerationException.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings
 {
 	// Promoted to public and moved to the root namespace (was internal in ExistForAll.SimpleSettings.Core.Reflection):
diff --git a/src/Core/ExistForAll.SimpleSettings/Validations/ISettingValidation.cs b/src/Core/ExistForAll.SimpleSettings/Validations/ISettingValidation.cs
index 49f7806..293f9e1 100644
--- a/src/Core/ExistForAll.SimpleSettings/Validations/ISettingValidation.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Validations/ISettingValidation.cs
@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 namespace ExistForAll.SimpleSettings.Validations
 {
     public interface ISettingValidation<T> : ISettingsValidator
diff --git a/src/Core/ExistForAll.SimpleSettings/Validations/ISettingsValidator.cs b/src/Core/ExistForAll.SimpleSettings/Validations/ISettingsValidator.cs
index 848470e..c4f6953 100644
--- a/src/Core/ExistForAll.SimpleSettings/Validations/ISettingsValidator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Validations/ISettingsValidator.cs
@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 namespace ExistForAll.SimpleSettings.Validations
 {
     public interface ISettingsValidator
diff --git a/src/Core/ExistForAll.SimpleSettings/Validations/ValidationResult.cs b/src/Core/ExistForAll.SimpleSettings/Validations/ValidationResult.cs
index 3365b0a..700eb51 100644
--- a/src/Core/ExistForAll.SimpleSettings/Validations/ValidationResult.cs
+++ b/src/Core/ExistForAll.SimpleSettings/Validations/ValidationResult.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace ExistForAll.SimpleSettings.Validations
 {
     public class ValidationResult
diff --git a/src/Core/ExistForAll.SimpleSettings/ValuesPopulator.cs b/src/Core/ExistForAll.SimpleSettings/ValuesPopulator.cs
index 4408de7..9d366bd 100644
--- a/src/Core/ExistForAll.SimpleSettings/ValuesPopulator.cs
+++ b/src/Core/ExistForAll.SimpleSettings/ValuesPopulator.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Core.Reflection;
 
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigBuilderConfigurationBinderIntegrationTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigBuilderConfigurationBinderIntegrationTests.cs
index 12aa539..94bb1ff 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigBuilderConfigurationBinderIntegrationTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigBuilderConfigurationBinderIntegrationTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using ExistForAll.SimpleSettings.Binder;
 using ExistForAll.SimpleSettings.Binders;
 using Microsoft.Extensions.Configuration;
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigurationBinderCacheTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigurationBinderCacheTests.cs
index 5542e8a..3ec3a14 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigurationBinderCacheTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/ConfigurationBinderCacheTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using ExistForAll.SimpleSettings.Binders;
 using Microsoft.Extensions.Configuration;
 
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/CollectionConversionTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/CollectionConversionTests.cs
index 887b0c2..163bfe4 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/CollectionConversionTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/CollectionConversionTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using ExistForAll.SimpleSettings.Binder;
-using ExistForAll.SimpleSettings.Binders;
 
 namespace ExistForAll.SimpleSettings.UnitTests.Conversion
 {
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/EnumConversionTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/EnumConversionTests.cs
index b41de55..a90613b 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/EnumConversionTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/EnumConversionTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
 
 namespace ExistForAll.SimpleSettings.UnitTests.Conversion
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ExceptionRedactionTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ExceptionRedactionTests.cs
index 8014192..3d1a1b3 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ExceptionRedactionTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ExceptionRedactionTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
 using ExistForAll.SimpleSettings.Conversion;
 
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ScalarConversionTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ScalarConversionTests.cs
index da014cb..a6580d7 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ScalarConversionTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Conversion/ScalarConversionTests.cs
@@ -1,6 +1,4 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
-using ExistForAll.SimpleSettings.Binders;
 
 namespace ExistForAll.SimpleSettings.UnitTests.Conversion
 {
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Core/TypeConverterTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Core/TypeConverterTests.cs
index 1406921..093cfe2 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/Core/TypeConverterTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/Core/TypeConverterTests.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Conversion;
 using ExistForAll.SimpleSettings.Core.Reflection;
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/DependencyInjection/AddSimpleSettingsIntegrationTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/DependencyInjection/AddSimpleSettingsIntegrationTests.cs
index 470274f..0847d80 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/DependencyInjection/AddSimpleSettingsIntegrationTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/DependencyInjection/AddSimpleSettingsIntegrationTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
 using ExistForAll.SimpleSettings.Extensions.GenericHost;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/DisposableEnvironmentVariable.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/DisposableEnvironmentVariable.cs
index d14401b..7ae080b 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/DisposableEnvironmentVariable.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/DisposableEnvironmentVariable.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading;
-
-namespace ExistForAll.SimpleSettings.UnitTests
+namespace ExistForAll.SimpleSettings.UnitTests
 {
 	internal class DisposableEnvironmentVariable : IDisposable
 	{
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/BindingContextTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/BindingContextTests.cs
index 9a3d044..fd76780 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/BindingContextTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/BindingContextTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
 {
 	public class BindingContextTests
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/EnvironmentVariableAttributeTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/EnvironmentVariableAttributeTests.cs
index 3ac4ba4..ef7ed8b 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/EnvironmentVariableAttributeTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/EnvironmentVariableAttributeTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Binder;
 using ExistForAll.SimpleSettings.Binders;
 
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/ExceptionHierarchyTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/ExceptionHierarchyTests.cs
index b7f35b4..058d6d8 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/ExceptionHierarchyTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/ExceptionHierarchyTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using ExistForAll.SimpleSettings.Binder;
 
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/NonDefaultSettingsTypesExtractorTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/NonDefaultSettingsTypesExtractorTests.cs
index 97460ac..bb0808f 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/NonDefaultSettingsTypesExtractorTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/NonDefaultSettingsTypesExtractorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Core;
 
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsBuilderConversionsTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsBuilderConversionsTests.cs
index 36edc7f..b2541f7 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsBuilderConversionsTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsBuilderConversionsTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Conversion;
 
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsClassGeneratorTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsClassGeneratorTests.cs
index 35524ff..85ff978 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsClassGeneratorTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsClassGeneratorTests.cs
@@ -1,9 +1,5 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Threading;
 using ExistForAll.SimpleSettings.Core.Reflection;
 
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsCollectionTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsCollectionTests.cs
index abb00fb..7b56197 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsCollectionTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsCollectionTests.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
 {
     public class SettingsCollectionTests
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsEnumerableTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsEnumerableTests.cs
index a27594b..9041d90 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsEnumerableTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsEnumerableTests.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
-
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
 {
     public class SettingsEnumerableTests
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsOptionsValidatorTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsOptionsValidatorTests.cs
index 150db5a..175cfcf 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsOptionsValidatorTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsOptionsValidatorTests.cs
@@ -1,4 +1,3 @@
-using System;
 using ExistForAll.SimpleSettings.Core;
 
 namespace ExistForAll.SimpleSettings.UnitTests.SimpleSettings
diff --git a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsTypesExtractorTests.cs b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsTypesExtractorTests.cs
index 86a3994..1511b5e 100644
--- a/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsTypesExtractorTests.cs
+++ b/src/Tests/ExistForAll.SimpleSettings.UnitTests/SimpleSettings/SettingsTypesExtractorTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using ExistForAll.SimpleSettings.Core;
 
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/ConfigBinderBenchmark.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/ConfigBinderBenchmark.cs
index 46e5587..704fa59 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/ConfigBinderBenchmark.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/ConfigBinderBenchmark.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using ExistForAll.SimpleSettings.Binders;
 using Microsoft.Extensions.Configuration;
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/IPerformanceInterfaces.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/IPerformanceInterfaces.cs
index 6fa76a5..cbc7250 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/IPerformanceInterfaces.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/IPerformanceInterfaces.cs
@@ -1,5 +1,3 @@
-using ExistForAll.SimpleSettings;
-
 namespace ExistForAll.SimpleSettings.Benchmark
 {
 	[SettingsSection] public interface IPerformanceInterface0 {[SettingsProperty(DefaultValue = "name_0")] string Name { get; set; } }
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/MicroBenchmarks.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/MicroBenchmarks.cs
index 5f0d8a1..81bc79a 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/MicroBenchmarks.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/MicroBenchmarks.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Reflection;
 using BenchmarkDotNet.Attributes;
 using ExistForAll.SimpleSettings.Binders;
 using ExistForAll.SimpleSettings.Conversion;
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/PlanPopulateBenchmark.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/PlanPopulateBenchmark.cs
index f6f48ed..d0f3d0b 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/PlanPopulateBenchmark.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/PlanPopulateBenchmark.cs
@@ -1,4 +1,3 @@
-using System;
 using BenchmarkDotNet.Attributes;
 using ExistForAll.SimpleSettings.Binder;
 
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/ResolveBenchmark.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/ResolveBenchmark.cs
index bcd684f..156e0a8 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/ResolveBenchmark.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/ResolveBenchmark.cs
@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using ExistForAll.SimpleSettings;
 using ExistForAll.SimpleSettings.Binder;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/ScanBenchmark.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/ScanBenchmark.cs
index 1303b21..29c7170 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/ScanBenchmark.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/ScanBenchmark.cs
@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using ExistForAll.SimpleSettings;
 
 namespace ExistForAll.SimpleSettings.Benchmark
 {
diff --git a/src/performance/ExistForAll.SimpleSettings.Benchmark/ShapeBenchmark.cs b/src/performance/ExistForAll.SimpleSettings.Benchmark/ShapeBenchmark.cs
index 00246c9..781f3f9 100644
--- a/src/performance/ExistForAll.SimpleSettings.Benchmark/ShapeBenchmark.cs
+++ b/src/performance/ExistForAll.SimpleSettings.Benchmark/ShapeBenchmark.cs
@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using ExistForAll.SimpleSettings;
 using ExistForAll.SimpleSettings.Binder;
 
 namespace ExistForAll.SimpleSettings.Benchmark