Removed ContextMark.

MILESTONE: no more context marks anywhere in the codebase.