lose the AP-specific cruft in latest batch skeleton