diff --git a/changelog/4.7.0/pr-422.v2.yml b/changelog/@unreleased/pr-422.v2.yml
similarity index 100%
rename from changelog/4.7.0/pr-422.v2.yml
rename to changelog/@unreleased/pr-422.v2.yml
diff --git a/changelog/4.7.0/pr-423.v2.yml b/changelog/@unreleased/pr-423.v2.yml
similarity index 100%
rename from changelog/4.7.0/pr-423.v2.yml
rename to changelog/@unreleased/pr-423.v2.yml
diff --git a/conjure-api/src/main/conjure/conjure-api.yml b/conjure-api/src/main/conjure/conjure-api.yml
index ff6721bc0..15065a911 100644
--- a/conjure-api/src/main/conjure/conjure-api.yml
+++ b/conjure-api/src/main/conjure/conjure-api.yml
@@ -30,9 +30,8 @@ types:
         alias: string
       ErrorCode:
         values:
-          - INVALID_ARGUMENT
-          - UNAUTHENTICATED
           - PERMISSION_DENIED
+          - INVALID_ARGUMENT
           - NOT_FOUND
           - CONFLICT
           - REQUEST_ENTITY_TOO_LARGE
diff --git a/conjure-core/src/main/java/com/palantir/conjure/defs/validator/ConjureDefinitionValidator.java b/conjure-core/src/main/java/com/palantir/conjure/defs/validator/ConjureDefinitionValidator.java
index 69591cad0..4630df665 100644
--- a/conjure-core/src/main/java/com/palantir/conjure/defs/validator/ConjureDefinitionValidator.java
+++ b/conjure-core/src/main/java/com/palantir/conjure/defs/validator/ConjureDefinitionValidator.java
@@ -343,7 +343,7 @@ private static void validateTypeDefinition(TypeDefinition typeDef,
 
             typeDef.accept(new TypeDefinition.Visitor<Void>() {
                 @Override
-                public Void visitAlias(AliasDefinition value) {
+                public Void visitAlias(AliasDefinition _value) {
                     AliasDefinition aliasDef = typeDef.accept(TypeDefinitionVisitor.ALIAS);
                     if (recursivelyFindIllegalKeys(aliasDef.getAlias(), definitionMap, false)) {
                         throw new IllegalStateException(
@@ -353,7 +353,7 @@ public Void visitAlias(AliasDefinition value) {
                 }
 
                 @Override
-                public Void visitObject(ObjectDefinition value) {
+                public Void visitObject(ObjectDefinition _value) {
                     ObjectDefinition objectDefinition = typeDef.accept(TypeDefinitionVisitor.OBJECT);
                     objectDefinition.getFields().stream()
                             .filter(fieldDefinition -> recursivelyFindIllegalKeys(
@@ -368,7 +368,7 @@ public Void visitObject(ObjectDefinition value) {
                 }
 
                 @Override
-                public Void visitUnion(UnionDefinition value) {
+                public Void visitUnion(UnionDefinition _value) {
                     UnionDefinition unionDefinition = typeDef.accept(TypeDefinitionVisitor.UNION);
                     unionDefinition.getUnion().stream()
                             .filter(fieldDefinition -> recursivelyFindIllegalKeys(
@@ -383,12 +383,12 @@ public Void visitUnion(UnionDefinition value) {
                 }
 
                 @Override
-                public Void visitEnum(EnumDefinition value) {
+                public Void visitEnum(EnumDefinition _value) {
                     return null;
                 }
 
                 @Override
-                public Void visitUnknown(String unknownType) {
+                public Void visitUnknown(String _unknownType) {
                     return null;
                 }
             });
diff --git a/docs/spec/conjure_definitions.md b/docs/spec/conjure_definitions.md
index b5b9217b6..cf7d90228 100644
--- a/docs/spec/conjure_definitions.md
+++ b/docs/spec/conjure_definitions.md
@@ -278,9 +278,8 @@ docs | [DocString][] | Documentation for the type. [CommonMark syntax](http://sp
 ## ErrorCode
 [ErrorCode]: #errorcode
 A field describing the error category. MUST be one of the following strings, with HTTP status codes defined in the [wire spec](/docs/spec/wire.md#34-conjure-errors):
-* INVALID_ARGUMENT
-* UNAUTHENTICATED
 * PERMISSION_DENIED
+* INVALID_ARGUMENT
 * NOT_FOUND
 * CONFLICT
 * REQUEST_ENTITY_TOO_LARGE
diff --git a/docs/spec/wire.md b/docs/spec/wire.md
index f2da2a046..5e636ead5 100644
--- a/docs/spec/wire.md
+++ b/docs/spec/wire.md
@@ -208,9 +208,8 @@ In order to send a Conjure error, servers must serialize the error using the [JS
 
 Conjure Error code         | HTTP Status code |
 -------------------------- | ---------------- |
-INVALID_ARGUMENT           | 400
-UNAUTHENTICATED            | 401
 PERMISSION_DENIED          | 403
+INVALID_ARGUMENT           | 400
 NOT_FOUND                  | 404
 CONFLICT                   | 409
 REQUEST_ENTITY_TOO_LARGE   | 413