Tidy-up. Still *ns* problem with uberjar.