remove separate context object