Clint Watt has been studying radicalization and counter terror. Here's one of his main points for going forward, and the rest is at the link.

“Teaching of militant Islamic extremism should end and in its place should be a broader set of training on radicalization and extremism encompassing those indicators potentially precipitating violence for any and all ideologies.”