Remove dependency from servlet api