diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index fcf32d9db..4d9a474fb 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -1479,6 +1479,7 @@ zio_read (blkptr_t *bp, grub_zfs_endian_t endian, void **buf,
 
   if (comp != ZIO_COMPRESS_OFF)
     {
+      /* It's not really necessary to align to 16, just for safety.  */
       compbuf = grub_malloc (ALIGN_UP (psize, 16));
       if (! compbuf)
 	return grub_errno;
@@ -1878,9 +1879,6 @@ zap_verify (zap_phys_t *zap, grub_zfs_endian_t endian)
   if (grub_zfs_to_cpu64 (zap->zap_magic, endian) != (grub_uint64_t) ZAP_MAGIC)
     return grub_error (GRUB_ERR_BAD_FS, "bad ZAP magic");
 
-  /*  if (zap->zap_flags != 0)
-      return grub_error (GRUB_ERR_BAD_FS, "bad ZAP flags");*/
-
   if (zap->zap_salt == 0)
     return grub_error (GRUB_ERR_BAD_FS, "bad ZAP salt");