Revert "final state"

This reverts commit 6b47d9340bea79568eeea80175f8d166fcad81d3.