You can always activate the "No Barbarians" option, which, of course, will disable unit promotions until you go to war... Personally, I like this option, because barbs are pain in the a**. And as I play with Mongolia, my Keshiks are promoted twice as fast. And I also unlock the social policy...