Remove builds that have been unified and add yuga