Remove more base64 refs