diff --git a/build.rs b/build.rs
index 4bdae277d68..768f9792038 100644
--- a/build.rs
+++ b/build.rs
@@ -2,7 +2,6 @@ extern crate diesel;
 extern crate dotenv;
 
 use diesel::migrations::run_pending_migrations;
-use diesel::pg::PgConnection;
 use diesel::prelude::*;
 use dotenv::dotenv;
 use std::env;
diff --git a/src/badge.rs b/src/badge.rs
index 617ee6389db..caedd11e910 100644
--- a/src/badge.rs
+++ b/src/badge.rs
@@ -1,7 +1,7 @@
 use krate::Crate;
 use schema::badges;
 
-use diesel::pg::{Pg, PgConnection};
+use diesel::pg::Pg;
 use diesel::prelude::*;
 use serde_json;
 use std::collections::HashMap;
diff --git a/src/bin/delete-crate.rs b/src/bin/delete-crate.rs
index bc808caa5be..d72a404309b 100644
--- a/src/bin/delete-crate.rs
+++ b/src/bin/delete-crate.rs
@@ -12,7 +12,6 @@ extern crate diesel;
 extern crate time;
 
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use std::env;
 use std::io;
 use std::io::prelude::*;
diff --git a/src/bin/delete-version.rs b/src/bin/delete-version.rs
index 15a454daaa4..f75d896ce4b 100644
--- a/src/bin/delete-version.rs
+++ b/src/bin/delete-version.rs
@@ -13,7 +13,6 @@ extern crate time;
 extern crate semver;
 
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use std::env;
 use std::io;
 use std::io::prelude::*;
diff --git a/src/bin/populate.rs b/src/bin/populate.rs
index bc5a8728f99..1201fb5fbb9 100644
--- a/src/bin/populate.rs
+++ b/src/bin/populate.rs
@@ -15,7 +15,6 @@ extern crate diesel_codegen;
 extern crate rand;
 
 use chrono::{Utc, NaiveDate, Duration};
-use diesel::pg::PgConnection;
 use diesel::prelude::*;
 use rand::{StdRng, Rng};
 use std::env;
diff --git a/src/bin/transfer-crates.rs b/src/bin/transfer-crates.rs
index d5ee7634f9c..bb24bfcaef0 100644
--- a/src/bin/transfer-crates.rs
+++ b/src/bin/transfer-crates.rs
@@ -10,7 +10,6 @@ extern crate diesel;
 extern crate semver;
 
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use std::env;
 use std::io;
 use std::io::prelude::*;
diff --git a/src/bin/update-downloads.rs b/src/bin/update-downloads.rs
index cfabf31e5c2..9ef03865072 100644
--- a/src/bin/update-downloads.rs
+++ b/src/bin/update-downloads.rs
@@ -12,7 +12,6 @@ extern crate time;
 
 use chrono::NaiveDate;
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use diesel::pg::upsert::*;
 use std::env;
 use std::time::Duration;
diff --git a/src/categories.rs b/src/categories.rs
index 784b926002e..8fc58e14f79 100644
--- a/src/categories.rs
+++ b/src/categories.rs
@@ -3,7 +3,6 @@
 
 use diesel;
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use toml;
 
 use db;
diff --git a/src/category.rs b/src/category.rs
index d764dad1c64..c07624dbf3e 100644
--- a/src/category.rs
+++ b/src/category.rs
@@ -3,7 +3,6 @@ use time::Timespec;
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
 use diesel::*;
-use diesel::pg::PgConnection;
 
 use Crate;
 use db::RequestTransaction;
diff --git a/src/db.rs b/src/db.rs
index 86cd569861e..009a66343a1 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -1,8 +1,7 @@
 use std::env;
 
 use conduit::Request;
-use diesel::pg::PgConnection;
-use diesel::prelude::ConnectionResult;
+use diesel::prelude::{PgConnection, ConnectionResult};
 use r2d2;
 use r2d2_diesel::{self, ConnectionManager};
 use url::Url;
