Prune more AAIB-specific code