contribution / goal cleanup