[DF-4295] Removed unused commenents and debug code