Remove hard coded base64b encoding