snapshot of cleanup and reordering work