diff --git a/src/gfunction/Traps.go b/src/gfunction/Traps.go
index a202d902..68317f87 100644
--- a/src/gfunction/Traps.go
+++ b/src/gfunction/Traps.go
@@ -132,20 +132,24 @@ func Load_Traps() {
 			GFunction:  trapDeprecated,
 		}
 
-	// Class initialisation for Console.
 	MethodSignatures["java/nio/charset/Charset.<clinit>()V"] =
 		GMeth{
 			ParamSlots: 0,
 			GFunction:  trapFunction,
 		}
 
-	// Get the default character set.
 	MethodSignatures["java/nio/charset/Charset.defaultCharset()Ljava/nio/charset/Charset;"] =
 		GMeth{
 			ParamSlots: 0,
 			GFunction:  trapFunction,
 		}
 
+	MethodSignatures["java/nio/charset/StandardCharsets.<clinit>()V"] =
+		GMeth{
+			ParamSlots: 0,
+			GFunction:  trapFunction,
+		}
+
 	MethodSignatures["java/rmi/RMISecurityManager.<clinit>()V"] =
 		GMeth{
 			ParamSlots: 0,
diff --git a/src/gfunction/otherMethods.go b/src/gfunction/otherMethods.go
index 45817a8c..a04a57f3 100644
--- a/src/gfunction/otherMethods.go
+++ b/src/gfunction/otherMethods.go
@@ -68,14 +68,6 @@ func Load_Other_methods() {
 			GFunction:  clinitGeneric,
 		}
 
-	/***
-	MethodSignatures["java/util/HexFormat.<clinit>()V"] =
-		GMeth{
-			ParamSlots: 0,
-			GFunction:  clinitGeneric,
-		}
-		***/
-
 	MethodSignatures["java/util/Locale$Category.<clinit>()V"] =
 		GMeth{
 			ParamSlots: 0,