More deprecation changes
Changes to deprecation in files
final