diff --git a/src/cli/serve.rs b/src/cli/serve.rs
index 448b6432761ab00096d55c15adb3ddda3cdb8657..0bd11814c761ffc54040dc329a122e78c36149d8 100644
--- a/src/cli/serve.rs
+++ b/src/cli/serve.rs
@@ -34,7 +34,7 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 
 pub async fn serve(config: Arc<Config>) -> Result<()> {
   MONITOR.init().context(MonitorError)?;
-  
+
   console_subscriber::init();
 
   // Set up a channel for receiving thread notifications.
diff --git a/src/main.rs b/src/main.rs
index 9badbb7953bb95aea88574593a6ad691acb0cc32..bdcf935559e2730dac8dd427eb7aed3d9e122bf1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,41 +10,18 @@ use cli::{
   args::{Opts, SubCommand},
   bundle, serve,
 };
-use collective::{
-  cli::ConfigurableAppOpts,
-  thread::monitor::{self},
-};
-use espresso::{bundle::packager, config, stats};
+use collective::cli::ConfigurableAppOpts;
+use espresso::bundle::packager;
 use snafu::{ResultExt, Snafu};
-use std::{net::SocketAddr, sync::Arc};
+use std::sync::Arc;
 
 pub mod cli;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-  OpenConfig {
-    source: config::Error,
-  },
-  Bind {
-    address: SocketAddr,
-    source: std::io::Error,
-  },
-  ServeError {
-    source: serve::Error,
-  },
-  BundleError {
-    source: packager::Error,
-  },
-  ServeStats {
-    source: stats::Error,
-  },
-  MonitorError {
-    source: monitor::Error,
-  },
-  RecvNotify,
-  CliError {
-    source: collective::cli::CliError,
-  },
+  ServeError { source: serve::Error },
+  BundleError { source: packager::Error },
+  CliError { source: collective::cli::CliError },
 }
 
 type Result<T, E = Error> = std::result::Result<T, E>;