re #19 cleanup