Clean code
Fix JENKINS-16399