Eng-5359 Removed commented out code.