fixed remove context objects