More figure cleanup.