deprecation code cleanup