AES class
Cleaning up old bits of the core