Move .clear in to generic-classes & also provide .unclear class