remove usage of deprecated functions