Removed function wrap