diff --git a/include/ncdispatch.h b/include/ncdispatch.h
index dad91f683..67e3387ef 100644
--- a/include/ncdispatch.h
+++ b/include/ncdispatch.h
@@ -107,10 +107,6 @@ typedef struct NC_MPI_INFO {
 
 /* Define known dispatch tables and initializers */
 
-/*Forward*/
-// typedef struct NC_Dispatch NC_Dispatch;
-
-
 extern int NCDISPATCH_initialize(void);
 extern int NCDISPATCH_finalize(void);
 
diff --git a/ncgen/genbin.c b/ncgen/genbin.c
index 75d3a5740..82cc6833f 100644
--- a/ncgen/genbin.c
+++ b/ncgen/genbin.c
@@ -449,10 +449,12 @@ genbin_writevar(Generator* generator, Symbol* vsym, Bytebuffer* memory,
         stat = nc_put_vara(vsym->container->nc_id, vsym->nc_id, start, count, data);
     }
     check_err(stat,__LINE__,__FILE__);
-//    /* Reclaim the data */
-//    stat = ncaux_reclaim_data(vsym->container->nc_id, vsym->typ.basetype->nc_id, data, nelems);
-//    check_err(stat,__LINE__,__FILE__);
-//    bbClear(memory); /* reclaim top-level memory */
+#if 0
+    /* Reclaim the data */
+    stat = ncaux_reclaim_data(vsym->container->nc_id, vsym->typ.basetype->nc_id, data, nelems);
+    check_err(stat,__LINE__,__FILE__);
+    bbClear(memory); /* reclaim top-level memory */
+#endif
     return stat;
 }