Clean up DT code