diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index db7aad51540..2d1bc6cbb5e 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -10,7 +10,7 @@ import (
 	"io"
 
 	exchange "github.com/ipfs/go-ipfs/exchange"
-	"github.com/ipfs/go-ipfs/removeme/verifcid"
+	"github.com/ipfs/go-ipfs/thirdparty/verifcid"
 
 	logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
 	blockstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore"
diff --git a/core/builder.go b/core/builder.go
index 4e73ebb39da..e7999bf9e9d 100644
--- a/core/builder.go
+++ b/core/builder.go
@@ -15,7 +15,7 @@ import (
 	dag "github.com/ipfs/go-ipfs/merkledag"
 	resolver "github.com/ipfs/go-ipfs/path/resolver"
 	pin "github.com/ipfs/go-ipfs/pin"
-	"github.com/ipfs/go-ipfs/removeme/verifbs"
+	"github.com/ipfs/go-ipfs/thirdparty/verifbs"
 	repo "github.com/ipfs/go-ipfs/repo"
 	cfg "github.com/ipfs/go-ipfs/repo/config"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
diff --git a/removeme/verifbs/verifbs.go b/thirdparty/verifbs/verifbs.go
similarity index 96%
rename from removeme/verifbs/verifbs.go
rename to thirdparty/verifbs/verifbs.go
index fec59743a57..e19cef1c84e 100644
--- a/removeme/verifbs/verifbs.go
+++ b/thirdparty/verifbs/verifbs.go
@@ -1,7 +1,7 @@
 package verifbs
 
 import (
-	"github.com/ipfs/go-ipfs/removeme/verifcid"
+	"github.com/ipfs/go-ipfs/thirdparty/verifcid"
 
 	bstore "gx/ipfs/QmTVDM4LCSUMFNQzbDLL9zQwp8usE6QHymFdh3h8vL9v6b/go-ipfs-blockstore"
 	cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
diff --git a/removeme/verifcid/validate.go b/thirdparty/verifcid/validate.go
similarity index 92%
rename from removeme/verifcid/validate.go
rename to thirdparty/verifcid/validate.go
index 5c8b56ae1f8..4af24b4c43a 100644
--- a/removeme/verifcid/validate.go
+++ b/thirdparty/verifcid/validate.go
@@ -8,7 +8,7 @@ import (
 )
 
 var ErrPossiblyInsecureHashFunction = fmt.Errorf("potentially insecure hash functions not allowed")
-var ErrBelowMinimumHashLength = fmt.Errorf("hashes must be at least bytes long")
+var ErrBelowMinimumHashLength = fmt.Errorf("hashes must be at %d least bytes long", minimumHashLength)
 
 const minimumHashLength = 20
 
diff --git a/removeme/verifcid/validate_test.go b/thirdparty/verifcid/validate_test.go
similarity index 100%
rename from removeme/verifcid/validate_test.go
rename to thirdparty/verifcid/validate_test.go