Remove a few more uneeded calls to base64 decode in the CLI