Another cleanup.