Cleanup delegation from packagers