remove last traces of deprecated functions...