Technical debts removed - Statements corrected