Consolidate cleanup hooks
1 file changed