Corrected tomcat issues, removed jetty