Some simplifications in tomcat configuration