Merged hanged order of cleanup operations from 3.2.