Small amounts of cleanup.