PIAACMC: cleanup