The Class: Are you kidding me?

I'm not sure if this was the first episode where Lucy Punch was excised from the opening credits, but I'm just stunned that, even after wisely dumping her, Crane and Klarik still found an excuse to bring back Sam Harris as Holly's flaming husband. Stunned. Not that Holly wasn't an irritating caricature even without having the blatantly gay spouse, but he was the worst part of her, and he's still around?