Remove unused code
Removed unused HDF5 code
More unused code