Lot of cleanup.