Builder cleanup.