[TIDOC-1537] Remove class