[del/mod] generak cleanup