remove old convoluted context functions