remove "Goal" enums