more cleanup for ghp