Removed unnecessary function wrapping

I am impressed this even worked.