More cleanup. Maybe it’s time I gave it a rest?