Remove some AA references