[DF-185] Removed commented code