[525852] Deprecate wrt Bug 582625, minor tidy
3 files changed