Attempting to remove tomcat restart, as it appears there are problems around the tomcat process getting stuck in the stopping process