Remove dependency on h2