Merge "Clean up unused fields from EntityHeaderController" into main