Cleanup and 3rd level nesting