clean up and add root context