Removed unnecessary unsafe contexts