Deprecate more classes