Remove with_context stuff.
Remove with_context tests.