I'm not sure how easy it really is to remove terrorism, as you'd have to consider why they are angry in the first place. Admittedly, economics are an issue in certain countries and addressing this could mitigate some of the risk. But strictly speaking, Timothy McVeigh was a terrorist, albeit a 'domestic terrorist', and he had an issue with the US government. So people will always find some form of ideology to attack a supposed oppressor.