Initial tomcat6
cleanup