Cleanup for h2.py