Remove YARN changes which are not relevant for parallel execution in common