jetty-9 organised imports. Cleaned up some TODOs