partial cleanup pass