final cleanup pass