Lots of cleanup!