Moved away from embedded tomcat