+++: context code cleanup