remove base64 dependency & whitespace