AES.cpp cleanup