cleanup and support for new jetty naming