diff --git a/mistralrs/examples/grammar/main.rs b/mistralrs/examples/grammar/main.rs
index 209ae1018..92582a450 100644
--- a/mistralrs/examples/grammar/main.rs
+++ b/mistralrs/examples/grammar/main.rs
@@ -1,9 +1,8 @@
 use std::sync::Arc;
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
+    Constraint, Device, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
     NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
     SamplingParams, SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/examples/isq/main.rs b/mistralrs/examples/isq/main.rs
index 3d693a0dd..67f2f876f 100644
--- a/mistralrs/examples/isq/main.rs
+++ b/mistralrs/examples/isq/main.rs
@@ -1,11 +1,10 @@
 use std::sync::Arc;
 use tokio::sync::mpsc::channel;
 
-use candle_core::{quantized::GgmlDType, Device};
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
-    NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
-    SamplingParams, SchedulerMethod, TokenSource,
+    Constraint, Device, DeviceMapMetadata, GgmlDType, MistralRs, MistralRsBuilder,
+    NormalLoaderBuilder, NormalLoaderType, NormalRequest, NormalSpecificConfig, Request,
+    RequestMessage, Response, SamplingParams, SchedulerMethod, TokenSource,
 };
 
 fn setup() -> anyhow::Result<Arc<MistralRs>> {
diff --git a/mistralrs/examples/lora/main.rs b/mistralrs/examples/lora/main.rs
index 8b4aaa063..5afc0e767 100644
--- a/mistralrs/examples/lora/main.rs
+++ b/mistralrs/examples/lora/main.rs
@@ -1,9 +1,8 @@
 use std::{fs::File, sync::Arc};
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
+    Constraint, Device, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
     NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
     SamplingParams, SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/examples/lora_activation/main.rs b/mistralrs/examples/lora_activation/main.rs
index bf7255283..0aa83e9a4 100644
--- a/mistralrs/examples/lora_activation/main.rs
+++ b/mistralrs/examples/lora_activation/main.rs
@@ -1,9 +1,8 @@
 use std::{fs::File, sync::Arc};
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
+    Constraint, Device, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
     NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
     SamplingParams, SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/examples/quantized/main.rs b/mistralrs/examples/quantized/main.rs
index 39ffafe4a..37f60ef01 100644
--- a/mistralrs/examples/quantized/main.rs
+++ b/mistralrs/examples/quantized/main.rs
@@ -1,9 +1,8 @@
 use std::sync::Arc;
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, GGUFLoaderBuilder, GGUFSpecificConfig, MistralRs,
+    Constraint, Device, DeviceMapMetadata, GGUFLoaderBuilder, GGUFSpecificConfig, MistralRs,
     MistralRsBuilder, NormalRequest, Request, RequestMessage, Response, SamplingParams,
     SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/examples/simple/main.rs b/mistralrs/examples/simple/main.rs
index 00d0fb64f..310c23c4d 100644
--- a/mistralrs/examples/simple/main.rs
+++ b/mistralrs/examples/simple/main.rs
@@ -1,9 +1,8 @@
 use std::sync::Arc;
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
+    Constraint, Device, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
     NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
     SamplingParams, SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/examples/xlora/main.rs b/mistralrs/examples/xlora/main.rs
index c445795a4..bc4c52a3a 100644
--- a/mistralrs/examples/xlora/main.rs
+++ b/mistralrs/examples/xlora/main.rs
@@ -1,9 +1,8 @@
 use std::{fs::File, sync::Arc};
 use tokio::sync::mpsc::channel;
 
-use candle_core::Device;
 use mistralrs::{
-    Constraint, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
+    Constraint, Device, DeviceMapMetadata, MistralRs, MistralRsBuilder, NormalLoaderBuilder,
     NormalLoaderType, NormalRequest, NormalSpecificConfig, Request, RequestMessage, Response,
     SamplingParams, SchedulerMethod, TokenSource,
 };
diff --git a/mistralrs/src/lib.rs b/mistralrs/src/lib.rs
index 862a4250d..65e6f6005 100644
--- a/mistralrs/src/lib.rs
+++ b/mistralrs/src/lib.rs
@@ -1,7 +1,2 @@
-pub use mistralrs_core::{
-    ChatCompletionResponse, CompletionResponse, Constraint, DeviceMapMetadata, GGMLLoaderBuilder,
-    GGMLSpecificConfig, GGUFLoaderBuilder, GGUFSpecificConfig, Loader, MistralRs, MistralRsBuilder,
-    NormalLoader, NormalLoaderBuilder, NormalLoaderType, NormalRequest, NormalSpecificConfig,
-    Request, RequestMessage, Response, SamplingParams, SchedulerMethod, StopTokens, TokenSource,
-    Usage,
-};
+pub use candle_core::{quantized::GgmlDType, DType, Device, Result};
+pub use mistralrs_core::*;