Unnecessary function removal