Can we junk the goal headings?