Cleanup servlet-api dependency (use geronimo spec instead)