Killed redundant function wrapping