removed unnecessary context objects