Remove unnecessary execution contexts