2nd cleanup pass