#666 - Remove obsolete constructors to clean up state log, general mop-up