cleanups, switch to hdf.