Merge "Clean up TARE" into main