MAkeHDF5 cleaned