Cleanup reset deprecation code