get rid of servlet 2.5 dependency