[ronald] cleanup