some more TDISP cleanup