[DF-3089] Removed commented code