removed remaining context/$ references, except ones that require oneone changes.