Cleanup (remove NULL definition) and adding blank IDT.