Continue to remove various tendrils of the old theme system