more cleanup amd