More clean up for DAUA process