diff --git a/src/agent.rs b/src/agent.rs
index f1c0d34..c50aa2f 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -3,7 +3,6 @@ use std::str::FromStr;
 use std::sync::Mutex;
 
 use header::{add_header, Header};
-use util::*;
 
 // to get to share private fields
 include!("request.rs");
@@ -270,6 +269,29 @@ impl Agent {
     }
 }
 
+
+fn basic_auth(user: &str, pass: &str) -> String {
+    let safe = match user.find(":") {
+        Some(idx) => &user[..idx],
+        None => user,
+    };
+    ::base64::encode(&format!("{}:{}", safe, pass))
+}
+
+
+fn mime_of<S: Into<String>>(s: S) -> String {
+    let s = s.into();
+    match &s[..] {
+        "json" => "application/json",
+        "form" => "application/x-www-form-urlencoded",
+        _ => match ::mime_guess::get_mime_type_str(&s) {
+            Some(mime) => mime,
+            None => "foo",
+        },
+    }.to_string()
+}
+
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/lib.rs b/src/lib.rs
index 6faa920..dd7e574 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,11 +12,11 @@ extern crate serde_json;
 extern crate native_tls;
 extern crate url;
 
-#[macro_use]
 mod agent;
 mod error;
 mod header;
-mod util;
+mod macros;
+mod serde_macros;
 
 #[cfg(test)]
 mod test;
diff --git a/src/util/macros.rs b/src/macros.rs
similarity index 100%
rename from src/util/macros.rs
rename to src/macros.rs
diff --git a/src/util/serde_macros.rs b/src/serde_macros.rs
similarity index 100%
rename from src/util/serde_macros.rs
rename to src/serde_macros.rs
diff --git a/src/util/mod.rs b/src/util/mod.rs
deleted file mode 100644
index 2c4b99e..0000000
--- a/src/util/mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#[allow(dead_code)]
-mod macros;
-mod serde_macros;
-pub mod vecread;
-
-use base64;
-use mime_guess::get_mime_type_str;
-
-pub use util::vecread::VecRead;
-
-pub fn basic_auth(user: &str, pass: &str) -> String {
-    let safe = match user.find(":") {
-        Some(idx) => &user[..idx],
-        None => user,
-    };
-    base64::encode(&format!("{}:{}", safe, pass))
-}
-
-pub fn mime_of<S: Into<String>>(s: S) -> String {
-    let s = s.into();
-    match &s[..] {
-        "json" => "application/json",
-        "form" => "application/x-www-form-urlencoded",
-        _ => match get_mime_type_str(&s) {
-            Some(mime) => mime,
-            None => "foo",
-        },
-    }.to_string()
-}