More cleanup in *.hdf