Did a long-needed cleanup...