Remove dependency on base64