channels/tsmf: cleanup