EA-58277 (diagnostic)
get rid of deprecated code