TDISP cleanup