Some late cleanup.