Cleaning tree context and documentaton