Stripped out cruft to support tomcat config