#38 do some clean-up