Updated and replaced deprecated modules/functions