TOMCAT: FixBugs
TOMCAT: remove unused files