performances optimization: do no emit the cellCleanup event anymore,
call a handler instead.