[sr-dev] git:master: tm: fix warnings/eliminate unused variables