Removed dependence on war until it's usable