Clean out some of the servlet stuff