simplify: remove unnecessary function wrapping