re remove context

Change-Id: I98bca4bf064b7c80e0c02152a78e4bae8487ab34