Revert "HACK cleanup" and revert "HACK H2 commit"

This reverts commit a463d9dad82b565ff1d4a164c2221475b71c471c.
This reverts commit 956deec47b8806c8406a83d00126413d835edd7b.
Removed storage stuff from module