Some cleanup of GH functions