VERSION_STATE clean up