Clean up some of the goal views.