Raise memory leak message to error
Shouldn't be closing client twice
Minor clean up
Don't derive
Upgrade Jetty