Sounds good, I will remove the "if (Utils.isYarnMode())" switch then, and make it 30 for all cases !