Re #443. All GHM cleanup except for Objects