diff --git a/.buildkite/Manifest-v1.11.toml b/.buildkite/Manifest-v1.11.toml
index 8514a965d8..f3217dbe42 100644
--- a/.buildkite/Manifest-v1.11.toml
+++ b/.buildkite/Manifest-v1.11.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.11.3"
 manifest_format = "2.0"
-project_hash = "5a87299be1bfcf39f70f671b6da880a4c0d361df"
+project_hash = "5a5d186c94863f5141fa0e695cac42b7f4ce95b2"
 
 [[deps.ADTypes]]
 git-tree-sha1 = "e1ce448a0d7f88168ffe2eeac4549c32d45a42d1"
@@ -374,12 +374,6 @@ weakdeps = ["CUDA", "Krylov"]
     ClimaCoreCUDAExt = "CUDA"
     KrylovExt = "Krylov"
 
-[[deps.ClimaCorePlots]]
-deps = ["ClimaComms", "ClimaCore", "RecipesBase", "StaticArrays", "TriplotBase"]
-git-tree-sha1 = "6430644d60158055458075bf32e5ac24741b1ab9"
-uuid = "cf7c7e5a-b407-4c48-9047-11a94a308626"
-version = "0.2.11"
-
 [[deps.ClimaCoreSpectra]]
 deps = ["ClimaCore", "FFTW"]
 git-tree-sha1 = "724f28676f25b5371a29a0cd8ea00187891f0b10"
@@ -1002,11 +996,6 @@ git-tree-sha1 = "b0036b392358c80d2d2124746c2bf3d48d457938"
 uuid = "7746bdde-850d-59dc-9ae8-88ece973131d"
 version = "2.82.4+0"
 
-[[deps.Glob]]
-git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496"
-uuid = "c27321d9-0574-5035-807b-f59d2c89b15c"
-version = "1.3.1"
-
 [[deps.Graphics]]
 deps = ["Colors", "LinearAlgebra", "NaNMath"]
 git-tree-sha1 = "a641238db938fff9b2f60d08ed9030387daf428c"
diff --git a/.buildkite/Project.toml b/.buildkite/Project.toml
index f2b88d448c..c085c87041 100644
--- a/.buildkite/Project.toml
+++ b/.buildkite/Project.toml
@@ -1,97 +1,48 @@
 [deps]
-Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
 ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
-Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
-AtmosphericProfilesLibrary = "86bc3604-9858-485a-bdbe-831ec50de11d"
-Automa = "67c07d97-cdcb-5c2c-af73-a7f9c32a568b"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
-Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"
 ClimaAtmos = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d"
 ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"
-ClimaCorePlots = "cf7c7e5a-b407-4c48-9047-11a94a308626"
 ClimaCoreSpectra = "c2caaa1d-32ae-4754-ba0d-80e7561362e9"
 ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70"
-ClimaDiagnostics = "1ecacbb8-0713-4841-9a07-eb5aa8a2d53f"
-ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 ClimaReproducibilityTests = "e0c89595-00ba-42a9-9f9b-061ef3dc23a1"
 ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
 ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
-CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
-Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
-CubedSphere = "7445602f-e544-4518-8976-18f8e8ae6cdb"
-DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
-Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
-Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
-Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
-FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
-FlameGraphs = "08572546-2f56-4bcf-ba4e-bab62c3a3f89"
-Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-Future = "9fa8497b-333b-5362-9e8d-4d0656e87820"
-GaussQuadrature = "d54b0c1a-921d-58e0-8e36-89d8069c0969"
-Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
-Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8"
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
 IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
-LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
-LazyBroadcast = "9dccce8e-a116-406d-9fcc-a88ed4f510c8"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
-Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
-NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
 Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
 ProfileCanvas = "efd6af41-a80b-495e-886c-e51b0c7d77a3"
-REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
-RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 SnoopCompile = "aa65fe97-06da-5843-b5b1-d5d13cad87d2"
 SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034"
-Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
-TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
-Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
-Unrolled = "9602ed7d-8fef-5bc8-8597-8f21381861e8"
-UnrolledUtilities = "0fe1646c-419e-43be-ac14-22321958931b"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 
 [compat]
-CairoMakie = "0.10, 0.11, 0.12"
-ClimaAnalysis = "0.5.7"
-ClimaCorePlots = "0.2"
+CairoMakie = "0.11, 0.12"
 ClimaCoreSpectra = "0.1"
 ClimaCoreTempestRemap = "0.3"
-ForwardDiff = "0.10"
-Glob = "1"
-JET = "0.7, 0.8, 0.9"
-JSON = "0.21"
-OrderedCollections = "1.6"
+JET = "0.9"
 PrettyTables = "2"
