Remove dependency Servlet API