Small consumer cleanup.