Removing tomcat6 dependency