cleanup of tomcat stuff