Remove HttpServlet and replace with Spring HttpServletHandler