Deprecate some rarely-used APIS