More compact initialization, rm single use members (#4300)