acro: more cleanup