Removed usages of deprecated context functions