removed aead stuff