revert tstate_delete_common, since it's pretty much wrong