further cleaning up of TDL