Unneeded function removal