DAWNSCI-5708 Cleanup