I've forgotten what happened last season Who died in the finale, was it Charlie who got stuck in the room and drowned?

Seriously is this the longest break between seasons of any show ever, it seems like it.