diff --git a/src/auth.js b/src/auth.js
index db60df30a..422da3709 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -103,10 +103,7 @@ function initialize(callback) {
             var info = { scope: token.scope };
             var tokenType;
 
-            if (token.identifier.indexOf(tokendb.PREFIX_DEV) === 0) {
-                token.identifier = token.identifier.slice(tokendb.PREFIX_DEV.length);
-                tokenType = tokendb.TYPE_DEV;
-            } else if (token.identifier.indexOf(tokendb.PREFIX_USER) === 0) {
+            if (token.identifier.indexOf(tokendb.PREFIX_USER) === 0) {
                 tokenType = tokendb.TYPE_USER;
                 token.identifier = token.identifier.slice(tokendb.PREFIX_USER.length);
             } else {
diff --git a/src/developer.js b/src/developer.js
index b9820ebad..e16460740 100644
--- a/src/developer.js
+++ b/src/developer.js
@@ -75,7 +75,7 @@ function issueDeveloperToken(user, auditSource, callback) {
     var expiresAt = Date.now() + 24 * 60 * 60 * 1000; // 1 day
     var scopes = '*,' + clients.SCOPE_ROLE_SDK;
 
-    tokendb.add(token, tokendb.PREFIX_DEV + user.id, '', expiresAt, scopes, function (error) {
+    tokendb.add(token, user.id, '', expiresAt, scopes, function (error) {
         if (error) return callback(new DeveloperError(DeveloperError.INTERNAL_ERROR, error));
 
         eventlog.add(eventlog.ACTION_USER_LOGIN, auditSource, { authType: 'cli', userId: user.id, username: user.username });
diff --git a/src/tokendb.js b/src/tokendb.js
index dc9b6ddad..28f4ca76e 100644
--- a/src/tokendb.js
+++ b/src/tokendb.js
@@ -17,7 +17,6 @@ exports = module.exports = {
     TYPE_DEV: 'developer',
 
     PREFIX_USER: 'user-',
-    PREFIX_DEV: 'dev-',
 
     _clear: clear
 };