SM-12639 Tomcat minor cleanup (now working)