Cleanup H5Q code
Cleanup for H5Q