artf230740: more cleanup