A modicum of cleanup!