[DF-1476] Removed old commented code