Remove the userId key from all JSON

The user is now Identified by the HAWK Credentials