removing remaining aes.* calls.