Remove unnecessary wrap functions on request handler