Removed vestigial ContextExpressions