Cleanup, moving to h2