addtl cleanup pass