Fixed java 1.6 build
Delete unnecesary
Update pom.xml for tomcat deploying