It seemed like they made up in the last episode... Well, they apologized but stated they were growing apart. They'll obviously end on good terms, just wish they'd stay close.

EDIT: Ha, yeah, I'm trying to think of a character that left without being killed or ruined or both and I'm coming up empty, aside from maybe Addison, who got her own show and will probably come back to this one.