chg: some simplifications