Deprecate some to-be-removed classes/functions