Less deprecation while we figure out the next step