GH-2 More clean up