#678 - clean up state log behavior