Remove comments and base64 requirement