#684 - clean up state logging