code cleanup JENKINS-24171