Removing more AODAAC stuff

Removing some more AODAAC stuff just to tidy-up these files before I start removing GoGoDuck and BODAAC