Removed extradata validation