[DF-4070] Removed commented code