-SciMLBase = "1, 2"
-TOML = "1"
-julia = "1.7"
+ProfileCanvas = "0.1"
+SnoopCompileCore = "3"
+julia = "1.10"
diff --git a/examples/hybrid/driver.jl b/examples/hybrid/driver.jl
index 301c2a22a2..b43774052a 100644
--- a/examples/hybrid/driver.jl
+++ b/examples/hybrid/driver.jl
@@ -23,21 +23,15 @@ sol_res = CA.solve_atmos!(simulation)
 
 import ClimaCore
 import ClimaCore: Topologies, Quadratures, Spaces
-import ClimaAtmos.InitialConditions as ICs
-using Statistics: mean
-import ClimaAtmos.Parameters as CAP
-import Thermodynamics as TD
 import ClimaComms
 using SciMLBase
 using PrettyTables
 using JLD2
 using NCDatasets
 using ClimaTimeSteppers
-import JSON
 using Test
 import Tar
 import Base.Filesystem: rm
-import OrderedCollections
 include(joinpath(pkgdir(CA), "post_processing", "ci_plots.jl"))
 
 ref_job_id = config.parsed_args["reference_job_id"]
diff --git a/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl b/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl
index dcdb4c5a84..14504e653a 100644
--- a/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl
+++ b/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl
@@ -3,8 +3,6 @@ using ClimaCore:
 using NCDatasets
 import ClimaAtmos
 import ClimaAtmos as CA
-import Thermodynamics as TD
-import ClimaParams as CP
 import ClimaComms
 import ClimaAtmos: AtmosArtifacts as AA
 import ClimaUtilities: SpaceVaryingInputs.SpaceVaryingInput
@@ -197,12 +195,12 @@ p = (; orographic_gravity_wave = CA.orographic_gravity_wave_cache(Y, ogw))
 (; ᶜdTdz) = p.orographic_gravity_wave
 
 # pre-compute thermal vars
-thermo_params = TD.Parameters.ThermodynamicsParameters(FT)
+thermo_params = CA.TD.Parameters.ThermodynamicsParameters(FT)
 
 ᶜT = gfdl_ca_temp
 ᶜp = gfdl_ca_p
-ᶜts = similar(Y.c, TD.PhaseEquil{FT})
-@. ᶜts = TD.PhaseEquil_ρpq(thermo_params, Y.c.ρ, ᶜp, Y.c.qt)
+ᶜts = similar(Y.c, CA.TD.PhaseEquil{FT})
+@. ᶜts = CA.TD.PhaseEquil_ρpq(thermo_params, Y.c.ρ, ᶜp, Y.c.qt)
 
 # operators
 ᶜgradᵥ = Operators.GradientF2C()
@@ -223,7 +221,7 @@ end
 
 # buoyancy frequency at cell centers
 parent(ᶜdTdz) .= parent(Geometry.WVector.(ᶜgradᵥ.(ᶠinterp.(ᶜT))))
-ᶜN = @. (grav / ᶜT) * (ᶜdTdz + grav / TD.cp_m(thermo_params, ᶜts)) # this is actually ᶜN^2
+ᶜN = @. (grav / ᶜT) * (ᶜdTdz + grav / CA.TD.cp_m(thermo_params, ᶜts)) # this is actually ᶜN^2
 ᶜN = @. ifelse(ᶜN < eps(FT), sqrt(eps(FT)), sqrt(abs(ᶜN))) # to avoid small numbers
 
 # prepare physical uv input variables for gravity_wave_forcing()
diff --git a/test/restart.jl b/test/restart.jl
index f5d8500ab2..42fe27fd8d 100644
--- a/test/restart.jl
+++ b/test/restart.jl
@@ -1,6 +1,5 @@
 redirect_stderr(IOContext(stderr, :stacktrace_types_limited => Ref(false)))
 import ClimaAtmos as CA
-import RRTMGP
 import ClimaCore
 import ClimaCore: DataLayouts, Fields, Geometry
 import ClimaCore.Fields: Field, FieldVector, field_values
@@ -247,7 +246,7 @@ function test_restart(test_dict; job_id, comms_ctx, more_ignore = Symbol[])
 
     simulation_restarted = CA.get_simulation(config_should_be_same)
 
-    if pkgversion(RRTMGP) < v"0.20"
+    if pkgversion(CA.RRTMGP) < v"0.20"
         # Versions of RRTMGP older than 0.20 have a bug and do not set the
         # flux_dn_dir, so that face_clear_sw_direct_flux_dn and
         # face_sw_direct_flux_dn is uninitialized and not deterministic