SOS-2442 SF Remove commented code