Code cleanup around isolating Jetty code