443 ghm cleanup

Merging in GHM cleanup to avoid further conflicts.