Selectively remove class and remember state

Remove using prefix