diff --git a/.circleci/config.yml b/.circleci/config.yml
index 910fb6085d..894655097b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -148,7 +148,7 @@ jobs:
       - restore-cargo-cache
       - install-protoc
       - run: cargo fmt --all --check
-      # TODO: this is incompatible with workspace inheritance, uncomment when 
+      # TODO: this is incompatible with workspace inheritance, uncomment when
       # https://github.com/DevinR528/cargo-sort/pull/29 is merged
       # - run: cargo install cargo-sort
       # - run: cargo sort --check --workspace
@@ -185,7 +185,7 @@ jobs:
       - install-protoc
       - apply-patches
       - run: cargo fmt --all --check --manifest-path << parameters.path >>/Cargo.toml
-      # TODO: this is incompatible with workspace inheritance, uncomment when 
+      # TODO: this is incompatible with workspace inheritance, uncomment when
       # https://github.com/DevinR528/cargo-sort/pull/29 is merged
       # - run: cargo install cargo-sort
       # - run: cargo sort --check << parameters.path >>
diff --git a/Cargo.lock b/Cargo.lock
index e94855c62d..db14c4599a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6023,9 +6023,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341"
+checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d"
 dependencies = [
  "serde",
 ]
diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
index 16c7866f93..dd2e61a5eb 100644
--- a/cargo-shuttle/src/lib.rs
+++ b/cargo-shuttle/src/lib.rs
@@ -27,7 +27,6 @@ use futures::{StreamExt, TryFutureExt};
 use git2::{Repository, StatusOptions};
 use ignore::overrides::OverrideBuilder;
 use ignore::WalkBuilder;
-use provisioner_server::LocalProvisioner;
 use shuttle_common::models::{project, secret};
 use shuttle_service::loader::{build_crate, Runtime};
 use std::fmt::Write;
@@ -38,6 +37,7 @@ use uuid::Uuid;
 
 use crate::args::{DeploymentCommand, ProjectCommand};
 use crate::client::Client;
+use crate::provisioner_server::LocalProvisioner;
 
 pub struct Shuttle {
     ctx: RequestContext,
@@ -479,6 +479,7 @@ impl Shuttle {
 
         trace!(response = ?response,  "client response: ");
 
+        // TODO: move to runtime
         let addr = if run_args.external {
             std::net::IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0))
         } else {
diff --git a/deployer/tests/deploy_layer/bind-panic/Cargo.toml b/deployer/tests/deploy_layer/bind-panic/Cargo.toml
index 3ef90aa3d6..1f971dfe59 100644
--- a/deployer/tests/deploy_layer/bind-panic/Cargo.toml
+++ b/deployer/tests/deploy_layer/bind-panic/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"
diff --git a/deployer/tests/deploy_layer/main-panic/Cargo.toml b/deployer/tests/deploy_layer/main-panic/Cargo.toml
index f6311505fe..c1768ce6aa 100644
--- a/deployer/tests/deploy_layer/main-panic/Cargo.toml
+++ b/deployer/tests/deploy_layer/main-panic/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"
diff --git a/deployer/tests/deploy_layer/self-stop/Cargo.toml b/deployer/tests/deploy_layer/self-stop/Cargo.toml
index 2e80c32434..36b4c48921 100644
--- a/deployer/tests/deploy_layer/self-stop/Cargo.toml
+++ b/deployer/tests/deploy_layer/self-stop/Cargo.toml
@@ -11,4 +11,4 @@ crate-type = ["cdylib"]
 [workspace]
 
 [dependencies]
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"
diff --git a/deployer/tests/deploy_layer/sleep-async/Cargo.toml b/deployer/tests/deploy_layer/sleep-async/Cargo.toml
index 8870d819be..694bc88efb 100644
--- a/deployer/tests/deploy_layer/sleep-async/Cargo.toml
+++ b/deployer/tests/deploy_layer/sleep-async/Cargo.toml
@@ -12,4 +12,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tokio = { version = "1.0", features = ["time"]}
-shuttle-service = { version = "0.8.0", features = ["codegen"] }
+shuttle-service = "0.8.0"
diff --git a/deployer/tests/resources/tests-fail/Cargo.toml b/deployer/tests/resources/tests-fail/Cargo.toml
index f678cc9a8d..43b6ff3573 100644
--- a/deployer/tests/resources/tests-fail/Cargo.toml
+++ b/deployer/tests/resources/tests-fail/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rocket = "0.5.0-rc.2"
-shuttle-service = { path = "../../../../service", features = ["codegen", "web-rocket"] }
+shuttle-service = { path = "../../../../service", features = ["web-rocket"] }
diff --git a/deployer/tests/resources/tests-pass/Cargo.toml b/deployer/tests/resources/tests-pass/Cargo.toml
index 358114dae5..43e898a65d 100644
--- a/deployer/tests/resources/tests-pass/Cargo.toml
+++ b/deployer/tests/resources/tests-pass/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 rocket = "0.5.0-rc.2"
-shuttle-service = { path = "../../../../service", features = ["codegen", "web-rocket"] }
+shuttle-service = { path = "../../../../service", features = ["web-rocket"] }
diff --git a/gateway/tests/hello_world.crate b/gateway/tests/hello_world.crate
index 038d4d03e2..a07f34d97f 100644
Binary files a/gateway/tests/hello_world.crate and b/gateway/tests/hello_world.crate differ
diff --git a/service/tests/resources/sleep-async/Cargo.toml b/service/tests/resources/sleep-async/Cargo.toml
index 9b4d8ca165..e9fa47aae4 100644
--- a/service/tests/resources/sleep-async/Cargo.toml
+++ b/service/tests/resources/sleep-async/Cargo.toml
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 tokio = { version = "1.22.0", features = ["time"] }
-shuttle-service = { path = "../../../", features = ["codegen"] }
+shuttle-service = { path = "../../../" }
diff --git a/shell.nix b/shell.nix
index 6cce93e2ca..2a53950a84 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,8 +12,8 @@ in
     ];
     buildInputs = with nixpkgs; [
       ((rustChannelOf{ channel = "1.65.0"; }).rust.override {
-        targets = ["wasm32-wasi"];
         extensions = ["rust-src"];
+        targets = ["wasm32-wasi"];
       })
       cargo-watch
       terraform