some cleanup ghp4