Started removing references to base64 from the encryption methods