Continue removing global state