89z_kernel: Clean up and update