cleanup crufty bits