White (and friends) cleanup.