cleanup & tdisp warning fix