Cleanup code

basculehttp/tokenFactory.go

@@ -130,7 +130,7 @@ func (btf BearerTokenFactory) ParseAndValidate(ctx context.Context, _ *http.Requ
 
 	principal, ok := payload[jwtPrincipalKey].(string)
 	if !ok {
-		return nil, emperror.WrapWith(ErrorUnexpectedPrincipal, "failed to get and convert principal", "principal", payload[jwtPrincipalKey], "claims map", claimsMap, "payload", payload)
+		return nil, emperror.WrapWith(ErrorUnexpectedPrincipal, "failed to get and convert principal", "principal", payload[jwtPrincipalKey], "payload", payload)
 	}
 
 	return bascule.NewToken("jwt", principal, payload), nil

jws.go

@@ -74,16 +74,5 @@ func (c *ClaimsWithLeeway) UnmarshalJSON(data []byte) error {
 
 // GetMap returns a map of string to interfaces of the values in the ClaimsWithLeeway
 func (c *ClaimsWithLeeway) GetMap() (map[string]interface{}, error) {
-	// for StandardClaims, which don't work with the []string aud values that we use
-	// var finalMap map[string]interface{}
-	// inrec, err := json.Marshal(c)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// err = json.Unmarshal(inrec, &finalMap)
-	// if err != nil {
-	// 	return nil, err
-	// }
-	// return finalMap, nil
 	return c.MapClaims, nil
 }