Nice cleanup!