Great cleanup!