[DF-3759] Removed commented code