Upgraded AA to 3.1
General cleanup