Add ctors, cleanup, refs #3523