Remove deprecated class