removed Yoman specific stuff.