First cleanup pass