#678 - clean up state logging behavior