[FIXED JENKINS-6446] Removing a TODO added for future references