diff --git a/src/dependency.rs b/src/dependency.rs
index d9871c377e6..1c2e79d4320 100644
--- a/src/dependency.rs
+++ b/src/dependency.rs
@@ -1,5 +1,5 @@
 use diesel::prelude::*;
-use diesel::pg::{Pg, PgConnection};
+use diesel::pg::Pg;
 use diesel::types::{Integer, Text};
 use semver;
 
diff --git a/src/download.rs b/src/download.rs
index 4b37796b323..30200b87594 100644
--- a/src/download.rs
+++ b/src/download.rs
@@ -1,7 +1,6 @@
 use chrono::NaiveDate;
 use diesel;
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 
 use schema::version_downloads;
 use version::Version;
diff --git a/src/keyword.rs b/src/keyword.rs
index 419af7187ae..ea4e8689b1e 100644
--- a/src/keyword.rs
+++ b/src/keyword.rs
@@ -3,7 +3,6 @@ use time::Timespec;
 
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
-use diesel::pg::PgConnection;
 use diesel::prelude::*;
 use diesel;
 
diff --git a/src/krate.rs b/src/krate.rs
index 4550df0084e..6e0e0909eef 100644
--- a/src/krate.rs
+++ b/src/krate.rs
@@ -7,7 +7,7 @@ use conduit_router::RequestParams;
 use diesel::associations::Identifiable;
 use diesel::helper_types::Select;
 use diesel::pg::upsert::*;
-use diesel::pg::{Pg, PgConnection};
+use diesel::pg::Pg;
 use diesel::prelude::*;
 use diesel;
 use diesel_full_text_search::*;
diff --git a/src/owner.rs b/src/owner.rs
index fe0d679b09f..0462cc9556a 100644
--- a/src/owner.rs
+++ b/src/owner.rs
@@ -1,5 +1,4 @@
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 
 use app::App;
 use http;
diff --git a/src/tests/all.rs b/src/tests/all.rs
index 78bd9a5fd9b..3d3456061f7 100644
--- a/src/tests/all.rs
+++ b/src/tests/all.rs
@@ -41,7 +41,6 @@ use cargo_registry::user::AuthenticationSource;
 use cargo_registry::{User, Crate, Version, Dependency, Replica};
 use conduit::{Request, Method};
 use conduit_test::MockRequest;
-use diesel::pg::PgConnection;
 use diesel::prelude::*;
 use diesel::pg::upsert::*;
 use cargo_registry::schema::*;
diff --git a/src/tests/categories.rs b/src/tests/categories.rs
index d850907872e..68228143b71 100644
--- a/src/tests/categories.rs
+++ b/src/tests/categories.rs
@@ -1,6 +1,5 @@
 use cargo_registry::schema::categories;
 use diesel::*;
-use diesel::pg::PgConnection;
 use dotenv::dotenv;
 
 use std::env;
diff --git a/src/token.rs b/src/token.rs
index a4f2dd0053f..90f42c197fa 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -1,6 +1,5 @@
 use diesel;
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use conduit::{Request, Response};
 use time::Timespec;
 use conduit_router::RequestParams;
diff --git a/src/user/mod.rs b/src/user/mod.rs
index 3678d56403c..5ba429bb1e2 100644
--- a/src/user/mod.rs
+++ b/src/user/mod.rs
@@ -2,7 +2,6 @@ use conduit::{Request, Response};
 use conduit_cookie::RequestSession;
 use conduit_router::RequestParams;
 use diesel::prelude::*;
-use diesel::pg::PgConnection;
 use rand::{thread_rng, Rng};
 use std::borrow::Cow;
 use serde_json;
diff --git a/src/version.rs b/src/version.rs
index b835d9674d3..fb6e0ec2981 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
 use diesel;
-use diesel::pg::{Pg, PgConnection};
+use diesel::pg::Pg;
 use diesel::pg::upsert::*;
 use diesel::prelude::*;
 use semver;