Remove server argument to request handler