Removing the Wrapper Function