First round of AO cleanup