Deprecated some more usages of enableContextMap