There's still a long way to go.
While the organized terror movements are taking a lot of hits, the "amateur" franchises would still be a threat. Groups with no real upward connection to a central authority, that simply plan their own terror acts.
The root causes of this are buried deep in Arab culture and/or radical Islam, and solving that is not something that's going to be easy, and to be blunt, can't easily be done from outside that culture and religion.