clean up nightly ci issues (#4488)