Removed mapping to AVAA
Removed more AVAA stuff