downgrade to Tomcat 6.0.36
clean up
Update to work with older Tomcat w/o Servlet 3.0