Move to Jetty and cleanup