removed use of deprecated methods