Remove dependency Servlet API from core