Remove another extra function wrapper