remove use of deprecated apis