Clean up more dependencies
Move around dependencies for Jetty
More fixes for jetty run