removing global state