Updated TAAE version
Cleanup