Re: [sr-dev] some tm cleanup