Trust me, if I could start tossing things into a doctrinal dust bin, "Irregular Warfare" would go in first, and "Security Force Assistance" would be hot on its heels. Then I would take all of the "IW" missions like FID, UW and COIN that have been so vigorously massaged to reflect current whims and good ideas, and rescrub the entire family to get back to basics, filter out the colonial / cold war biases, and clean up the overlaps and gaps.

This ULO, CAM, WAS, MC business I'd have to look at a bit, but I think it could go in as well with no loss to national security.