remove use of deprecated class for #1329