Will Elementary Get Back On Track?

We used to like this show a lot when they solved crimes. Do you think that the next season will get back to this and stop being all about Holmes, his Father, and to a lessor extent Watson? This is getting old rather fast!