Removing tomcat dependency