Cleanups in dxe.