Deprecate and clean up.