More figure cleanup