Remove deprecate class