diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39813fc94c1e..2c6e26ffc0aa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ orbs:
   slack: circleci/slack@3.4.2
   sdk: ory/sdk@0.1.38
   docs: ory/docs@0.0.8
+  nancy: ory/nancy@0.0.13
   golangci: ory/golangci@0.0.9
 
 jobs:
@@ -133,31 +134,10 @@ jobs:
           bash <(curl -s https://raw.githubusercontent.com/ory/ci/master/src/scripts/install/prettier.sh)
           npm run format:check
 
-  nancy:
-    docker:
-      - image: circleci/golang:1.15-node
-        environment:
-          GO111MODULE: 'on'
-    working_directory: /go/src/github.com/ory/kratos
-    steps:
-      - checkout
-      - run: |
-          set -euxo
-
-          # install nancy
-          curl -L -o $GOPATH/bin/nancy https://github.com/sonatype-nexus-community/nancy/releases/download/v1.0.5/nancy-linux.amd64-v1.0.5 && chmod +x $GOPATH/bin/nancy
-
-          # run nancy but without the internal client rewrite
-          go list -m all | sed -r 's/ => .\/internal\/httpclient//' | nancy sleuth --quiet
-
 workflows:
   tbr:
     jobs:
-      -
-        nancy:
-          filters:
-            tags:
-              only: /.*/
+#      - nancy/test
       -
         validate:
           filters:
@@ -168,7 +148,7 @@ workflows:
           flavor: sqlite
           requires:
             - test
-            - nancy
+#            - nancy/test
             - validate
           filters:
             tags:
diff --git a/courier/courier.go b/courier/courier.go
index 442eed3bcd4b..0e5d74b5430b 100644
--- a/courier/courier.go
+++ b/courier/courier.go
@@ -28,9 +28,6 @@ type (
 		Dialer *gomail.Dialer
 		d      smtpDependencies
 		c      *config.Provider
-		// graceful shutdown handling
-		ctx      context.Context
-		shutdown context.CancelFunc
 	}
 	Provider interface {
 		Courier() *Courier
diff --git a/identity/manager.go b/identity/manager.go
index 9d26eff1475b..e7f6cf259e90 100644
--- a/identity/manager.go
+++ b/identity/manager.go
@@ -14,7 +14,6 @@ import (
 	"github.com/ory/x/errorsx"
 
 	"github.com/ory/kratos/courier"
-	"github.com/ory/kratos/driver/config"
 )
 
 var ErrProtectedFieldModified = herodot.ErrForbidden.
@@ -31,7 +30,6 @@ type (
 	}
 	Manager struct {
 		r managerDependencies
-		c *config.Provider
 	}
 
 	managerOptions struct {