Additional cleanup

It’s like a never ending gig!