improve tomcat cleanup & deploy