Remove dependency on HttpServletRequest