Standarize in tots-tm as filename for all tm, remove dead code