RT | #1985 | removing the commented out code