Core cleanup.
More core cleanup.