NXP-14694 cleanup root context (may still be referenced in mortbay naming)