Clean up creating the root context