Get rid of deprecated functions