Technical debts removed - Unused local variables