diff --git a/Cargo.toml b/Cargo.toml
index 1ab2561e7..6bd36279a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,9 +111,6 @@ actix-web = { path = "." }
 actix-http = { path = "actix-http" }
 actix-http-test = { path = "test-server" }
 actix-web-codegen = { path = "actix-web-codegen" }
-actix-cors = { path = "actix-cors" }
-actix-identity = { path = "actix-identity" }
-actix-session = { path = "actix-session" }
 actix-files = { path = "actix-files" }
 actix-multipart = { path = "actix-multipart" }
 awc = { path = "awc" }
diff --git a/actix-cors/README.md b/actix-cors/README.md
index a77f6c6d3..c860ec5ae 100644
--- a/actix-cors/README.md
+++ b/actix-cors/README.md
@@ -1,5 +1,7 @@
 # Cors Middleware for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-cors)](https://crates.io/crates/actix-cors) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+**This crate moved to https://github.com/actix/actix-extras.**
+
 ## Documentation & community resources
 
 * [User Guide](https://actix.rs/docs/)
diff --git a/actix-identity/README.md b/actix-identity/README.md
index 60b615c76..62a40137f 100644
--- a/actix-identity/README.md
+++ b/actix-identity/README.md
@@ -1,5 +1,7 @@
 # Identity service for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-identity)](https://crates.io/crates/actix-identity) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+**This crate moved to https://github.com/actix/actix-extras.**
+
 ## Documentation & community resources
 
 * [User Guide](https://actix.rs/docs/)
diff --git a/actix-session/README.md b/actix-session/README.md
index 0aee756fd..00e580120 100644
--- a/actix-session/README.md
+++ b/actix-session/README.md
@@ -1,5 +1,7 @@
 # Session for actix web framework [![Build Status](https://travis-ci.org/actix/actix-web.svg?branch=master)](https://travis-ci.org/actix/actix-web) [![codecov](https://codecov.io/gh/actix/actix-web/branch/master/graph/badge.svg)](https://codecov.io/gh/actix/actix-web) [![crates.io](https://meritbadge.herokuapp.com/actix-session)](https://crates.io/crates/actix-session) [![Join the chat at https://gitter.im/actix/actix](https://badges.gitter.im/actix/actix.svg)](https://gitter.im/actix/actix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+**This crate moved to https://github.com/actix/actix-extras.**
+
 ## Documentation & community resources
 
 * [User Guide](https://actix.rs/docs/)
diff --git a/awc/src/sender.rs b/awc/src/sender.rs
index ec18f12e3..983e730e1 100644
--- a/awc/src/sender.rs
+++ b/awc/src/sender.rs
@@ -9,7 +9,6 @@ use bytes::Bytes;
 use derive_more::From;
 use futures_core::{Future, Stream};
 use serde::Serialize;
-use serde_json;
 
 use actix_http::body::{Body, BodyStream};
 use actix_http::http::header::{self, IntoHeaderValue};
diff --git a/src/types/json.rs b/src/types/json.rs
index fb00bf7a6..ead2d0c9a 100644
--- a/src/types/json.rs
+++ b/src/types/json.rs
@@ -11,7 +11,6 @@ use futures::future::{err, ok, FutureExt, LocalBoxFuture, Ready};
 use futures::StreamExt;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
-use serde_json;
 
 use actix_http::http::{header::CONTENT_LENGTH, StatusCode};
 use actix_http::{HttpMessage, Payload, Response};
diff --git a/src/types/query.rs b/src/types/query.rs
index a6c18d9be..73ea14f17 100644
--- a/src/types/query.rs
+++ b/src/types/query.rs
@@ -6,7 +6,6 @@ use std::{fmt, ops};
 use actix_http::error::Error;
 use futures::future::{err, ok, Ready};
 use serde::de;
-use serde_urlencoded;
 
 use crate::dev::Payload;
 use crate::error::QueryPayloadError;
diff --git a/tests/test_weird_poll.rs b/tests/test_weird_poll.rs
index 571b69f45..7e4300901 100644
--- a/tests/test_weird_poll.rs
+++ b/tests/test_weird_poll.rs
@@ -1,11 +1,11 @@
 // Regression test for #/1321
 
+/*
 use futures::task::{noop_waker, Context};
 use futures::stream::once;
 use actix_http::body::{MessageBody, BodyStream};
 use bytes::Bytes;
 
-/* 
 Disable weird poll until actix-web is based on actix-http 2.0.0
 
 #[test]