Fix: use unique variable name when clearing old state data

Fix: use unique variable name when clearing old state data #480