removed use of deprecated values