Yay! I agree with you. The Carver thing was getting to be a bit too much and took the whole show off of what it was in the original season.

Of course, we won't be getting our new season here until much, much later in the year so I'm going to have to try to avoid all spoilers.