89z_kernel: Clean up