Clear state now clears only safe data