3rd cleanup pass