Merge "Cleanup dead fields" into main