[ins] vf cleanup: struct for states
[ins] minor hff cleanup