Actually there are much more Tomcat 6 references. These will be addressed separately.