YARN-1964 clean patch