move h2 extraction to util